Merge pull request #1790 from Expensify/marcaaron-fixRundefined

Fix /r/undefined issue
Expensify · Mar 17, 2021 · 87c1540 · 87c1540
2 parents c5cb507 + 4ab0d2b
commit 87c1540
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
@@ -33,6 +33,10 @@ const MainDrawerNavigator = props => (
         <Drawer.Screen
             name="Report"
             component={ReportScreen}
+
+            // Providing an empty string here will ensure that the ReportScreen does not show as '/r/undefined'
+            // eslint-disable-next-line react/jsx-props-no-multi-spaces
+            initialParams={{reportID: ''}}
             options={{
                 cardStyle: styles.navigationScreenCardStyle,
                 headerShown: false,

diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
@@ -103,7 +103,7 @@ class NavigationRoot extends Component {
                     const path = getPathFromState(state, linkingConfig.config);
                     if (path.includes(ROUTES.REPORT)) {
                         const reportID = Number(_.last(path.split('/')));
-                        if (!_.isNaN(reportID)) {
+                        if (reportID && !_.isNaN(reportID)) {
                             updateCurrentlyViewedReportID(reportID);
                         }
                     }

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -31,12 +31,6 @@ Onyx.connect({
     },
 });
 
-let currentURL;
-Onyx.connect({
-    key: ONYXKEYS.CURRENT_URL,
-    callback: val => currentURL = val,
-});
-
 let lastViewedReportID;
 Onyx.connect({
     key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
@@ -551,16 +545,16 @@ function fetchActions(reportID, offset) {
 function fetchAll(shouldRedirectToReport = true, shouldRecordHomePageTiming = false) {
     fetchChatReports()
         .then((reportIDs) => {
-            if (shouldRedirectToReport && !currentURL.includes(ROUTES.REPORT)) {
-                // Redirect to either the last viewed report ID or the first report ID from our report collection
+            if (shouldRedirectToReport) {
+                // Update currentlyViewedReportID to be our first reportID from our report collection if we don't have
+                // one already.
                 if (lastViewedReportID) {
-                    Onyx.set(ONYXKEYS.CURRENTLY_VIEWED_REPORTID, String(lastViewedReportID));
-                } else {
-                    const firstReportID = _.first(reportIDs);
-                    if (firstReportID) {
-                        Onyx.set(ONYXKEYS.CURRENTLY_VIEWED_REPORTID, String(firstReportID));
-                    }
+                    return;
                 }
+
+                const firstReportID = _.first(reportIDs);
+                const currentReportID = firstReportID ? String(firstReportID) : '';
+                Onyx.merge(ONYXKEYS.CURRENTLY_VIEWED_REPORTID, currentReportID);
             }
 
             Log.info('[Report] Fetching report actions for reports', true, {reportIDs});