From 62d9149a08e4e2d98e89ed3ce1fc7b393b9616a2 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Thu, 11 Dec 2025 15:29:59 +0700
Subject: [PATCH] fix: Card name row reappears on confirmation page

---
 .../expensifyCard/issueNew/CardNameStep.tsx   | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
index 73dc495cee3c..08544136c711 100644
--- a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
@@ -17,6 +17,7 @@ import {setIssueNewCardStepAndData} from '@userActions/Card';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/IssueNewExpensifyCardForm';
+import KeyboardUtils from '@src/utils/keyboard';
 
 type CardNameStepProps = {
     /** ID of the policy */
@@ -52,24 +53,28 @@ function CardNameStep({policyID, stepNames, startStepIndex}: CardNameStepProps)
 
     const submit = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM>) => {
-            setIssueNewCardStepAndData({
-                step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION,
-                data: {
-                    cardTitle: values.cardTitle,
-                },
-                isEditing: false,
-                policyID,
+            KeyboardUtils.dismiss().then(() => {
+                setIssueNewCardStepAndData({
+                    step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION,
+                    data: {
+                        cardTitle: values.cardTitle,
+                    },
+                    isEditing: false,
+                    policyID,
+                });
             });
         },
         [policyID],
     );
 
     const handleBackButtonPress = useCallback(() => {
-        if (isEditing) {
-            setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false, policyID});
-            return;
-        }
-        setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.LIMIT, policyID});
+        KeyboardUtils.dismiss().then(() => {
+            if (isEditing) {
+                setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false, policyID});
+                return;
+            }
+            setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.LIMIT, policyID});
+        });
     }, [isEditing, policyID]);
 
     return (