From fccaf9b3ea56095e2e1dfc9678c6ca213bb4d196 Mon Sep 17 00:00:00 2001 From: allgandalf Date: Fri, 4 Jul 2025 12:07:12 +0530 Subject: [PATCH 1/3] Show only USD currency symbol for expensify cards --- src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx | 2 +- .../workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx index 9c2d5093595b..e834b7e12e25 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx @@ -55,7 +55,7 @@ function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelPr const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID; - const policyCurrency = useMemo(() => policy?.outputCurrency ?? CONST.CURRENCY.USD, [policy]); + const policyCurrency = CONST.CURRENCY.USD const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`); const [cardManualBilling] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_MANUAL_BILLING}${workspaceAccountID}`); const paymentBankAccountID = cardSettings?.paymentBankAccountID; diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx index ba318add3987..61ea5f1ca44b 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx @@ -80,7 +80,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp const {windowHeight} = useWindowDimensions(); const headerHeight = useEmptyViewHeaderHeight(shouldUseNarrowLayout, isBankAccountVerified); - const policyCurrency = useMemo(() => policy?.outputCurrency ?? CONST.CURRENCY.USD, [policy]); + const policyCurrency = CONST.CURRENCY.USD const allCards = useMemo(() => { const policyMembersAccountIDs = Object.values(getMemberAccountIDsForWorkspace(policy?.employeeList)); From 8b43fdb6c771379978b4f0f346917ae13dc5faf5 Mon Sep 17 00:00:00 2001 From: allgandalf Date: Sun, 6 Jul 2025 21:46:28 +0530 Subject: [PATCH 2/3] fix prettier and esLint --- .../workspace/expensifyCard/WorkspaceCardsListLabel.tsx | 8 ++++---- .../expensifyCard/WorkspaceExpensifyCardListPage.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx index e834b7e12e25..2679c4834166 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx @@ -48,16 +48,16 @@ function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelPr const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout(); const theme = useTheme(); const {translate} = useLocalize(); - const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST); + const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {canBeMissing: true}); const [isVisible, setVisible] = useState(false); const [anchorPosition, setAnchorPosition] = useState({top: 0, left: 0}); const anchorRef = useRef(null); const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID; - const policyCurrency = CONST.CURRENCY.USD - const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`); - const [cardManualBilling] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_MANUAL_BILLING}${workspaceAccountID}`); + const policyCurrency = CONST.CURRENCY.USD; + const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`, {canBeMissing: true}); + const [cardManualBilling] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_MANUAL_BILLING}${workspaceAccountID}`, {canBeMissing: true}); const paymentBankAccountID = cardSettings?.paymentBankAccountID; const isLessThanMediumScreen = isMediumScreenWidth || shouldUseNarrowLayout; diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx index 61ea5f1ca44b..7b30166eaf6b 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx @@ -80,7 +80,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp const {windowHeight} = useWindowDimensions(); const headerHeight = useEmptyViewHeaderHeight(shouldUseNarrowLayout, isBankAccountVerified); - const policyCurrency = CONST.CURRENCY.USD + const policyCurrency = CONST.CURRENCY.USD; const allCards = useMemo(() => { const policyMembersAccountIDs = Object.values(getMemberAccountIDsForWorkspace(policy?.employeeList)); From 39d2f4769e8270c927a86dd4ccfed2a73a526aa3 Mon Sep 17 00:00:00 2001 From: allgandalf Date: Mon, 7 Jul 2025 15:44:52 +0530 Subject: [PATCH 3/3] add explanatory comments --- src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx | 1 + .../workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx index 2679c4834166..7e416219db36 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx @@ -55,6 +55,7 @@ function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelPr const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID; + // Currently Expensify Cards only support USD, once support for more currencies is implemented, we will need to update this const policyCurrency = CONST.CURRENCY.USD; const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`, {canBeMissing: true}); const [cardManualBilling] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_MANUAL_BILLING}${workspaceAccountID}`, {canBeMissing: true}); diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx index 7b30166eaf6b..8a0db27da1e8 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx @@ -80,6 +80,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp const {windowHeight} = useWindowDimensions(); const headerHeight = useEmptyViewHeaderHeight(shouldUseNarrowLayout, isBankAccountVerified); + // Currently Expensify Cards only support USD, once support for more currencies is implemented, we will need to update this const policyCurrency = CONST.CURRENCY.USD; const allCards = useMemo(() => {