Merge pull request #306 from hummingbird-me/develop

[6.5] Develop to Master - Crash Fixes
hummingbird-me · Mar 19, 2018 · af8285a · af8285a
2 parents ac5d809 + 7398cc3
commit af8285a
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 38 deletions.
diff --git a/src/App.js b/src/App.js
@@ -28,6 +28,9 @@ console.disableYellowBox = true;
 // tab useful again. If dev tools isn't running, this will have no effect.
 GLOBAL.XMLHttpRequest = GLOBAL.originalXMLHttpRequest || GLOBAL.XMLHttpRequest;
 
+// A reset action for navigation
+let resetAction = null;
+
 class App extends PureComponent {
   componentWillMount() {
     OneSignal.inFocusDisplaying(2);
@@ -61,16 +64,11 @@ class App extends PureComponent {
     const authenticated = store.getState().auth.isAuthenticated;
     // If the authentication state changed from true to false then take user to intro screen
     if (!isNull(this.authenticated) && this.authenticated !== authenticated && !authenticated) {
-      const resetAction = NavigationActions.reset({
+      resetAction = NavigationActions.reset({
         index: 0,
         actions: [NavigationActions.navigate({ routeName: 'Intro' })],
         key: null,
       });
-      // @Note: `navigation` may not exist as a reference yet due to `PersistGate`
-      // blocking children from rendering until state has been rehydrated.
-      // Another solution could be to `setTimeout` here but it seems `onStoreUpdate`
-      // is called twice which results in 2x navigation actions being dispatched.
-      this.navigation && this.navigation.dispatch(resetAction);
     }
 
     // Update sentry
@@ -93,6 +91,14 @@ class App extends PureComponent {
 
     // Set the new authentication value
     this.authenticated = authenticated;
+
+    // Check if we have a reset action that we need to perform
+    if (this.navigation && resetAction) {
+      // @Note: `navigation` may not exist as a reference yet due to `PersistGate`
+      // blocking children from rendering until state has been rehydrated.
+      this.navigation.dispatch(resetAction);
+      resetAction = null;
+    }
   }
 
   onIds(device) {
@@ -108,7 +114,7 @@ class App extends PureComponent {
     console.log('Notification received: ', notification);
   }
 
-  onOpened(openResult) {
+  onOpened = (openResult) => {
     console.group('Opened Notification');
     console.log('Notification', openResult.notification);
     console.log('Message: ', openResult.notification.payload.body);
@@ -126,12 +132,18 @@ class App extends PureComponent {
      * Related issues: react-community/react-navigation
      *  #1127, #1715,
      */
-    const resetAction = NavigationActions.reset({
+    resetAction = NavigationActions.reset({
       index: 0,
       key: null,
       actions: [NavigationActions.navigate({ routeName: 'TabsNotification' })],
     });
-    this.navigation.dispatch(resetAction);
+
+    if (this.navigation && resetAction) {
+      // @Note: `navigation` may not exist as a reference yet due to `PersistGate`
+      // blocking children from rendering until state has been rehydrated.
+      this.navigation.dispatch(resetAction);
+      resetAction = null;
+    }
   }
 
   onLibraryEntryCreated = (data) => {

diff --git a/src/screens/Profiles/UserLibrary/components/LibraryEmptyState/component.js b/src/screens/Profiles/UserLibrary/components/LibraryEmptyState/component.js
@@ -22,7 +22,7 @@ const STATUS_MAP = {
     on_hold: 'you have on hold',
     dropped: 'you have dropped',
   },
-}
+};
 
 const BUTTON_MAP = {
   anime: {

diff --git a/src/screens/Sidebar/Library/ExportLibrary.js b/src/screens/Sidebar/Library/ExportLibrary.js
@@ -39,7 +39,7 @@ const ExportItem = ({ canonicalTitle, posterImage, syncStatus }) => {
     <View style={[styles.item, { paddingHorizontal: 12 }]}>
       <FastImage
         style={{ width: 30, height: 30 }}
-        source={(defaultAvatar && { uri: posterImage.small || posterImage.large }) || defaultAvatar}
+        source={(posterImage && { uri: posterImage.small || posterImage.large }) || defaultAvatar}
       />
       <View style={{ flex: 1 }}>
         <View style={{ marginHorizontal: 12, justifyContent: 'center' }}>

diff --git a/src/store/auth/actions.js b/src/store/auth/actions.js
@@ -169,13 +169,12 @@ const loginUserFb = async (dispatch) => {
   const data = await AccessToken.getCurrentAccessToken();
 
   // Make sure we have a token
-  if (!data.accessToken) {
+  if (!data || !data.accessToken) {
     throw new Error('Invalid Facebook Access Token');
   }
 
-  let result = null;
   try {
-    result = await fetch(`${kitsuConfig.baseUrl}/oauth/token`, {
+    const result = await fetch(`${kitsuConfig.baseUrl}/oauth/token`, {
       method: 'POST',
       headers: {
         Accept: 'application/json',
@@ -187,33 +186,34 @@ const loginUserFb = async (dispatch) => {
         provider: 'facebook',
       }),
     });
+
+    // Create a graph request asking for user information with a callback to handle the response.
+    dispatch({ type: types.GET_FBUSER });
+    const infoRequest = new GraphRequest(
+      '/me',
+      {
+        httpMethod: 'GET',
+        version: 'v2.5',
+        parameters: {
+          fields: {
+            string: 'email, name, gender',
+          },
+        },
+      },
+      (error, fbdata) => {
+        if (error) {
+          dispatch({ type: types.GET_FBUSER_FAIL, payload: error });
+        } else {
+          dispatch({ type: types.GET_FBUSER_SUCCESS, payload: fbdata });
+        }
+      },
+    );
+    // Start the graph request.
+    new GraphRequestManager().addRequest(infoRequest).start();
+    return result;
   } catch (e) {
     throw e;
   }
-  // Create a graph request asking for user information with a callback to handle the response.
-  dispatch({ type: types.GET_FBUSER });
-  const infoRequest = new GraphRequest(
-    '/me',
-    {
-      httpMethod: 'GET',
-      version: 'v2.5',
-      parameters: {
-        fields: {
-          string: 'email, name, gender',
-        },
-      },
-    },
-    (error, fbdata) => {
-      if (error) {
-        dispatch({ type: types.GET_FBUSER_FAIL, payload: error });
-      } else {
-        dispatch({ type: types.GET_FBUSER_SUCCESS, payload: fbdata });
-      }
-    },
-  );
-  // Start the graph request.
-  new GraphRequestManager().addRequest(infoRequest).start();
-  return result;
 };
 
 export const logoutUser = () => (dispatch) => {