From 2630ac4e3628474510863bc2d7b1c52b8da8f650 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 16 Mar 2024 02:10:39 +0530
Subject: [PATCH 1/4] fixes the issue

---
 src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index c6ace2b0856e..47cd1b3b0897 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -224,7 +224,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
 
     const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy);
     const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
-    const isLoading = reimbursementAccount?.isLoading ?? true;
+    const isLoading = reimbursementAccount?.isLoading && reimbursementAccount?.achData === undefined;
 
     return (
         <WorkspacePageWithSections

From e1af8c7fe1219c90a450a0124fd96e4173c00b78 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Tue, 19 Mar 2024 16:32:36 +0530
Subject: [PATCH 2/4] fixes infinite loading

---
 src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index 47cd1b3b0897..f205f808e02c 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -236,6 +236,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
             shouldShowNotFoundPage={!isPaidGroupPolicy || !isPolicyAdmin}
             shouldSkipVBBACall
             isLoading={isLoading}
+            shouldShowLoading={isLoading}
         >
             <View style={[styles.mt3, styles.textStrong, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                 <Section

From d0f8e817e4c73f0dafc5a1a5ad8b46c5ec8bb70a Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 23 Mar 2024 04:50:47 +0530
Subject: [PATCH 3/4] show stal data if available

---
 src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index 95ec0d4196c4..dd9de4a586ee 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -264,7 +264,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
 
     const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy);
     const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
-    const isLoading = reimbursementAccount?.isLoading && reimbursementAccount?.achData === undefined;
+    const isLoading = reimbursementAccount?.isLoading && policy?.reimbursementChoice === undefined
 
     return (
         <FeatureEnabledAccessOrNotFoundWrapper

From 29181d78f6c70f31cd0e8a58e0e6b484d186df56 Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <ishpaul207@gmail.com>
Date: Sat, 23 Mar 2024 05:04:08 +0530
Subject: [PATCH 4/4] prettier diffs

---
 src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index dd9de4a586ee..fb9a463de01a 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -264,7 +264,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
 
     const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy);
     const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
-    const isLoading = reimbursementAccount?.isLoading && policy?.reimbursementChoice === undefined
+    const isLoading = reimbursementAccount?.isLoading && policy?.reimbursementChoice === undefined;
 
     return (
         <FeatureEnabledAccessOrNotFoundWrapper