Merge pull request #20772 from daordonez11/hotfix-app-crash-publicroom

hotfix(publicroom):Avoid crash on undefined state
Expensify · Jun 21, 2023 · 40ece23 · 40ece23
2 parents 1096b6e + 2332530
commit 40ece23
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
@@ -57,6 +57,9 @@ function NavigationRoot(props) {
     const navigationStateRef = useRef(undefined);
 
     const updateSavedNavigationStateAndLogRoute = (state) => {
+        if (!state) {
+            return;
+        }
         navigationStateRef.current = state;
         props.updateCurrentReportId(state);
         parseAndLogRoute(state);

diff --git a/src/libs/Navigation/getTopmostReportId.js b/src/libs/Navigation/getTopmostReportId.js
@@ -10,6 +10,9 @@ import lodashGet from 'lodash/get';
  * @returns {String | undefined} - It's possible that there is no report screen
  */
 function getTopmostReportId(state) {
+    if (!state) {
+        return;
+    }
     const topmostCentralPane = lodashFindLast(state.routes, (route) => route.name === 'CentralPaneNavigator');
 
     if (!topmostCentralPane) {