diff --git a/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx b/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx
index 10c030fe1008..634252507451 100644
--- a/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx
@@ -1,6 +1,7 @@
import React, {useCallback, useMemo} from 'react';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
+import AddressSearch from '@components/AddressSearch';
import FormProvider from '@components/Form/FormProvider';
import InputWrapper from '@components/Form/InputWrapper';
import type {FormInputErrors, FormOnyxKeys, FormOnyxValues} from '@components/Form/types';
@@ -17,10 +18,18 @@ import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {ReimbursementAccountForm} from '@src/types/form/ReimbursementAccountForm';
import INPUT_IDS from '@src/types/form/ReimbursementAccountForm';
+import type {CorpayFormField} from '@src/types/onyx';
const {ACCOUNT_HOLDER_COUNTRY} = INPUT_IDS.ADDITIONAL_DATA.CORPAY;
const {COUNTRY} = INPUT_IDS.ADDITIONAL_DATA;
+function getInputComponent(field: CorpayFormField) {
+ if (CONST.CORPAY_FIELDS.SPECIAL_LIST_ADDRESS_KEYS.includes(field.id)) {
+ return AddressSearch;
+ }
+ return TextInput;
+}
+
function AccountHolderDetails({onNext, isEditing, corpayFields}: BankInfoSubStepProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
@@ -110,13 +119,18 @@ function AccountHolderDetails({onNext, isEditing, corpayFields}: BankInfoSubStep
key={field.id}
>
);
diff --git a/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx b/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx
index 4f2a1c71f5c1..7718935adcbb 100644
--- a/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx
@@ -1,6 +1,7 @@
import React, {useCallback, useMemo} from 'react';
import {ActivityIndicator, View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
+import AddressSearch from '@components/AddressSearch';
import FormProvider from '@components/Form/FormProvider';
import InputWrapper from '@components/Form/InputWrapper';
import type {FormInputErrors, FormOnyxKeys, FormOnyxValues} from '@components/Form/types';
@@ -16,6 +17,14 @@ import getInputForValueSet from '@pages/ReimbursementAccount/NonUSD/utils/getInp
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {ReimbursementAccountForm} from '@src/types/form';
+import type {CorpayFormField} from '@src/types/onyx';
+
+function getInputComponent(field: CorpayFormField) {
+ if (CONST.CORPAY_FIELDS.SPECIAL_LIST_ADDRESS_KEYS.includes(field.id)) {
+ return AddressSearch;
+ }
+ return TextInput;
+}
function BankAccountDetails({onNext, isEditing, corpayFields}: BankInfoSubStepProps) {
const {translate} = useLocalize();
@@ -87,18 +96,24 @@ function BankAccountDetails({onNext, isEditing, corpayFields}: BankInfoSubStepPr
key={field.id}
>
);
});
- }, [bankAccountDetailsFields, styles, isEditing, defaultValues]);
+ }, [bankAccountDetailsFields, styles, isEditing, defaultValues, reimbursementAccountDraft?.country]);
return (