LocationsButton

Summary: _typescript_

Reviewed By: jknoxville

Differential Revision: D17284485

fbshipit-source-id: 7de710e7302413bc4735f0b0e31770c045a84fe6

src/chrome/LocationsButton.tsx

@@ -16,12 +16,14 @@ import {State as PluginState} from 'src/reducers/pluginStates';
 
 type State = {
   bookmarks: Array<Bookmark>;
+  hasRetrievedBookmarks: boolean;
+  retreivingBookmarks: boolean;
 };
 
 type OwnProps = {};
 
 type StateFromProps = {
-  currentURI: string;
+  currentURI: string | undefined;
   selectedDevice: BaseDevice | null | undefined;
 };
 
@@ -51,7 +53,7 @@ const shortenText = (text: string, MAX_CHARACTERS = 30): string => {
 
 type Props = OwnProps & StateFromProps & DispatchFromProps;
 class LocationsButton extends Component<Props, State> {
-  state = {
+  state: State = {
     bookmarks: [],
     hasRetrievedBookmarks: false,
     retreivingBookmarks: false,
@@ -109,10 +111,16 @@ class LocationsButton extends Component<Props, State> {
 }
 
 const mapStateFromPluginStatesToProps = (pluginStates: PluginState) => {
-  const navPluginState = pluginStates[
+  const pluginKey = Object.keys(pluginStates).find(key =>
-    Object.keys(pluginStates).find(key => /#Navigation$/.test(key))
+    /#Navigation$/.test(key),
-  ] as (NavPluginState | null);
+  );
-  const currentURI = navPluginState && navPluginState.currentURI;
+  let currentURI: string | undefined;
+  if (pluginKey) {
+    const navPluginState = pluginStates[pluginKey] as
+      | NavPluginState
+      | undefined;
+    currentURI = navPluginState && navPluginState.currentURI;
+  }
   return {
     currentURI,
   };