@@ -18,7 +18,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
1818import { getEligibleBankAccountsForCard , getEligibleBankAccountsForUkEuCard } from '@libs/CardUtils' ;
1919import type { PlatformStackScreenProps } from '@libs/Navigation/PlatformStackNavigation/types' ;
2020import type { WorkspaceSplitNavigatorParamList } from '@libs/Navigation/types' ;
21- import { REIMBURSEMENT_ACCOUNT_ROUTE_NAMES } from '@libs/ReimbursementAccountUtils' ;
21+ import { hasInProgressUSDVBBA , REIMBURSEMENT_ACCOUNT_ROUTE_NAMES } from '@libs/ReimbursementAccountUtils' ;
2222import Navigation from '@navigation/Navigation' ;
2323import type { WithPolicyAndFullscreenLoadingProps } from '@pages/workspace/withPolicyAndFullscreenLoading' ;
2424import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading' ;
@@ -29,7 +29,6 @@ import CONST from '@src/CONST';
2929import ONYXKEYS from '@src/ONYXKEYS' ;
3030import ROUTES from '@src/ROUTES' ;
3131import type SCREENS from '@src/SCREENS' ;
32- import { isEmptyObject } from '@src/types/utils/EmptyObject' ;
3332
3433type WorkspaceExpensifyCardPageEmptyStateProps = {
3534 route : PlatformStackScreenProps < WorkspaceSplitNavigatorParamList , typeof SCREENS . WORKSPACE . EXPENSIFY_CARD > [ 'route' ] ;
@@ -48,8 +47,7 @@ function WorkspaceExpensifyCardPageEmptyState({route, policy}: WorkspaceExpensif
4847 const { isActingAsDelegate, showDelegateNoAccessModal} = useContext ( DelegateNoAccessContext ) ;
4948 const { isAccountLocked, showLockedAccountModal} = useContext ( LockedAccountContext ) ;
5049
51- const reimbursementAccountStatus = reimbursementAccount ?. achData ?. state ?? '' ;
52- const isSetupUnfinished = isEmptyObject ( bankAccountList ) && reimbursementAccountStatus && reimbursementAccountStatus !== CONST . BANK_ACCOUNT . STATE . OPEN ;
50+ const isSetupUnfinished = hasInProgressUSDVBBA ( reimbursementAccount ?. achData ) ;
5351 const isUkEuCurrencySupported = useExpensifyCardUkEuSupported ( policy ?. id ) ;
5452
5553 const eligibleBankAccounts = isUkEuCurrencySupported ? getEligibleBankAccountsForUkEuCard ( bankAccountList , policy ?. outputCurrency ) : getEligibleBankAccountsForCard ( bankAccountList ) ;
0 commit comments