diff --git a/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx b/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx
index aaac8cf7c636..0859872626d0 100644
--- a/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx
@@ -119,13 +119,14 @@ function AccountHolderDetails({onNext, isEditing, corpayFields}: BankInfoSubStep
);
}
+ const InputComponent = getInputComponent(field);
return (
);
diff --git a/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx b/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx
index 294a0963fe8e..745aab1337b4 100644
--- a/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx
@@ -86,13 +86,14 @@ function BankAccountDetails({onNext, isEditing, corpayFields}: BankInfoSubStepPr
return getInputForValueSet(field, SafeString(defaultValues[field.id as keyof typeof defaultValues]), isEditing, styles);
}
+ const InputComponent = getInputComponent(field);
return (
);
diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/subPages/AccountHolderInformation.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/subPages/AccountHolderInformation.tsx
index fa153a6bf3f5..9e4886535b11 100644
--- a/src/pages/settings/Wallet/InternationalDepositAccount/subPages/AccountHolderInformation.tsx
+++ b/src/pages/settings/Wallet/InternationalDepositAccount/subPages/AccountHolderInformation.tsx
@@ -91,36 +91,41 @@ function AccountHolderInformation({isEditing, onNext, formValues, fieldsMap}: Cu
{translate('addPersonalBankAccount.accountHolderInformationStepHeader')}
{Object.values(fieldsMap[CONST.CORPAY_FIELDS.PAGE_NAME.ACCOUNT_HOLDER_DETAILS] ?? {})
.sort((a, b) => CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_FIELDS.indexOf(a.id) - CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_FIELDS.indexOf(b.id))
- .map((field, index) => (
-
-
-
- ))}
+ .map((field, index) => {
+ const InputComponent = getInputComponent(field);
+ return (
+
+
+
+ );
+ })}
);
diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/subPages/BankAccountDetails.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/subPages/BankAccountDetails.tsx
index f8b8d86efdd3..120a18e2e79f 100644
--- a/src/pages/settings/Wallet/InternationalDepositAccount/subPages/BankAccountDetails.tsx
+++ b/src/pages/settings/Wallet/InternationalDepositAccount/subPages/BankAccountDetails.tsx
@@ -81,22 +81,27 @@ function BankAccountDetails({isEditing, onNext, onMove, formValues, fieldsMap}:
shouldShowFullPageOfflineView
/>
- {Object.values(fieldsMap[CONST.CORPAY_FIELDS.PAGE_NAME.ACCOUNT_DETAILS] ?? {}).map((field) => (
- 0 ? [styles.mhn5, styles.pv1] : [styles.pv2]}
- key={field.id}
- >
- 0 ? ValuePicker : TextInput}
- inputID={field.id}
- defaultValue={formValues[field.id]}
- label={field.label + (field.isRequired ? '' : ` (${translate('common.optional')})`)}
- items={(field.valueSet ?? []).map(({id, text}) => ({value: id, label: text}))}
- shouldSaveDraft={!isEditing}
- forwardedFSClass={CONST.FULLSTORY.CLASS.MASK}
- />
-
- ))}
+ {Object.values(fieldsMap[CONST.CORPAY_FIELDS.PAGE_NAME.ACCOUNT_DETAILS] ?? {}).map((field) => {
+ const isValuePicker = (field.valueSet ?? []).length > 0;
+ return (
+
+ ({value: id, label: text}))}
+ shouldSaveDraft={!isEditing}
+ forwardedFSClass={CONST.FULLSTORY.CLASS.MASK}
+ autoCorrect={!isValuePicker ? false : undefined}
+ spellCheck={!isValuePicker ? false : undefined}
+ />
+
+ );
+ })}
{translate('addPersonalBankAccount.bankInformationStepHeader')}
{Object.values(fieldsMap[CONST.CORPAY_FIELDS.PAGE_NAME.BANK_INFORMATION] ?? {})
.sort((a, b) => CONST.CORPAY_FIELDS.BANK_INFORMATION_FIELDS.indexOf(a.id) - CONST.CORPAY_FIELDS.BANK_INFORMATION_FIELDS.indexOf(b.id))
- .map((field, index) => (
-
-
-
- ))}
+ .map((field, index) => {
+ const InputComponent = getInputComponent(field);
+ return (
+
+
+
+ );
+ })}
);