From 04c99f98ed8dace483d1522f4fb7762335bef782 Mon Sep 17 00:00:00 2001 From: Joel Jeremy Marquez Date: Sun, 19 Jan 2025 15:43:01 -0800 Subject: [PATCH 1/2] Fix FocusableAmountInput's onUpdate to only fire when amount was updated --- .../mobile/transactions/FocusableAmountInput.tsx | 7 +++++-- .../src/components/mobile/transactions/TransactionEdit.jsx | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx index d7c2564b8f2..04e466b946c 100644 --- a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx +++ b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx @@ -97,9 +97,12 @@ const AmountInput = memo(function AmountInput({ }; const onUpdate = (value: string) => { - props.onUpdate?.(value); + const originalAmount = Math.abs(props.value); const amount = applyText(); - props.onUpdateAmount?.(amount); + if (amount !== originalAmount) { + props.onUpdate?.(value); + props.onUpdateAmount?.(amount); + } }; const onBlur: HTMLProps['onBlur'] = e => { diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx index e8ee25930cb..2c8fc8b8560 100644 --- a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx +++ b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx @@ -584,11 +584,9 @@ const TransactionEditInner = memo(function TransactionEditInner({ value => { if (transaction.amount !== value) { onUpdateInner(transaction, 'amount', value.toString()); - } else { - onClearActiveEdit(); } }, - [onClearActiveEdit, onUpdateInner, transaction], + [onUpdateInner, transaction], ); const onEditFieldInner = useCallback( @@ -788,6 +786,7 @@ const TransactionEditInner = memo(function TransactionEditInner({ zeroSign="-" focused={totalAmountFocused} onFocus={onTotalAmountEdit} + onBlur={onClearActiveEdit} onUpdateAmount={onTotalAmountUpdate} focusedStyle={{ width: 'auto', From fdd72f0cee3f7ba072da3561b101a48ebc096460 Mon Sep 17 00:00:00 2001 From: Joel Jeremy Marquez Date: Sun, 19 Jan 2025 15:45:44 -0800 Subject: [PATCH 2/2] Release notes --- upcoming-release-notes/4200.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 upcoming-release-notes/4200.md diff --git a/upcoming-release-notes/4200.md b/upcoming-release-notes/4200.md new file mode 100644 index 00000000000..b5975ad3f31 --- /dev/null +++ b/upcoming-release-notes/4200.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [joel-jeremy] +--- + +Fix FocusableAmountInput's onUpdate to only fire when amount was updated