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

Jump to bottom

fix: Taxes - Tax exceeding limit is saved instead of showing error in tax input editor #41264

Merged
merged 1 commit into from
Apr 30, 2024
Merged

fix: Taxes - Tax exceeding limit is saved instead of showing error in tax input editor #41264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/pages/iou/MoneyRequestAmountForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ function MoneyRequestAmountForm(

const textInput = useRef<BaseTextInputRef | null>(null);
const moneyRequestAmountInput = useRef<MoneyRequestAmountInputRef | null>(null);
const isTaxAmountForm = Navigation.getActiveRoute().includes('taxAmount');

const [formError, setFormError] = useState<MaybePhraseKey>('');
const [shouldUpdateSelection, setShouldUpdateSelection] = useState(true);
Expand Down Expand Up @@ -205,6 +204,8 @@ function MoneyRequestAmountForm(
*/
const submitAndNavigateToNextPage = useCallback(
(iouPaymentType?: PaymentMethodType | undefined) => {
const isTaxAmountForm = Navigation.getActiveRoute().includes('taxAmount');

// Skip the check for tax amount form as 0 is a valid input
const currentAmount = moneyRequestAmountInput.current?.getAmount() ?? '';
if (!currentAmount.length || (!isTaxAmountForm && isAmountInvalid(currentAmount))) {
Expand All @@ -224,7 +225,7 @@ function MoneyRequestAmountForm(

onSubmitButtonPress({amount: currentAmount, currency, paymentMethod: iouPaymentType});
},
[taxAmount, isTaxAmountForm, onSubmitButtonPress, currency, formattedTaxAmount, initializeAmount],
[taxAmount, onSubmitButtonPress, currency, formattedTaxAmount, initializeAmount],
);

const buttonText: string = useMemo(() => {
Expand Down
Loading