Skip to content

Commit d9e53a9

Browse files
shubham1206agrashubham1206agra
committed
Fix order of menu items
1 parent 47eb2b4 commit d9e53a9

File tree

3 files changed

+35
-43
lines changed

3 files changed

+35
-43
lines changed

‎src/CONST.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6494,6 +6494,7 @@ const CONST = {
64946494
EXCLUDED_CURRENCIES: ['IRR', 'CUP', 'SYP', 'UAH', 'KPW', 'RUB'] as string[],
64956495
BANK_ACCOUNT_DETAILS_FIELDS: ['accountNumber', 'localAccountNumber', 'routingCode', 'localRoutingCode', 'swiftBicCode'] as string[],
64966496
ACCOUNT_TYPE_KEY: 'BeneficiaryAccountType',
6497+
ACCOUNT_HOLDER_COUNTRY_KEY: 'accountHolderCountry',
64976498
BANK_INFORMATION_FIELDS: ['bankName', 'bankAddressLine1', 'bankAddressLine2', 'bankCity', 'bankRegion', 'bankPostal', 'BeneficiaryBankBranchName'] as string[],
64986499
ACCOUNT_HOLDER_FIELDS: [
64996500
'accountHolderName',

‎src/pages/settings/Wallet/InternationalDepositAccount/substeps/AccountHolderInformation.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
1818
import type {CorpayFormField} from '@src/types/onyx';
1919
import {isEmptyObject} from '@src/types/utils/EmptyObject';
2020

21-
const ACCOUNT_HOLDER_COUNTRY = 'accountHolderCountry';
22-
2321
function getInputComponent(field: CorpayFormField) {
2422
if ((field.valueSet ?? []).length > 0) {
2523
return ValuePicker;
@@ -30,7 +28,7 @@ function getInputComponent(field: CorpayFormField) {
3028
if (CONST.CORPAY_FIELDS.SPECIAL_LIST_ADDRESS_KEYS.includes(field.id)) {
3129
return AddressSearch;
3230
}
33-
if (field.id === ACCOUNT_HOLDER_COUNTRY) {
31+
if (field.id === CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_COUNTRY_KEY) {
3432
return TextPicker;
3533
}
3634
return TextInput;
@@ -71,7 +69,7 @@ function AccountHolderInformation({isEditing, onNext, formValues, fieldsMap}: Cu
7169
if (CONST.CORPAY_FIELDS.SPECIAL_LIST_ADDRESS_KEYS.includes(field.id)) {
7270
return [index === 0 ? styles.pb2 : styles.pv2];
7371
}
74-
if (field.id === ACCOUNT_HOLDER_COUNTRY) {
72+
if (field.id === CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_COUNTRY_KEY) {
7573
return [styles.mhn5, index === 0 ? styles.pb1 : styles.pv1];
7674
}
7775
return [index === 0 ? styles.pb2 : styles.pv2];
@@ -103,10 +101,10 @@ function AccountHolderInformation({isEditing, onNext, formValues, fieldsMap}: Cu
103101
inputID={field.id}
104102
defaultValue={formValues[field.id]}
105103
label={field.label + (field.isRequired ? '' : ` (${translate('common.optional')})`)}
106-
description={field.id === ACCOUNT_HOLDER_COUNTRY ? field.label : undefined}
104+
description={field.id === CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_COUNTRY_KEY ? field.label : undefined}
107105
items={getItems(field)}
108-
disabled={field.id === ACCOUNT_HOLDER_COUNTRY}
109-
interactive={field.id === ACCOUNT_HOLDER_COUNTRY ? false : undefined}
106+
disabled={field.id === CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_COUNTRY_KEY}
107+
interactive={field.id === CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_COUNTRY_KEY ? false : undefined}
110108
shouldSaveDraft={!isEditing}
111109
renamedInputKeys={{
112110
street: isEmptyObject(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_HOLDER_INFORMATION]?.accountHolderAddress1) ? '' : 'accountHolderAddress1',

‎src/pages/settings/Wallet/InternationalDepositAccount/substeps/Confirmation.tsx

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -86,61 +86,54 @@ function Confirmation({onNext, onMove, formValues, fieldsMap}: CustomSubStepProp
8686
},
8787
];
8888

89-
// eslint-disable-next-line guard-for-in
90-
for (const fieldName in fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.BANK_ACCOUNT_DETAILS]) {
89+
Object.entries(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.BANK_ACCOUNT_DETAILS]).forEach(([fieldName, field]) => {
9190
summaryItems.push({
92-
description:
93-
fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.BANK_ACCOUNT_DETAILS][fieldName].label +
94-
(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.BANK_ACCOUNT_DETAILS][fieldName].isRequired ? '' : ` (${translate('common.optional')})`),
91+
description: field.label + (field.isRequired ? '' : ` (${translate('common.optional')})`),
9592
title: formValues[fieldName],
9693
shouldShowRightIcon: true,
9794
onPress: () => {
9895
onMove(STEP_INDEXES.BANK_ACCOUNT_DETAILS);
9996
},
10097
});
101-
}
98+
});
10299

103-
// eslint-disable-next-line guard-for-in
104-
for (const fieldName in fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_TYPE]) {
100+
Object.entries(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_TYPE]).forEach(([fieldName, field]) => {
105101
summaryItems.push({
106-
description:
107-
fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_TYPE][fieldName].label +
108-
(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_TYPE][fieldName].isRequired ? '' : ` (${translate('common.optional')})`),
102+
description: field.label + (field.isRequired ? '' : ` (${translate('common.optional')})`),
109103
title: formValues[fieldName],
110104
shouldShowRightIcon: true,
111105
onPress: () => {
112106
onMove(STEP_INDEXES.ACCOUNT_TYPE);
113107
},
114108
});
115-
}
109+
});
116110

117-
// eslint-disable-next-line guard-for-in
118-
for (const fieldName in fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.BANK_INFORMATION]) {
119-
summaryItems.push({
120-
description:
121-
fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.BANK_INFORMATION][fieldName].label +
122-
(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.BANK_INFORMATION][fieldName].isRequired ? '' : ` (${translate('common.optional')})`),
123-
title: formValues[fieldName],
124-
shouldShowRightIcon: true,
125-
onPress: () => {
126-
onMove(STEP_INDEXES.BANK_INFORMATION);
127-
},
111+
Object.entries(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.BANK_INFORMATION])
112+
.sort(([field1], [field2]) => CONST.CORPAY_FIELDS.BANK_INFORMATION_FIELDS.indexOf(field1) - CONST.CORPAY_FIELDS.BANK_INFORMATION_FIELDS.indexOf(field2))
113+
.forEach(([fieldName, field]) => {
114+
summaryItems.push({
115+
description: field.label + (field.isRequired ? '' : ` (${translate('common.optional')})`),
116+
title: formValues[fieldName],
117+
shouldShowRightIcon: true,
118+
onPress: () => {
119+
onMove(STEP_INDEXES.BANK_INFORMATION);
120+
},
121+
});
128122
});
129-
}
130123

131-
// eslint-disable-next-line guard-for-in
132-
for (const fieldName in fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_HOLDER_INFORMATION]) {
133-
summaryItems.push({
134-
description:
135-
fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_HOLDER_INFORMATION][fieldName].label +
136-
(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_HOLDER_INFORMATION][fieldName].isRequired ? '' : ` (${translate('common.optional')})`),
137-
title: formValues[fieldName],
138-
shouldShowRightIcon: true,
139-
onPress: () => {
140-
onMove(STEP_INDEXES.ACCOUNT_HOLDER_INFORMATION);
141-
},
124+
Object.entries(fieldsMap[CONST.CORPAY_FIELDS.STEPS_NAME.ACCOUNT_HOLDER_INFORMATION])
125+
.sort(([field1], [field2]) => CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_FIELDS.indexOf(field1) - CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_FIELDS.indexOf(field2))
126+
.forEach(([fieldName, field]) => {
127+
summaryItems.push({
128+
description: field.label + (field.isRequired ? '' : ` (${translate('common.optional')})`),
129+
title: formValues[fieldName],
130+
shouldShowRightIcon: true,
131+
onPress: () => {
132+
onMove(STEP_INDEXES.ACCOUNT_HOLDER_INFORMATION);
133+
},
134+
interactive: fieldName !== CONST.CORPAY_FIELDS.ACCOUNT_HOLDER_COUNTRY_KEY,
135+
});
142136
});
143-
}
144137

145138
const validate = useCallback(
146139
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM> => {

0 commit comments

Comments
 (0)