fix race condition

Expensify · Apr 28, 2023 · ae5de2e · ae5de2e
1 parent 57de036
commit ae5de2e
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 32 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -498,7 +498,7 @@ PODS:
   - react-native-airship (15.2.3):
     - AirshipFrameworkProxy (= 2.0.5)
     - React-Core
-  - react-native-blob-util (0.17.3):
+  - react-native-blob-util (0.16.2):
     - React-Core
   - react-native-cameraroll (5.3.1):
     - React-Core
@@ -1072,7 +1072,7 @@ SPEC CHECKSUMS:
   React-jsinspector: 31517b1de3fadf93ad8558840a8974c7a7160bd3
   React-logger: b90aa6ed0dbc30717dc72d843af3cf4550297b22
   react-native-airship: 25045092934bf6eabf483e803af0a6e31826b8b9
-  react-native-blob-util: 99f4d79189252f597fe0d810c57a3733b1b1dea6
+  react-native-blob-util: c3b0faecd2919db568e9d552084396f3e50b57c7
   react-native-cameraroll: f3050460fe1708378698c16686bfaa5f34099be2
   react-native-config: 7cd105e71d903104e8919261480858940a6b9c0e
   react-native-document-picker: f68191637788994baed5f57d12994aa32cf8bf88

diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
@@ -9,6 +9,7 @@ import SCREENS from '../../../SCREENS';
 import Permissions from '../../Permissions';
 import Timing from '../../actions/Timing';
 import CONST from '../../../CONST';
+import * as App from '../../actions/App';
 
 // Screens
 import ReportScreen from '../../../pages/home/ReportScreen';
@@ -97,6 +98,10 @@ class MainDrawerNavigator extends Component {
             lodashGet(nextProps, 'route.params.openOnAdminRoom', false),
         );
         if (this.initialParams.reportID === initialNextParams.reportID) {
+            // We need to wait to open the app until this check is made, since there's a race condition that can happen
+            // where OpenApp will get called beforehand, setting isFirstTimeNewExpensifyUser to false and causing us
+            // to miss the deep-linked report in ReportUtils.findLastAccessedReport
+            App.confirmReadyToOpenApp();
             return false;
         }
 

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
@@ -58,6 +58,17 @@ Onyx.connect({
     callback: val => preferredLocale = val,
 });
 
+let resolveIsReadyPromise;
+const isReadyToOpenApp = new Promise((resolve) => {
+    resolveIsReadyPromise = resolve;
+});
+
+console.log(">>>> initialized");
+
+function confirmReadyToOpenApp() {
+    resolveIsReadyPromise();
+}
+
 /**
  * @param {Array} policies
  * @return {Array<String>} array of policy ids
@@ -128,36 +139,38 @@ AppState.addEventListener('change', (nextAppState) => {
  * Fetches data needed for app initialization
  */
 function openApp() {
-    // We need a fresh connection/callback here to make sure that the list of policyIDs that is sent to OpenApp is the most updated list from Onyx
-    const connectionID = Onyx.connect({
-        key: ONYXKEYS.COLLECTION.POLICY,
-        waitForCollectionCallback: true,
-        callback: (policies) => {
-            Onyx.disconnect(connectionID);
-            API.read('OpenApp', {policyIDList: getNonOptimisticPolicyIDs(policies)}, {
-                optimisticData: [
-                    {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
-                        key: ONYXKEYS.IS_LOADING_REPORT_DATA,
-                        value: true,
-                    },
-                ],
-                successData: [
-                    {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
-                        key: ONYXKEYS.IS_LOADING_REPORT_DATA,
-                        value: false,
-                    },
-                ],
-                failureData: [
-                    {
-                        onyxMethod: CONST.ONYX.METHOD.MERGE,
-                        key: ONYXKEYS.IS_LOADING_REPORT_DATA,
-                        value: false,
-                    },
-                ],
-            });
-        },
+    isReadyToOpenApp.then(() => {
+        // We need a fresh connection/callback here to make sure that the list of policyIDs that is sent to OpenApp is the most updated list from Onyx
+        const connectionID = Onyx.connect({
+            key: ONYXKEYS.COLLECTION.POLICY,
+            waitForCollectionCallback: true,
+            callback: (policies) => {
+                Onyx.disconnect(connectionID);
+                API.read('OpenApp', {policyIDList: getNonOptimisticPolicyIDs(policies)}, {
+                    optimisticData: [
+                        {
+                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            key: ONYXKEYS.IS_LOADING_REPORT_DATA,
+                            value: true,
+                        },
+                    ],
+                    successData: [
+                        {
+                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            key: ONYXKEYS.IS_LOADING_REPORT_DATA,
+                            value: false,
+                        },
+                    ],
+                    failureData: [
+                        {
+                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            key: ONYXKEYS.IS_LOADING_REPORT_DATA,
+                            value: false,
+                        },
+                    ],
+                });
+            },
+        });
     });
 }
 
@@ -294,4 +307,5 @@ export {
     openProfile,
     openApp,
     reconnectApp,
+    confirmReadyToOpenApp,
 };