Add back OnyxData, but with Policy loading key

Expensify · Mar 26, 2024 · 354a2f6 · 354a2f6
1 parent 8dc35ac
commit 354a2f6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
@@ -2202,9 +2202,39 @@ function openPolicyWorkflowsPage(policyID: string) {
         return;
     }
 
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    isLoading: true,
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    isLoading: false,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    isLoading: false,
+                },
+            },
+        ],
+    };
+
     const params: OpenPolicyWorkflowsPageParams = {policyID};
 
-    API.read(READ_COMMANDS.OPEN_POLICY_WORKFLOWS_PAGE, params);
+    API.read(READ_COMMANDS.OPEN_POLICY_WORKFLOWS_PAGE, params, onyxData);
 }
 
 function setPolicyIDForReimburseView(policyID: string) {

diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -85,9 +85,9 @@ function WorkspaceWorkflowsPage({policy, betas, route, session}: WorkspaceWorkfl
     const optionItems: ToggleSettingOptionRowProps[] = useMemo(() => {
         const {accountNumber, addressName, bankName} = policy?.achAccount ?? {};
         const hasVBA = !!policy?.achAccount;
-        let bankDisplayName = bankName || addressName;
+        let bankDisplayName = bankName ?? addressName;
         if (accountNumber && bankDisplayName !== accountNumber) {
-            bankDisplayName += ' ' + accountNumber.slice(-5);
+            bankDisplayName += ` ${accountNumber.slice(-5)}`;
         }
         const hasReimburserEmailError = !!policy?.errorFields?.reimburserEmail;
         const hasApprovalError = !!policy?.errorFields?.approvalMode;