Merge pull request #40375 from Expensify/hayata-fix-the-issue-with-co…

…nnections-data-fetching Assign `false` to the `POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED` Onyx key when the fetching of `connections` data fails
Expensify · Apr 22, 2024 · e17bf43 · e17bf43
2 parents 448982d + 76ec54a
commit e17bf43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
@@ -15,21 +15,29 @@ function openPolicyAccountingPage(policyID: string) {
             value: false,
         },
     ];
-    const finallyData: OnyxUpdate[] = [
+    const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: hasConnectionsDataBeenFetchedKey,
             value: true,
         },
     ];
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: hasConnectionsDataBeenFetchedKey,
+            value: false,
+        },
+    ];
 
     const parameters: OpenPolicyAccountingPageParams = {
         policyID,
     };
 
     API.read(READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE, parameters, {
         optimisticData,
-        finallyData,
+        successData,
+        failureData,
     });
 }
 

diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
@@ -3,6 +3,7 @@ import type {ComponentType} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import useNetwork from '@hooks/useNetwork';
 import {openPolicyAccountingPage} from '@libs/actions/PolicyConnections';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy} from '@src/types/onyx';
@@ -23,6 +24,7 @@ type WithPolicyConnectionsProps = WithPolicyProps;
  */
 function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnectionsProps & {policy: Policy}>) {
     function WithPolicyConnections({policy, policyDraft, route}: WithPolicyConnectionsProps) {
+        const {isOffline} = useNetwork();
         const [hasConnectionsDataBeenFetched, {status}] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policy?.id ?? '0'}`, {
             initWithStoredValues: false,
         });
@@ -35,7 +37,7 @@ function withPolicyConnections(WrappedComponent: ComponentType<WithPolicyConnect
             }
 
             openPolicyAccountingPage(policy.id);
-        }, [hasConnectionsDataBeenFetched, policy]);
+        }, [hasConnectionsDataBeenFetched, policy, isOffline]);
 
         if (!policy || status === 'loading' || !hasConnectionsDataBeenFetched) {
             return (