A local-first personal finance app
[Mobile] Add negative/positive colors to mobile transaction amount input (#2628)
Joel Jeremy Marquez5f77b87b071a
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.pngindex ce13427af8..7ab4ea91bb 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.pngindex 4b22f0e2f6..620d3a5eec 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.pngindex 85905bc0ee..9e4d97f3c4 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.pngindex efc32336ee..1241e32dd9 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-3-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-3-chromium-linux.pngindex 42cb054ab5..345c5eb9c5 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-3-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-4-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-4-chromium-linux.pngindex 034509229c..9ac1868fca 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-4-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-4-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/budget/util.ts b/packages/desktop-client/src/components/budget/util.tsindex 733012c549..14b389518a 100644--- a/packages/desktop-client/src/components/budget/util.ts+++ b/packages/desktop-client/src/components/budget/util.ts@@ -75,9 +75,9 @@ export function makeAmountFullStyle(zeroColor?: string;},) {- const positiveColorToUse = colors.positiveColor || theme.noticeText;- const negativeColorToUse = colors.negativeColor || theme.errorText;- const zeroColorToUse = colors.zeroColor || theme.tableTextSubdued;+ const positiveColorToUse = colors?.positiveColor || theme.noticeText;+ const negativeColorToUse = colors?.negativeColor || theme.errorText;+ const zeroColorToUse = colors?.zeroColor || theme.tableTextSubdued;return {color:value < 0diff --git a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsxindex 17b0d0d328..6f3c66845e 100644--- a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx+++ b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx@@ -17,6 +17,7 @@ import {import { useLocalPref } from '../../../hooks/useLocalPref';import { useMergedRefs } from '../../../hooks/useMergedRefs';import { type CSSProperties, theme } from '../../../style';+import { makeAmountFullStyle } from '../../budget/util';import { Button } from '../../common/Button';import { Text } from '../../common/Text';import { View } from '../../common/View';@@ -230,6 +231,9 @@ export const FocusableAmountInput = memo(function FocusableAmountInput({onUpdateAmount={amount => onUpdateAmount(amount, isNegative)}focused={focused && !disabled}style={{+ ...makeAmountFullStyle(value, {+ zeroColor: isNegative ? theme.errorText : theme.noticeText,+ }),width: 80,justifyContent: 'center',...style,@@ -276,7 +280,14 @@ export const FocusableAmountInput = memo(function FocusableAmountInput({...style,}}>- <Text style={{ fontSize: 15, userSelect: 'none', ...textStyle }}>+ <Text+ style={{+ ...makeAmountFullStyle(value),+ fontSize: 15,+ userSelect: 'none',+ ...textStyle,+ }}+ >{amountToCurrency(Math.abs(value))}</Text></View>diff --git a/upcoming-release-notes/2628.md b/upcoming-release-notes/2628.mdnew file mode 100644index 0000000000..cd065d7521--- /dev/null+++ b/upcoming-release-notes/2628.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [joel-jeremy]+---++Add negative/positive colors to mobile transaction amount input