Fix bug with not found after reload

Expensify · Apr 16, 2024 · 268b870 · 268b870
1 parent 7484834
commit 268b870
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
@@ -3919,9 +3919,9 @@ function navigateWhenEnableFeature(policyID: string, featureRoute: Route) {
     new Promise<void>((resolve) => {
         resolve();
     }).then(() => {
-        requestAnimationFrame(() => {
+        setTimeout(() => {
             Navigation.navigate(featureRoute);
-        });
+        }, 300);
     });
 }
 

diff --git a/src/pages/workspace/FeatureEnabledAccessOrNotFoundWrapper.tsx b/src/pages/workspace/FeatureEnabledAccessOrNotFoundWrapper.tsx
@@ -1,4 +1,5 @@
 /* eslint-disable rulesdir/no-negated-variables */
+import {useIsFocused} from '@react-navigation/native';
 import React, {useEffect, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -42,6 +43,8 @@ function FeatureEnabledAccessOrNotFoundComponent(props: FeatureEnabledAccessOrNo
     const shouldShowNotFoundPage = isEmptyObject(props.policy) || !props.policy?.id || !isPolicyFeatureEnabled;
     const {isOffline} = useNetwork();
 
+    const isFocused = useIsFocused();
+    const prevIsFocused = usePrevious(isFocused);
     const pendingField = props.policy?.pendingFields?.[props.featureName];
     const prevPendingField = usePrevious(pendingField);
 
@@ -57,12 +60,12 @@ function FeatureEnabledAccessOrNotFoundComponent(props: FeatureEnabledAccessOrNo
 
     useEffect(() => {
         setIsPolicyFeatureEnabled((isCurrentPolicyFeatureEnabled) => {
-            if (prevPendingField !== pendingField || isOffline || !pendingField) {
+            if (prevPendingField !== pendingField || isOffline || !pendingField || !prevIsFocused) {
                 return isFeatureEnabled;
             }
             return isCurrentPolicyFeatureEnabled;
         });
-    }, [pendingField, isFeatureEnabled, isOffline, prevPendingField]);
+    }, [pendingField, isFeatureEnabled, isOffline, prevPendingField, prevIsFocused]);
 
     if (shouldShowFullScreenLoadingIndicator) {
         return <FullscreenLoadingIndicator />;