Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: no invalid amount error if lasts digit are 0 #39039

Merged
merged 4 commits into from
Mar 28, 2024
Merged

fix: no invalid amount error if lasts digit are 0 #39039

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52da412
fix no invalid amount error if lasts digit are 0
tienifr Mar 27, 2024
220f4ea
fix regex
tienifr Mar 27, 2024
1c0ba35
fix merge main
tienifr Mar 27, 2024
41f8408
fix use permittedDecimalSeparator in regex
tienifr Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/pages/ReimbursementAccount/ConnectBankAccount/components/BankAccountValidationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ function getAmountValues(values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEM
};
}

const filterInput = (amount: string, amountRegex?: RegExp) => {
const filterInput = (amount: string, amountRegex?: RegExp, permittedDecimalSeparator?: string) => {
let value = amount ? amount.toString().trim() : '';
value = value.replace(/^0+|0+$/g, '');
const regex = new RegExp(`^0+|([${permittedDecimalSeparator}]\\d*?)0+$`, 'g');
value = value.replace(regex, '$1');
if (value === '' || Number.isNaN(Number(value)) || !Math.abs(Str.fromUSDToNumber(value, false)) || (amountRegex && !amountRegex.test(value))) {
return '';
}
Expand All @@ -58,17 +59,17 @@ function BankAccountValidationForm({requiresTwoFactorAuth, reimbursementAccount,
const styles = useThemeStyles();

const policyID = reimbursementAccount?.achData?.policyID ?? '';

const decimalSeparator = toLocaleDigit('.');
const permittedDecimalSeparator = getPermittedDecimalSeparator(decimalSeparator);
const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
const errors: FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> = {};
const amountValues = getAmountValues(values);
const decimalSeparator = toLocaleDigit('.');
const outputCurrency = policy?.outputCurrency ?? CONST.CURRENCY.USD;
const amountRegex = RegExp(String.raw`^-?\d{0,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{0,${CurrencyUtils.getCurrencyDecimals(outputCurrency)}})?$`, 'i');
const amountRegex = RegExp(String.raw`^-?\d{0,8}([${permittedDecimalSeparator}]\d{0,${CurrencyUtils.getCurrencyDecimals(outputCurrency)}})?$`, 'i');

Object.keys(amountValues).forEach((key) => {
const value = amountValues[key as keyof AmountValues];
const filteredValue = filterInput(value, amountRegex);
const filteredValue = filterInput(value, amountRegex, permittedDecimalSeparator);
if (ValidationUtils.isRequiredFulfilled(filteredValue.toString())) {
return;
}
Expand All @@ -80,9 +81,9 @@ function BankAccountValidationForm({requiresTwoFactorAuth, reimbursementAccount,

const submit = useCallback(
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>) => {
const amount1 = filterInput(values.amount1 ?? '');
const amount2 = filterInput(values.amount2 ?? '');
const amount3 = filterInput(values.amount3 ?? '');
const amount1 = filterInput(values.amount1 ?? '', undefined, permittedDecimalSeparator);
const amount2 = filterInput(values.amount2 ?? '', undefined, permittedDecimalSeparator);
const amount3 = filterInput(values.amount3 ?? '', undefined, permittedDecimalSeparator);

const validateCode = [amount1, amount2, amount3].join(',');

Expand All @@ -92,7 +93,7 @@ function BankAccountValidationForm({requiresTwoFactorAuth, reimbursementAccount,
BankAccounts.validateBankAccount(bankAccountID, validateCode, policyID);
}
},
[reimbursementAccount, policyID],
[reimbursementAccount, policyID, permittedDecimalSeparator],
);
return (
<FormProvider
Expand Down
Loading