From 67077a81273a97b196a264f5b0e5d1bfee8cfe32 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Thu, 12 Oct 2023 17:41:05 +0530
Subject: [PATCH 01/11] added enable wallet state

---
 src/languages/en.ts                       |  2 ++
 src/languages/es.ts                       |  2 ++
 src/pages/home/report/ReportActionItem.js | 25 ++++++++++++++++++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index f4c7bdc6ee603..c0f5214c76786 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -578,6 +578,8 @@ export default {
             genericEditFailureMessage: 'Unexpected error editing the money request, please try again later',
             genericSmartscanFailureMessage: 'Transaction is missing fields',
         },
+        waitingOnEnableWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
+        enableWallet: 'Enable Wallet',
     },
     notificationPreferencesPage: {
         header: 'Notification preferences',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1bbb056e82efd..de109ccc81c03 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -572,6 +572,8 @@ export default {
             genericEditFailureMessage: 'Error inesperado al guardar la solicitud de dinero. Por favor, inténtalo más tarde',
             genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
         },
+        waitingOnEnableWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `nicio el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
+        enableWallet: 'Habilitar Billetera',
     },
     notificationPreferencesPage: {
         header: 'Preferencias de avisos',
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index d0e84499a4434..08977cac9bdca 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -347,10 +347,20 @@ function ReportActionItem(props) {
             const submitterDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(props.personalDetailsList, [props.report.ownerAccountID, 'displayName'], props.report.ownerEmail);
             const shouldShowAddCreditBankAccountButton =
                 ReportUtils.isCurrentUserSubmitter(props.report.reportID) && !store.hasCreditBankAccount() && !ReportUtils.isSettled(props.report.reportID);
+            const shouldShowEnableWalletButton =
+                ReportUtils.isCurrentUserSubmitter(props.report.reportID) &&
+                lodashGet(props.action, 'paymentType', '') === CONST.IOU.PAYMENT_TYPE.EXPENSIFY &&
+                !ReportUtils.isSettled(props.report.reportID);
 
             children = (
-                <ReportActionItemBasicMessage message={props.translate('iou.waitingOnBankAccount', {submitterDisplayName})}>
-                    {shouldShowAddCreditBankAccountButton ? (
+                <ReportActionItemBasicMessage
+                    message={
+                        shouldShowEnableWalletButton
+                            ? props.translate('iou.waitingOnEnableWallet', {submitterDisplayName})
+                            : props.translate('iou.waitingOnBankAccount', {submitterDisplayName})
+                    }
+                >
+                    {shouldShowAddCreditBankAccountButton && (
                         <Button
                             success
                             style={[styles.w100, styles.requestPreviewBox]}
@@ -358,7 +368,16 @@ function ReportActionItem(props) {
                             onPress={() => BankAccounts.openPersonalBankAccountSetupView(props.report.reportID)}
                             pressOnEnter
                         />
-                    ) : null}
+                    )}
+                    {shouldShowEnableWalletButton && (
+                        <Button
+                            success
+                            style={[styles.w100, styles.requestPreviewBox]}
+                            text={props.translate('iou.enableWallet')}
+                            onPress={() => BankAccounts.openPersonalBankAccountSetupView(props.report.reportID)}
+                            pressOnEnter
+                        />
+                    )}
                 </ReportActionItemBasicMessage>
             );
         } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {

From d4a4d7bd5c58eab1283f4495a49e08e2e0101b28 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Thu, 12 Oct 2023 17:41:05 +0530
Subject: [PATCH 02/11] added enable wallet state

---
 src/pages/home/report/ReportActionItem.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 08977cac9bdca..3274a0599e961 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -351,7 +351,6 @@ function ReportActionItem(props) {
                 ReportUtils.isCurrentUserSubmitter(props.report.reportID) &&
                 lodashGet(props.action, 'paymentType', '') === CONST.IOU.PAYMENT_TYPE.EXPENSIFY &&
                 !ReportUtils.isSettled(props.report.reportID);
-
             children = (
                 <ReportActionItemBasicMessage
                     message={

From 56b0a7c8d38930d2c9d940bac56144a899784b62 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Tue, 17 Oct 2023 08:33:03 +0530
Subject: [PATCH 03/11] continue testing

---
 src/pages/home/report/ReportActionItem.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 3274a0599e961..c82a3ae712b95 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -70,6 +70,8 @@ import themeColors from '../../../styles/themes/default';
 import ReportActionItemBasicMessage from './ReportActionItemBasicMessage';
 import RenderHTML from '../../../components/RenderHTML';
 import ReportAttachmentsContext from './ReportAttachmentsContext';
+import ROUTES from '../../../ROUTES';
+import Navigation from '../../../libs/Navigation/Navigation';
 
 const propTypes = {
     ...windowDimensionsPropTypes,
@@ -345,12 +347,14 @@ function ReportActionItem(props) {
             );
         } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENTQUEUED) {
             const submitterDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(props.personalDetailsList, [props.report.ownerAccountID, 'displayName'], props.report.ownerEmail);
+            const paymentType = lodashGet(props.action, 'originalMessage.paymentType', '');
             const shouldShowAddCreditBankAccountButton =
-                ReportUtils.isCurrentUserSubmitter(props.report.reportID) && !store.hasCreditBankAccount() && !ReportUtils.isSettled(props.report.reportID);
-            const shouldShowEnableWalletButton =
                 ReportUtils.isCurrentUserSubmitter(props.report.reportID) &&
-                lodashGet(props.action, 'paymentType', '') === CONST.IOU.PAYMENT_TYPE.EXPENSIFY &&
-                !ReportUtils.isSettled(props.report.reportID);
+                !store.hasCreditBankAccount() &&
+                !ReportUtils.isSettled(props.report.reportID) &&
+                paymentType !== CONST.IOU.PAYMENT_TYPE.EXPENSIFY;
+            const shouldShowEnableWalletButton =
+                ReportUtils.isCurrentUserSubmitter(props.report.reportID) && paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY && !ReportUtils.isSettled(props.report.reportID);
             children = (
                 <ReportActionItemBasicMessage
                     message={
@@ -373,7 +377,7 @@ function ReportActionItem(props) {
                             success
                             style={[styles.w100, styles.requestPreviewBox]}
                             text={props.translate('iou.enableWallet')}
-                            onPress={() => BankAccounts.openPersonalBankAccountSetupView(props.report.reportID)}
+                            onPress={() => Navigation.navigate(ROUTES.ENABLE_PAYMENTS)}
                             pressOnEnter
                         />
                     )}

From 8eb244721c66f5c145b6ec0b1c16079e5b1b6a33 Mon Sep 17 00:00:00 2001
From: Maria DCosta <maria@expensify.com>
Date: Wed, 18 Oct 2023 17:02:21 +0400
Subject: [PATCH 04/11] DRY logic and check for silver wallet

---
 src/pages/home/report/ReportActionItem.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index d351fae5bebef..9cc2adc7b0b44 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -348,20 +348,14 @@ function ReportActionItem(props) {
         } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENTQUEUED) {
             const submitterDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(props.personalDetailsList, [props.report.ownerAccountID, 'displayName'], props.report.ownerEmail);
             const paymentType = lodashGet(props.action, 'originalMessage.paymentType', '');
-            const shouldShowAddCreditBankAccountButton =
-                ReportUtils.isCurrentUserSubmitter(props.report.reportID) &&
-                !store.hasCreditBankAccount() &&
-                !ReportUtils.isSettled(props.report.reportID) &&
-                paymentType !== CONST.IOU.PAYMENT_TYPE.EXPENSIFY;
-            const shouldShowEnableWalletButton =
-                ReportUtils.isCurrentUserSubmitter(props.report.reportID) && paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY && !ReportUtils.isSettled(props.report.reportID);
+
+            const isSubmitterOfUnsettledReport = ReportUtils.isCurrentUserSubmitter(props.report.reportID) && !ReportUtils.isSettled(props.report.reportID);
+            const shouldShowAddCreditBankAccountButton = isSubmitterOfUnsettledReport && !store.hasCreditBankAccount() && paymentType !== CONST.IOU.PAYMENT_TYPE.EXPENSIFY;
+            const shouldShowEnableWalletButton = isSubmitterOfUnsettledReport && props.userWallet.tierName == CONST.WALLET.TIER_NAME.SILVER && paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY;
+
             children = (
                 <ReportActionItemBasicMessage
-                    message={
-                        shouldShowEnableWalletButton
-                            ? props.translate('iou.waitingOnEnableWallet', {submitterDisplayName})
-                            : props.translate('iou.waitingOnBankAccount', {submitterDisplayName})
-                    }
+                    message={props.translate(shouldShowEnableWalletButton ? 'iou.waitingOnEnableWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
                 >
                     {shouldShowAddCreditBankAccountButton && (
                         <Button

From 88e4ca4654e7ad3f93250461d6ab96dabb35da5d Mon Sep 17 00:00:00 2001
From: Maria DCosta <maria@expensify.com>
Date: Wed, 18 Oct 2023 17:02:34 +0400
Subject: [PATCH 05/11] Use the KYCWall

---
 src/pages/home/report/ReportActionItem.js | 29 +++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 9cc2adc7b0b44..df8026b727d40 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -72,6 +72,7 @@ import RenderHTML from '../../../components/RenderHTML';
 import ReportAttachmentsContext from './ReportAttachmentsContext';
 import ROUTES from '../../../ROUTES';
 import Navigation from '../../../libs/Navigation/Navigation';
+import KYCWall from '../../../components/KYCWall';
 
 const propTypes = {
     ...windowDimensionsPropTypes,
@@ -367,13 +368,24 @@ function ReportActionItem(props) {
                         />
                     )}
                     {shouldShowEnableWalletButton && (
-                        <Button
-                            success
-                            style={[styles.w100, styles.requestPreviewBox]}
-                            text={props.translate('iou.enableWallet')}
-                            onPress={() => Navigation.navigate(ROUTES.ENABLE_PAYMENTS)}
-                            pressOnEnter
-                        />
+                        <KYCWall
+                            onSuccessfulKYC={() => Navigation.navigate(ROUTES.ENABLE_PAYMENTS)}
+                            enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
+                            addBankAccountRoute={ROUTES.BANK_ACCOUNT_PERSONAL}
+                            addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD}
+                            chatReportID={props.report.reportID}
+                            iouReport={props.iouReport}
+                        >
+                            {(triggerKYCFlow, buttonRef) => (
+                                <Button
+                                    ref={buttonRef}
+                                    success
+                                    style={[styles.w100, styles.requestPreviewBox]}
+                                    text={props.translate('iou.enableWallet')}
+                                    onPress={triggerKYCFlow}
+                                />
+                            )}
+                        </KYCWall>
                     )}
                 </ReportActionItemBasicMessage>
             );
@@ -718,6 +730,9 @@ export default compose(
             key: ({action}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`,
             initialValue: {},
         },
+        userWallet: {
+            key: ONYXKEYS.USER_WALLET,
+        },
     }),
 )(
     memo(

From 02f96faa19920ea30d18a5204bf9399e2f95f4c8 Mon Sep 17 00:00:00 2001
From: Maria DCosta <maria@expensify.com>
Date: Wed, 18 Oct 2023 17:11:21 +0400
Subject: [PATCH 06/11] Show correct messaging to payer

---
 src/pages/home/report/ReportActionItem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index df8026b727d40..56ddafe84389b 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -356,7 +356,7 @@ function ReportActionItem(props) {
 
             children = (
                 <ReportActionItemBasicMessage
-                    message={props.translate(shouldShowEnableWalletButton ? 'iou.waitingOnEnableWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
+                    message={props.translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnableWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
                 >
                     {shouldShowAddCreditBankAccountButton && (
                         <Button

From a4153ebfd77027972b4044200188367031ae5ed5 Mon Sep 17 00:00:00 2001
From: Maria DCosta <maria@expensify.com>
Date: Wed, 18 Oct 2023 17:12:41 +0400
Subject: [PATCH 07/11] Rename translation prop

---
 src/languages/en.ts                       | 2 +-
 src/languages/es.ts                       | 2 +-
 src/pages/home/report/ReportActionItem.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 3b35aef568eb5..211a631b54bde 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -594,7 +594,7 @@ export default {
             duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints',
             emptyWaypointsErrorMessage: 'Please enter at least two waypoints',
         },
-        waitingOnEnableWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
+        waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
         enableWallet: 'Enable Wallet',
     },
     notificationPreferencesPage: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index abf6e5f18d2b0..e62bcac0ac468 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -588,7 +588,7 @@ export default {
             duplicateWaypointsErrorMessage: 'Por favor elimina los puntos de ruta duplicados',
             emptyWaypointsErrorMessage: 'Por favor introduce al menos dos puntos de ruta',
         },
-        waitingOnEnableWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `nicio el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
+        waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `nicio el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
         enableWallet: 'Habilitar Billetera',
     },
     notificationPreferencesPage: {
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 56ddafe84389b..7cff1609160f0 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -356,7 +356,7 @@ function ReportActionItem(props) {
 
             children = (
                 <ReportActionItemBasicMessage
-                    message={props.translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnableWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
+                    message={props.translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnabledWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
                 >
                     {shouldShowAddCreditBankAccountButton && (
                         <Button

From 9b863abe5de7eb8e8bee7ae4f85d62323e12b907 Mon Sep 17 00:00:00 2001
From: Maria DCosta <maria@expensify.com>
Date: Wed, 18 Oct 2023 17:31:31 +0400
Subject: [PATCH 08/11] Default value for userWallet

---
 src/pages/home/report/ReportActionItem.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 7cff1609160f0..397892f69f2bc 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -128,6 +128,7 @@ const defaultProps = {
     hasOutstandingIOU: false,
     iouReport: undefined,
     shouldHideThreadDividerLine: false,
+    userWallet: {},
 };
 
 function ReportActionItem(props) {

From c00f14a78c36a5550b6a89fbf3dadc533efca152 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Wed, 18 Oct 2023 19:25:06 +0530
Subject: [PATCH 09/11] show enable wallet button

---
 src/pages/home/report/ReportActionItem.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 397892f69f2bc..4517db89e0d02 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -73,6 +73,7 @@ import ReportAttachmentsContext from './ReportAttachmentsContext';
 import ROUTES from '../../../ROUTES';
 import Navigation from '../../../libs/Navigation/Navigation';
 import KYCWall from '../../../components/KYCWall';
+import userWalletPropTypes from '../../EnablePayments/userWalletPropTypes';
 
 const propTypes = {
     ...windowDimensionsPropTypes,
@@ -117,6 +118,9 @@ const propTypes = {
 
     /** Flag to show, hide the thread divider line */
     shouldHideThreadDividerLine: PropTypes.bool,
+
+    /** The user's wallet account */
+    userWallet: userWalletPropTypes,
 };
 
 const defaultProps = {
@@ -353,7 +357,10 @@ function ReportActionItem(props) {
 
             const isSubmitterOfUnsettledReport = ReportUtils.isCurrentUserSubmitter(props.report.reportID) && !ReportUtils.isSettled(props.report.reportID);
             const shouldShowAddCreditBankAccountButton = isSubmitterOfUnsettledReport && !store.hasCreditBankAccount() && paymentType !== CONST.IOU.PAYMENT_TYPE.EXPENSIFY;
-            const shouldShowEnableWalletButton = isSubmitterOfUnsettledReport && props.userWallet.tierName == CONST.WALLET.TIER_NAME.SILVER && paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY;
+            const shouldShowEnableWalletButton =
+                isSubmitterOfUnsettledReport &&
+                (_.isEmpty(props.userWallet) || props.userWallet.tierName === CONST.WALLET.TIER_NAME.SILVER) &&
+                paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY;
 
             children = (
                 <ReportActionItemBasicMessage

From 9eb037bbd6d15a83a9fdb15130d90d90c86ec364 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Thu, 19 Oct 2023 11:22:23 +0530
Subject: [PATCH 10/11] fix the console error

---
 src/pages/home/report/ReportActionItem.js | 42 ++++++++++++-----------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 4517db89e0d02..7a4745bac9567 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -375,26 +375,28 @@ function ReportActionItem(props) {
                             pressOnEnter
                         />
                     )}
-                    {shouldShowEnableWalletButton && (
-                        <KYCWall
-                            onSuccessfulKYC={() => Navigation.navigate(ROUTES.ENABLE_PAYMENTS)}
-                            enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
-                            addBankAccountRoute={ROUTES.BANK_ACCOUNT_PERSONAL}
-                            addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD}
-                            chatReportID={props.report.reportID}
-                            iouReport={props.iouReport}
-                        >
-                            {(triggerKYCFlow, buttonRef) => (
-                                <Button
-                                    ref={buttonRef}
-                                    success
-                                    style={[styles.w100, styles.requestPreviewBox]}
-                                    text={props.translate('iou.enableWallet')}
-                                    onPress={triggerKYCFlow}
-                                />
-                            )}
-                        </KYCWall>
-                    )}
+                    <>
+                        {shouldShowEnableWalletButton && (
+                            <KYCWall
+                                onSuccessfulKYC={() => Navigation.navigate(ROUTES.ENABLE_PAYMENTS)}
+                                enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
+                                addBankAccountRoute={ROUTES.BANK_ACCOUNT_PERSONAL}
+                                addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD}
+                                chatReportID={props.report.reportID}
+                                iouReport={props.iouReport}
+                            >
+                                {(triggerKYCFlow, buttonRef) => (
+                                    <Button
+                                        ref={buttonRef}
+                                        success
+                                        style={[styles.w100, styles.requestPreviewBox]}
+                                        text={props.translate('iou.enableWallet')}
+                                        onPress={triggerKYCFlow}
+                                    />
+                                )}
+                            </KYCWall>
+                        )}
+                    </>
                 </ReportActionItemBasicMessage>
             );
         } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {

From 3fdc0df3d51cdb937c51abfb8d9bc53576901668 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Thu, 19 Oct 2023 18:36:32 +0530
Subject: [PATCH 11/11] add everything in fragment

---
 src/pages/home/report/ReportActionItem.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 7a4745bac9567..3adcf4fc3683c 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -366,16 +366,16 @@ function ReportActionItem(props) {
                 <ReportActionItemBasicMessage
                     message={props.translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnabledWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
                 >
-                    {shouldShowAddCreditBankAccountButton && (
-                        <Button
-                            success
-                            style={[styles.w100, styles.requestPreviewBox]}
-                            text={props.translate('bankAccount.addBankAccount')}
-                            onPress={() => BankAccounts.openPersonalBankAccountSetupView(props.report.reportID)}
-                            pressOnEnter
-                        />
-                    )}
                     <>
+                        {shouldShowAddCreditBankAccountButton && (
+                            <Button
+                                success
+                                style={[styles.w100, styles.requestPreviewBox]}
+                                text={props.translate('bankAccount.addBankAccount')}
+                                onPress={() => BankAccounts.openPersonalBankAccountSetupView(props.report.reportID)}
+                                pressOnEnter
+                            />
+                        )}
                         {shouldShowEnableWalletButton && (
                             <KYCWall
                                 onSuccessfulKYC={() => Navigation.navigate(ROUTES.ENABLE_PAYMENTS)}