From 6a99bf9dea6c8f12a0b9912aa321e66901f9661f Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Tue, 18 Mar 2025 12:31:06 +0100
Subject: [PATCH 1/6] Show assignCard error on the confirmation page

---
 src/libs/actions/CompanyCards.ts              | 15 +++++++
 .../assignCard/ConfirmationStep.tsx           | 39 +++++++++++++------
 src/types/onyx/AssignCard.ts                  |  6 +++
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/libs/actions/CompanyCards.ts b/src/libs/actions/CompanyCards.ts
index fdd6c363b1724..6b62b58f2e272 100644
--- a/src/libs/actions/CompanyCards.ts
+++ b/src/libs/actions/CompanyCards.ts
@@ -314,6 +314,11 @@ function assignWorkspaceCompanyCard(policyID: string, data?: Partial<AssignCardD
                     [optimisticCardAssignedReportAction.reportActionID]: optimisticCardAssignedReportAction,
                 },
             },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.ASSIGN_CARD,
+                value: {isAssigning: true},
+            },
         ],
         successData: [
             {
@@ -321,6 +326,11 @@ function assignWorkspaceCompanyCard(policyID: string, data?: Partial<AssignCardD
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${policyExpenseChat?.reportID}`,
                 value: {[optimisticCardAssignedReportAction.reportActionID]: {pendingAction: null}},
             },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.ASSIGN_CARD,
+                value: {isAssigned: true, isAssigning: false},
+            },
         ],
         failureData: [
             {
@@ -333,6 +343,11 @@ function assignWorkspaceCompanyCard(policyID: string, data?: Partial<AssignCardD
                     },
                 },
             },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.ASSIGN_CARD,
+                value: {isAssigning: false},
+            },
         ],
     };
 
diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
index a5fdbb6d1433a..b62adf18889bb 100644
--- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
-import {View} from 'react-native';
+import React, {useEffect} from 'react';
+import {InteractionManager, View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import InteractiveStepWrapper from '@components/InteractiveStepWrapper';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
@@ -37,13 +38,19 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
     const data = assignCard?.data;
     const cardholderName = PersonalDetailsUtils.getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
 
+    useEffect(() => {
+        if (!assignCard?.isAssigned) {
+            return;
+        }
+        Navigation.navigate(backTo ?? ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+        InteractionManager.runAfterInteractions(() => CompanyCards.clearAssignCardStepAndData());
+    }, [assignCard, backTo, policyID]);
+
     const submit = () => {
         if (!policyID) {
             return;
         }
         CompanyCards.assignWorkspaceCompanyCard(policyID, data);
-        Navigation.navigate(backTo ?? ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
-        CompanyCards.clearAssignCardStepAndData();
     };
 
     const editStep = (step: AssignCardStep) => {
@@ -94,14 +101,22 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
                     onPress={() => editStep(CONST.COMPANY_CARD.STEP.CARD_NAME)}
                 />
                 <View style={[styles.mh5, styles.pb5, styles.mt3, styles.flexGrow1, styles.justifyContentEnd]}>
-                    <Button
-                        isDisabled={isOffline}
-                        success
-                        large
-                        style={styles.w100}
-                        onPress={submit}
-                        text={translate('workspace.companyCards.assignCard')}
-                    />
+                    <OfflineWithFeedback
+                        shouldDisplayErrorAbove
+                        errors={assignCard?.errors}
+                        errorRowStyles={styles.mv2}
+                        canDismissError={false}
+                    >
+                        <Button
+                            isDisabled={isOffline}
+                            success
+                            large
+                            isLoading={assignCard?.isAssigning}
+                            style={styles.w100}
+                            onPress={submit}
+                            text={translate('workspace.companyCards.assignCard')}
+                        />
+                    </OfflineWithFeedback>
                 </View>
             </ScrollView>
         </InteractiveStepWrapper>
diff --git a/src/types/onyx/AssignCard.ts b/src/types/onyx/AssignCard.ts
index 3e69de72541f1..c497551bbf1fd 100644
--- a/src/types/onyx/AssignCard.ts
+++ b/src/types/onyx/AssignCard.ts
@@ -38,6 +38,12 @@ type AssignCard = {
 
     /** Whether the user is editing step */
     isEditing: boolean;
+
+    /** Whether the card is successfully assigned */
+    isAssigned?: boolean;
+
+    /** Whether the card is assigning */
+    isAssigning?: boolean;
 };
 
 export type {AssignCard, AssignCardStep, AssignCardData};

From ac68c1fdb5c5a74638c7086c74ff5d2f50cb7d2f Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Tue, 18 Mar 2025 13:11:28 +0100
Subject: [PATCH 2/6] Improve broken connection handling on the confirmation
 step

---
 .../companyCards/BankConnection/index.native.tsx     |  3 ++-
 .../workspace/companyCards/BankConnection/index.tsx  |  3 ++-
 .../companyCards/assignCard/ConfirmationStep.tsx     | 12 ++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/companyCards/BankConnection/index.native.tsx b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
index 6639ba152c910..0f081ca46b45e 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.native.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
@@ -44,6 +44,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
     const theme = useTheme();
     const webViewRef = useRef<WebView>(null);
     const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
     const authToken = session?.authToken ?? null;
     const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD);
     const {bankName: bankNameFromRoute, backTo, policyID: policyIDFromRoute} = route?.params ?? {};
@@ -92,7 +93,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
         // Handle assign card flow
         if (feed && !isFeedExpired) {
             setAssignCardStepAndData({
-                currentStep: CONST.COMPANY_CARD.STEP.ASSIGNEE,
+                currentStep: assignCard?.data?.encryptedCardNumber ? CONST.COMPANY_CARD.STEP.CONFIRMATION : CONST.COMPANY_CARD.STEP.ASSIGNEE,
                 isEditing: false,
             });
             return;
diff --git a/src/pages/workspace/companyCards/BankConnection/index.tsx b/src/pages/workspace/companyCards/BankConnection/index.tsx
index 5365110641051..b95837981af2f 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.tsx
@@ -44,6 +44,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD);
+    const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
     const {bankName: bankNameFromRoute, backTo, policyID: policyIDFromRoute} = route?.params ?? {};
     const policyID = policyIDFromProps ?? policyIDFromRoute;
     const workspaceAccountID = useWorkspaceAccountID(policyID);
@@ -108,7 +109,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
             if (!isFeedExpired) {
                 customWindow?.close();
                 setAssignCardStepAndData({
-                    currentStep: CONST.COMPANY_CARD.STEP.ASSIGNEE,
+                    currentStep: assignCard?.data?.encryptedCardNumber ? CONST.COMPANY_CARD.STEP.CONFIRMATION : CONST.COMPANY_CARD.STEP.ASSIGNEE,
                     isEditing: false,
                 });
                 return;
diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
index b62adf18889bb..1e2a08df3e45f 100644
--- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
@@ -10,14 +10,18 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
 import * as CardUtils from '@libs/CardUtils';
+import {isSelectedFeedExpired} from '@libs/CardUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import Navigation from '@navigation/Navigation';
 import * as CompanyCards from '@userActions/CompanyCards';
+import {setAssignCardStepAndData} from '@userActions/CompanyCards';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
+import type {CompanyCardFeed} from '@src/types/onyx';
 import type {AssignCardStep} from '@src/types/onyx/AssignCard';
 
 type ConfirmationStepProps = {
@@ -32,8 +36,12 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
+    const workspaceAccountID = useWorkspaceAccountID(policyID);
 
     const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
+    const feed = assignCard?.data?.bankName as CompanyCardFeed | undefined;
+    const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
+    const isFeedExpired = isSelectedFeedExpired(feed ? cardFeeds?.settings?.oAuthAccountDetails?.[feed] : undefined);
 
     const data = assignCard?.data;
     const cardholderName = PersonalDetailsUtils.getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
@@ -50,6 +58,10 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
         if (!policyID) {
             return;
         }
+        if (isFeedExpired) {
+            setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION});
+            return;
+        }
         CompanyCards.assignWorkspaceCompanyCard(policyID, data);
     };
 

From e95c239985e2e72a95311d40644b001d514246e8 Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Tue, 18 Mar 2025 14:55:24 +0100
Subject: [PATCH 3/6] Minor improvements

---
 .../workspace/companyCards/BankConnection/index.native.tsx      | 2 +-
 src/pages/workspace/companyCards/BankConnection/index.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/companyCards/BankConnection/index.native.tsx b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
index 0f081ca46b45e..2399199371cba 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.native.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
@@ -93,7 +93,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
         // Handle assign card flow
         if (feed && !isFeedExpired) {
             setAssignCardStepAndData({
-                currentStep: assignCard?.data?.encryptedCardNumber ? CONST.COMPANY_CARD.STEP.CONFIRMATION : CONST.COMPANY_CARD.STEP.ASSIGNEE,
+                currentStep: assignCard?.data?.dateOption ? CONST.COMPANY_CARD.STEP.CONFIRMATION : CONST.COMPANY_CARD.STEP.ASSIGNEE,
                 isEditing: false,
             });
             return;
diff --git a/src/pages/workspace/companyCards/BankConnection/index.tsx b/src/pages/workspace/companyCards/BankConnection/index.tsx
index b95837981af2f..3aced454c9534 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.tsx
@@ -109,7 +109,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
             if (!isFeedExpired) {
                 customWindow?.close();
                 setAssignCardStepAndData({
-                    currentStep: assignCard?.data?.encryptedCardNumber ? CONST.COMPANY_CARD.STEP.CONFIRMATION : CONST.COMPANY_CARD.STEP.ASSIGNEE,
+                    currentStep: assignCard?.data?.dateOption ? CONST.COMPANY_CARD.STEP.CONFIRMATION : CONST.COMPANY_CARD.STEP.ASSIGNEE,
                     isEditing: false,
                 });
                 return;

From 8c846ef3e95abce0951efa1930a1f38c4b0df37e Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Tue, 18 Mar 2025 15:20:25 +0100
Subject: [PATCH 4/6] Lint fixes

---
 .../BankConnection/index.native.tsx           |  2 +-
 .../companyCards/BankConnection/index.tsx     |  2 +-
 .../assignCard/ConfirmationStep.tsx           | 20 +++++++++----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/pages/workspace/companyCards/BankConnection/index.native.tsx b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
index 2399199371cba..fbf9cce77e9d8 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.native.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
@@ -106,7 +106,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
             }
             Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
         }
-    }, [isNewFeedConnected, newFeed, policyID, url, feed, isFeedExpired]);
+    }, [isNewFeedConnected, newFeed, policyID, url, feed, isFeedExpired, assignCard]);
 
     const checkIfConnectionCompleted = (navState: WebViewNavigation) => {
         if (!navState.url.includes(ROUTES.BANK_CONNECTION_COMPLETE)) {
diff --git a/src/pages/workspace/companyCards/BankConnection/index.tsx b/src/pages/workspace/companyCards/BankConnection/index.tsx
index 3aced454c9534..999a98fb9618b 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.tsx
@@ -131,7 +131,7 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
         if (!shouldBlockWindowOpen) {
             customWindow = openBankConnection(url);
         }
-    }, [isNewFeedConnected, shouldBlockWindowOpen, newFeed, policyID, url, feed, isFeedExpired, isOffline]);
+    }, [isNewFeedConnected, shouldBlockWindowOpen, newFeed, policyID, url, feed, isFeedExpired, isOffline, assignCard]);
 
     return (
         <ScreenWrapper testID={BankConnection.displayName}>
diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
index 1e2a08df3e45f..ee048144de807 100644
--- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
@@ -11,12 +11,10 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
-import * as CardUtils from '@libs/CardUtils';
-import {isSelectedFeedExpired} from '@libs/CardUtils';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import {isSelectedFeedExpired, maskCardNumber} from '@libs/CardUtils';
+import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
 import Navigation from '@navigation/Navigation';
-import * as CompanyCards from '@userActions/CompanyCards';
-import {setAssignCardStepAndData} from '@userActions/CompanyCards';
+import {assignWorkspaceCompanyCard, clearAssignCardStepAndData, setAssignCardStepAndData} from '@userActions/CompanyCards';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -44,14 +42,14 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
     const isFeedExpired = isSelectedFeedExpired(feed ? cardFeeds?.settings?.oAuthAccountDetails?.[feed] : undefined);
 
     const data = assignCard?.data;
-    const cardholderName = PersonalDetailsUtils.getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
+    const cardholderName = getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
 
     useEffect(() => {
         if (!assignCard?.isAssigned) {
             return;
         }
         Navigation.navigate(backTo ?? ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
-        InteractionManager.runAfterInteractions(() => CompanyCards.clearAssignCardStepAndData());
+        InteractionManager.runAfterInteractions(() => clearAssignCardStepAndData());
     }, [assignCard, backTo, policyID]);
 
     const submit = () => {
@@ -62,15 +60,15 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
             setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION});
             return;
         }
-        CompanyCards.assignWorkspaceCompanyCard(policyID, data);
+        assignWorkspaceCompanyCard(policyID, data);
     };
 
     const editStep = (step: AssignCardStep) => {
-        CompanyCards.setAssignCardStepAndData({currentStep: step, isEditing: true});
+        setAssignCardStepAndData({currentStep: step, isEditing: true});
     };
 
     const handleBackButtonPress = () => {
-        CompanyCards.setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE});
+        setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE});
     };
 
     return (
@@ -96,7 +94,7 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
                 />
                 <MenuItemWithTopDescription
                     description={translate('workspace.companyCards.card')}
-                    title={CardUtils.maskCardNumber(data?.cardNumber ?? '', data?.bankName)}
+                    title={maskCardNumber(data?.cardNumber ?? '', data?.bankName)}
                     shouldShowRightIcon
                     onPress={() => editStep(CONST.COMPANY_CARD.STEP.CARD)}
                 />

From d2fe8138627ed002e471c0752ba817773fee134f Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Wed, 19 Mar 2025 10:03:54 +0100
Subject: [PATCH 5/6] Minor fix

---
 .../workspace/companyCards/assignCard/ConfirmationStep.tsx    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
index ee048144de807..e887e3eec9178 100644
--- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
@@ -39,7 +39,6 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
     const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
     const feed = assignCard?.data?.bankName as CompanyCardFeed | undefined;
     const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
-    const isFeedExpired = isSelectedFeedExpired(feed ? cardFeeds?.settings?.oAuthAccountDetails?.[feed] : undefined);
 
     const data = assignCard?.data;
     const cardholderName = getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
@@ -56,6 +55,9 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
         if (!policyID) {
             return;
         }
+
+        const isFeedExpired = isSelectedFeedExpired(feed ? cardFeeds?.settings?.oAuthAccountDetails?.[feed] : undefined);
+
         if (isFeedExpired) {
             setAssignCardStepAndData({currentStep: CONST.COMPANY_CARD.STEP.BANK_CONNECTION});
             return;

From 6bb60ca3b3c263941eb9549ae865a349667b751d Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Thu, 20 Mar 2025 16:10:12 +0100
Subject: [PATCH 6/6] Minor fix

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

diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
index 94b8369977bac..825c54ca938ab 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
@@ -64,7 +64,6 @@ function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
     const isNoFeed = !selectedFeedData;
     const isPending = !!selectedFeedData?.pending;
     const isFeedAdded = !isPending && !isNoFeed;
-    const isFeedExpired = isSelectedFeedExpired(selectedFeed ? cardFeeds?.settings?.oAuthAccountDetails?.[selectedFeed] : undefined);
     const isFeedConnectionBroken = checkIfFeedConnectionIsBroken(cards);
     const [shouldShowOfflineModal, setShouldShowOfflineModal] = useState(false);
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -111,6 +110,7 @@ function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
 
         let currentStep: AssignCardStep = CONST.COMPANY_CARD.STEP.ASSIGNEE;
         const employeeList = Object.values(policy?.employeeList ?? {}).filter((employee) => !isDeletedPolicyEmployee(employee, isOffline));
+        const isFeedExpired = isSelectedFeedExpired(selectedFeed ? cardFeeds?.settings?.oAuthAccountDetails?.[selectedFeed] : undefined);
 
         if (employeeList.length === 1) {
             const userEmail = Object.keys(policy?.employeeList ?? {}).at(0) ?? '';