Updates

Author: ShridharGoel

src/pages/settings/Wallet/ExpensifyCardPage/index.tsx

@@ -143,7 +143,10 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {
 
     const hasDetectedDomainFraud = cardsToShow?.some((card) => card?.fraud === CONST.EXPENSIFY_CARD.FRAUD_TYPES.DOMAIN);
     const hasDetectedIndividualFraud = cardsToShow?.some((card) => card?.fraud === CONST.EXPENSIFY_CARD.FRAUD_TYPES.INDIVIDUAL);
-    const currentPhysicalCard = physicalCards?.find((card) => String(card?.cardID) === cardID);
+    const currentPhysicalCard = useMemo(
+        () => physicalCards?.find((card) => String(card?.cardID) === cardID) ?? physicalCards?.at(0),
+        [physicalCards, cardID],
+    );
 
     // Cards that are already activated and working (OPEN) and cards shipped but not activated yet can be reported as missing or damaged
     const shouldShowReportLostCardButton = currentPhysicalCard?.state === CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED || currentPhysicalCard?.state === CONST.EXPENSIFY_CARD.STATE.OPEN;

tests/ui/WalletExpensifyCardPageTest.tsx

@@ -240,4 +240,52 @@ describe('ExpensifyCardPage', () => {
         unmount();
         await waitForBatchedUpdatesWithAct();
     });
+
+    it('should still show physical card details when opening a combo card page via the virtual card ID', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.CARD_LIST, {
+                1234: {
+                    cardID: 1234,
+                    state: CONST.EXPENSIFY_CARD.STATE.OPEN,
+                    domainName: 'combo-domain',
+                    fundID: '12345',
+                    nameValuePairs: {
+                        isVirtual: false,
+                        cardTitle: 'Combo Physical Card',
+                        feedCountry: CONST.COUNTRY.GB,
+                    },
+                    availableSpend: 50000,
+                    fraud: null,
+                    lastFourPAN: '1234',
+                },
+                5678: {
+                    cardID: 5678,
+                    state: CONST.EXPENSIFY_CARD.STATE.OPEN,
+                    domainName: 'combo-domain',
+                    fundID: '12345',
+                    nameValuePairs: {
+                        isVirtual: true,
+                        cardTitle: 'Combo Virtual Card',
+                    },
+                    availableSpend: 50000,
+                    fraud: null,
+                    lastFourPAN: '5678',
+                },
+            });
+        });
+
+        const {unmount} = renderPage(SCREENS.SETTINGS.WALLET.DOMAIN_CARD, {cardID: '5678'});
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(screen.getByText(TestHelper.translateLocal('cardPage.virtualCardNumber'))).toBeOnTheScreen();
+            expect(screen.getByText(TestHelper.translateLocal('cardPage.physicalCardNumber'))).toBeOnTheScreen();
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
 });