From 99defef7454f421f90c52a07f9f813f17b2b644d Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Wed, 29 Nov 2023 15:23:26 +0100
Subject: [PATCH 1/3] Refactor ValidationStep to new form

---
 .../ReimbursementAccount/ValidationStep.js      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js
index 17a66e84e0555..f78cfcceafe60 100644
--- a/src/pages/ReimbursementAccount/ValidationStep.js
+++ b/src/pages/ReimbursementAccount/ValidationStep.js
@@ -7,6 +7,8 @@ import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import Button from '@components/Button';
 import Form from '@components/Form';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
@@ -140,8 +142,8 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                     </Text>
                 </View>
             )}
-            {!maxAttemptsReached && state === BankAccount.STATE.PENDING && (
-                <Form
+            {!maxAttemptsReached && true && (
+                <FormProvider
                     formID={ONYXKEYS.REIMBURSEMENT_ACCOUNT}
                     submitButtonText={translate('validationStep.buttonText')}
                     onSubmit={submit}
@@ -153,7 +155,8 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                         <Text style={[styles.mb2]}>{translate('validationStep.descriptionCTA')}</Text>
                     </View>
                     <View style={[styles.mv5]}>
-                        <TextInput
+                        <InputWrapper
+                            InputComponent={TextInput}
                             inputID="amount1"
                             shouldSaveDraft
                             containerStyles={[styles.mb1]}
@@ -161,7 +164,8 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                             inputMode={CONST.INPUT_MODE.DECIMAL}
                             role={CONST.ACCESSIBILITY_ROLE.TEXT}
                         />
-                        <TextInput
+                        <InputWrapper
+                            InputComponent={TextInput}
                             inputID="amount2"
                             shouldSaveDraft
                             containerStyles={[styles.mb1]}
@@ -169,7 +173,8 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                             inputMode={CONST.INPUT_MODE.DECIMAL}
                             role={CONST.ACCESSIBILITY_ROLE.TEXT}
                         />
-                        <TextInput
+                        <InputWrapper
+                            InputComponent={TextInput}
                             shouldSaveDraft
                             inputID="amount3"
                             containerStyles={[styles.mb1]}
@@ -183,7 +188,7 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                             <Enable2FAPrompt />
                         </View>
                     )}
-                </Form>
+                </FormProvider>
             )}
             {isVerifying && (
                 <ScrollView style={[styles.flex1]}>

From ec2ebe0a66544b9fa6f7bc1d261c16fcdfa4a49c Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Wed, 29 Nov 2023 18:58:37 +0100
Subject: [PATCH 2/3] Fix

---
 src/pages/ReimbursementAccount/ValidationStep.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js
index f78cfcceafe60..33588b03a01ac 100644
--- a/src/pages/ReimbursementAccount/ValidationStep.js
+++ b/src/pages/ReimbursementAccount/ValidationStep.js
@@ -142,7 +142,7 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
                     </Text>
                 </View>
             )}
-            {!maxAttemptsReached && true && (
+            {!maxAttemptsReached && state === BankAccount.STATE.PENDING && (
                 <FormProvider
                     formID={ONYXKEYS.REIMBURSEMENT_ACCOUNT}
                     submitButtonText={translate('validationStep.buttonText')}

From f96b552900ab600a78db3327479859a91c09af7b Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Fri, 1 Dec 2023 11:18:08 +0100
Subject: [PATCH 3/3] Fix lint

---
 src/pages/ReimbursementAccount/ValidationStep.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js
index 33588b03a01ac..5a37d49660513 100644
--- a/src/pages/ReimbursementAccount/ValidationStep.js
+++ b/src/pages/ReimbursementAccount/ValidationStep.js
@@ -6,7 +6,6 @@ import {ScrollView, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import Button from '@components/Button';
-import Form from '@components/Form';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';