From 333baade328e3b42ebc64bb1b705689cdae95105 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Fri, 29 Sep 2023 17:05:33 +0800
Subject: [PATCH] Resolve merge conflict

---
 .../EnablePayments/EnablePaymentsPage.js      | 29 +------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/pages/EnablePayments/EnablePaymentsPage.js b/src/pages/EnablePayments/EnablePaymentsPage.js
index 903ec0c520b9..855cf6b9a6ec 100644
--- a/src/pages/EnablePayments/EnablePaymentsPage.js
+++ b/src/pages/EnablePayments/EnablePaymentsPage.js
@@ -82,41 +82,14 @@ class EnablePaymentsPage extends React.Component {
                         <>
                             {(currentStep === CONST.WALLET.STEP.ADDITIONAL_DETAILS || currentStep === CONST.WALLET.STEP.ADDITIONAL_DETAILS_KBA) && <AdditionalDetailsStep />}
                             {currentStep === CONST.WALLET.STEP.ONFIDO && <OnfidoStep />}
-                            {currentStep === CONST.WALLET.STEP.TERMS && <TermsStep />}
+                            {currentStep === CONST.WALLET.STEP.TERMS && <TermsStep userWallet={this.props.userWallet} />}
                             {currentStep === CONST.WALLET.STEP.ACTIVATE && <ActivateStep userWallet={this.props.userWallet} />}
                         </>
                     );
-<<<<<<< HEAD
                 }}
             </ScreenWrapper>
         );
     }
-=======
-                }
-
-                if (userWallet.shouldShowWalletActivationSuccess) {
-                    return <ActivateStep userWallet={userWallet} />;
-                }
-
-                const currentStep = userWallet.currentStep || CONST.WALLET.STEP.ADDITIONAL_DETAILS;
-
-                switch (currentStep) {
-                    case CONST.WALLET.STEP.ADDITIONAL_DETAILS:
-                    case CONST.WALLET.STEP.ADDITIONAL_DETAILS_KBA:
-                        return <AdditionalDetailsStep />;
-                    case CONST.WALLET.STEP.ONFIDO:
-                        return <OnfidoStep />;
-                    case CONST.WALLET.STEP.TERMS:
-                        return <TermsStep userWallet={userWallet} />;
-                    case CONST.WALLET.STEP.ACTIVATE:
-                        return <ActivateStep userWallet={userWallet} />;
-                    default:
-                        return null;
-                }
-            }}
-        </ScreenWrapper>
-    );
->>>>>>> bcc8a63 (Merge pull request #28433 from Expensify/cole_wallet_terms)
 }
 
 EnablePaymentsPage.propTypes = propTypes;