From 1010b09b5c02352c297064b2e9d197bed2d180d8 Mon Sep 17 00:00:00 2001 From: Nicolay Arefyeu Date: Wed, 3 Sep 2025 15:26:18 +0300 Subject: [PATCH 1/2] Fix condition for USD currency in Reimbursment --- src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index 4631a32c1758..44512fae1d60 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -84,7 +84,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy, navigation}: const prevIsOffline = usePrevious(isOffline); const policyCurrency = policy?.outputCurrency ?? ''; const hasUnsupportedCurrency = - isComingFromExpensifyCard && isBetaEnabled(CONST.BETAS.EXPENSIFY_CARD_EU_UK) + isComingFromExpensifyCard && isBetaEnabled(CONST.BETAS.EXPENSIFY_CARD_EU_UK) && policyCurrency !== CONST.CURRENCY.USD ? !isCurrencySupportedForECards(policyCurrency) : !isCurrencySupportedForGlobalReimbursement(policyCurrency as CurrencyType, isBetaEnabled(CONST.BETAS.GLOBAL_REIMBURSEMENTS_ON_ND)); const isNonUSDWorkspace = policyCurrency !== CONST.CURRENCY.USD; From cbb2241e01b8bf12fcde5e8a65bc11ac8ce327cf Mon Sep 17 00:00:00 2001 From: Nicolay Arefyeu Date: Wed, 3 Sep 2025 16:21:36 +0300 Subject: [PATCH 2/2] comment --- src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index 44512fae1d60..ca846c553257 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -83,11 +83,11 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy, navigation}: const prevReimbursementAccount = usePrevious(reimbursementAccount); const prevIsOffline = usePrevious(isOffline); const policyCurrency = policy?.outputCurrency ?? ''; + const isNonUSDWorkspace = policyCurrency !== CONST.CURRENCY.USD; const hasUnsupportedCurrency = - isComingFromExpensifyCard && isBetaEnabled(CONST.BETAS.EXPENSIFY_CARD_EU_UK) && policyCurrency !== CONST.CURRENCY.USD + isComingFromExpensifyCard && isBetaEnabled(CONST.BETAS.EXPENSIFY_CARD_EU_UK) && isNonUSDWorkspace ? !isCurrencySupportedForECards(policyCurrency) : !isCurrencySupportedForGlobalReimbursement(policyCurrency as CurrencyType, isBetaEnabled(CONST.BETAS.GLOBAL_REIMBURSEMENTS_ON_ND)); - const isNonUSDWorkspace = policyCurrency !== CONST.CURRENCY.USD; const nonUSDCountryDraftValue = reimbursementAccountDraft?.country ?? ''; let workspaceRoute = ''; const isFocused = useIsFocused();