diff --git a/web/input/input-state-container.react.js b/web/input/input-state-container.react.js
--- a/web/input/input-state-container.react.js
+++ b/web/input/input-state-container.react.js
@@ -117,6 +117,11 @@
 import { useSelector } from '../redux/redux-utils.js';
 import { nonThreadCalendarQuery } from '../selectors/nav-selectors.js';
 
+type CombinedInputState = {
+  +inputBaseState: BaseInputState,
+  +typeaheadState: TypeaheadInputState,
+};
+
 type BaseProps = {
   +children: React.Node,
 };
@@ -671,13 +676,10 @@
     }),
   );
 
-  inputStateSelector: ({
-    +inputBaseState: BaseInputState,
-    +typeaheadState: TypeaheadInputState,
-  }) => InputState = createSelector(
-    state => state.inputBaseState,
-    state => state.typeaheadState,
-    (inputBaseState, typeaheadState) => ({
+  inputStateSelector: CombinedInputState => InputState = createSelector(
+    (state: CombinedInputState) => state.inputBaseState,
+    (state: CombinedInputState) => state.typeaheadState,
+    (inputBaseState: BaseInputState, typeaheadState: TypeaheadInputState) => ({
       ...inputBaseState,
       ...typeaheadState,
     }),
diff --git a/web/selectors/tunnelbroker-selectors.js b/web/selectors/tunnelbroker-selectors.js
--- a/web/selectors/tunnelbroker-selectors.js
+++ b/web/selectors/tunnelbroker-selectors.js
@@ -8,9 +8,9 @@
 
 export const createTunnelbrokerInitMessage: AppState => ?ConnectionInitializationMessage =
   createSelector(
-    state => state.cryptoStore?.primaryIdentityKeys?.ed25519,
-    state => state.commServicesAccessToken,
-    state => state.currentUserInfo?.id,
+    (state: AppState) => state.cryptoStore?.primaryIdentityKeys?.ed25519,
+    (state: AppState) => state.commServicesAccessToken,
+    (state: AppState) => state.currentUserInfo?.id,
     (
       deviceID: ?string,
       accessToken: ?string,