From 9627326a9740595b63483b5b24cbaad20d98060a Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Sun, 22 Feb 2026 03:22:21 +0500 Subject: [PATCH 1/5] fix: allow mock bank display when using staging server --- src/pages/workspace/companyCards/addNew/SelectBankStep.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx index 23f73aed73cda..cbaf5e1fb3844 100644 --- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx +++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx @@ -35,6 +35,7 @@ function SelectBankStep() { const {isOffline} = useNetwork(); const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD, {canBeMissing: true}); + const [shouldUseStagingServer] = useOnyx(ONYXKEYS.SHOULD_USE_STAGING_SERVER, {canBeMissing: true}); const [localBankSelected, setLocalBankSelected] = useState | null>(); const bankSelected = localBankSelected ?? addNewCard?.data.selectedBank; const [hasError, setHasError] = useState(false); @@ -66,9 +67,9 @@ function SelectBankStep() { const data = Object.values(CONST.COMPANY_CARDS.BANKS) .filter((bank) => { - // Only show Mock Bank when the frontend environment is not production + // Only show Mock Bank when the frontend environment is not production or using staging server if (bank === CONST.COMPANY_CARDS.BANKS.MOCK_BANK) { - return CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.PRODUCTION; + return CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.PRODUCTION || !!shouldUseStagingServer; } return true; }) From 0b92f5b6e872acf7a0c43f54bfae9e326a6975c1 Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Sun, 22 Feb 2026 04:09:33 +0500 Subject: [PATCH 2/5] update mock bank visibility to include debug mode check for staging server --- src/pages/workspace/companyCards/addNew/SelectBankStep.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx index cbaf5e1fb3844..1890eee2bf652 100644 --- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx +++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx @@ -35,7 +35,8 @@ function SelectBankStep() { const {isOffline} = useNetwork(); const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD, {canBeMissing: true}); - const [shouldUseStagingServer] = useOnyx(ONYXKEYS.SHOULD_USE_STAGING_SERVER, {canBeMissing: true}); + const [shouldUseStagingServer = false] = useOnyx(ONYXKEYS.SHOULD_USE_STAGING_SERVER, {canBeMissing: true}); + const [isDebugModeEnabled = false] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED, {canBeMissing: true}); const [localBankSelected, setLocalBankSelected] = useState | null>(); const bankSelected = localBankSelected ?? addNewCard?.data.selectedBank; const [hasError, setHasError] = useState(false); @@ -67,9 +68,9 @@ function SelectBankStep() { const data = Object.values(CONST.COMPANY_CARDS.BANKS) .filter((bank) => { - // Only show Mock Bank when the frontend environment is not production or using staging server + // Only show Mock Bank when the frontend environment is not production or when using the staging server with debug mode enabled if (bank === CONST.COMPANY_CARDS.BANKS.MOCK_BANK) { - return CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.PRODUCTION || !!shouldUseStagingServer; + return CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.PRODUCTION || (shouldUseStagingServer && isDebugModeEnabled); } return true; }) From 7ec660d1e32df1e87690ef328b97a67795baff17 Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Mon, 23 Feb 2026 20:32:08 +0500 Subject: [PATCH 3/5] remove isDebugModeEnabled check for mock --- src/pages/workspace/companyCards/addNew/SelectBankStep.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx index e9e32fd983ffc..4225f91d2bdaf 100644 --- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx +++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx @@ -36,7 +36,6 @@ function SelectBankStep() { const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD); const [shouldUseStagingServer = false] = useOnyx(ONYXKEYS.SHOULD_USE_STAGING_SERVER, {canBeMissing: true}); - const [isDebugModeEnabled = false] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED, {canBeMissing: true}); const [localBankSelected, setLocalBankSelected] = useState | null>(); const bankSelected = localBankSelected ?? addNewCard?.data.selectedBank; const [hasError, setHasError] = useState(false); @@ -70,7 +69,7 @@ function SelectBankStep() { .filter((bank) => { // Only show Mock Bank when the frontend environment is not production or when using the staging server with debug mode enabled if (bank === CONST.COMPANY_CARDS.BANKS.MOCK_BANK) { - return CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.PRODUCTION || (shouldUseStagingServer && isDebugModeEnabled); + return CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.PRODUCTION || shouldUseStagingServer; } return true; }) From 62e051f68d1dd590264a38d9ba4b0d072b81e830 Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Mon, 23 Feb 2026 21:36:06 +0500 Subject: [PATCH 4/5] remove canBeMissing option from useOnyx for shouldUseStagingServer --- src/pages/workspace/companyCards/addNew/SelectBankStep.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx index 4225f91d2bdaf..8460f92fbc014 100644 --- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx +++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx @@ -35,7 +35,7 @@ function SelectBankStep() { const {isOffline} = useNetwork(); const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD); - const [shouldUseStagingServer = false] = useOnyx(ONYXKEYS.SHOULD_USE_STAGING_SERVER, {canBeMissing: true}); + const [shouldUseStagingServer = false] = useOnyx(ONYXKEYS.SHOULD_USE_STAGING_SERVER); const [localBankSelected, setLocalBankSelected] = useState | null>(); const bankSelected = localBankSelected ?? addNewCard?.data.selectedBank; const [hasError, setHasError] = useState(false); From 2a1cd1e37fa346ae6b5f8ec74a4bc6d71f69a34e Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Mon, 23 Feb 2026 09:00:27 -0800 Subject: [PATCH 5/5] Update comment Co-authored-by: Amy Evans --- src/pages/workspace/companyCards/addNew/SelectBankStep.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx index 8460f92fbc014..105d9aba497d9 100644 --- a/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx +++ b/src/pages/workspace/companyCards/addNew/SelectBankStep.tsx @@ -67,7 +67,7 @@ function SelectBankStep() { const data = Object.values(CONST.COMPANY_CARDS.BANKS) .filter((bank) => { - // Only show Mock Bank when the frontend environment is not production or when using the staging server with debug mode enabled + // Only show Mock Bank when the frontend environment is not production or when using the staging server if (bank === CONST.COMPANY_CARDS.BANKS.MOCK_BANK) { return CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.PRODUCTION || shouldUseStagingServer; }