A local-first personal finance app
[Mobile] Add amount colors to mobile accounts and transaction list (#2665)
Joel Jeremy Marquez164dd399b0a5
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.pngindex 4a74795c35..30877a0cf1 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.pngindex c94118d01f..a5cbce5f3a 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.pngindex 2baf84cd33..d6b1c6055b 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.pngindex 4179ae330d..1fd2cb08e9 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.pngindex 2f75589631..d8ca55a9bc 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.pngindex 0eadc7a8b1..5194f7d7c7 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.pngindex e9013e3c29..fbdf3f7d79 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.pngindex 229dd51550..f1864febe3 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.pngindex 5efe59d5e1..d1db7b72ab 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-1-chromium-linux.pngindex 1198008571..9f22f964fe 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.pngindex 197fb1fabb..f11e904a0f 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.pngindex 24e40f4469..38af663c40 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsxindex f42220a16b..bc3275e449 100644--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx@@ -8,7 +8,7 @@ import { View } from '../common/View';import { CellValue } from '../spreadsheet/CellValue';import { useSheetValue } from '../spreadsheet/useSheetValue';-import { makeAmountStyle } from './util';+import { makeBalanceAmountStyle } from './util';type BalanceWithCarryoverProps = {carryover: ComponentProps<typeof CellValue>['binding'];@@ -41,7 +41,7 @@ export function BalanceWithCarryover({binding={balance}type="financial"getStyle={value =>- makeAmountStyle(+ makeBalanceAmountStyle(value,isGoalTemplatesEnabled ? goalValue : null,budgetedValue,@@ -72,7 +72,11 @@ export function BalanceWithCarryover({<SvgArrowThinRightwidth={carryoverStyle?.width || 7}height={carryoverStyle?.height || 7}- style={makeAmountStyle(balanceValue, goalValue, budgetedValue)}+ style={makeBalanceAmountStyle(+ balanceValue,+ goalValue,+ budgetedValue,+ )}/></View>)}diff --git a/packages/desktop-client/src/components/budget/util.ts b/packages/desktop-client/src/components/budget/util.tsindex 14b389518a..e0153e152e 100644--- a/packages/desktop-client/src/components/budget/util.ts+++ b/packages/desktop-client/src/components/budget/util.ts@@ -45,7 +45,7 @@ export function makeAmountGrey(value: number | string): CSSProperties {: null;}-export function makeAmountStyle(+export function makeBalanceAmountStyle(value: number,goalValue?: number,budgetedValue?: number,diff --git a/packages/desktop-client/src/components/mobile/accounts/Accounts.jsx b/packages/desktop-client/src/components/mobile/accounts/Accounts.jsxindex 0625bcfa45..1d73becf7d 100644--- a/packages/desktop-client/src/components/mobile/accounts/Accounts.jsx+++ b/packages/desktop-client/src/components/mobile/accounts/Accounts.jsx@@ -11,6 +11,7 @@ import { useNavigate } from '../../../hooks/useNavigate';import { useSetThemeColor } from '../../../hooks/useSetThemeColor';import { SvgAdd } from '../../../icons/v1';import { theme, styles } from '../../../style';+import { makeAmountFullStyle } from '../../budget/util';import { Button } from '../../common/Button';import { Text } from '../../common/Text';import { TextOneLine } from '../../common/TextOneLine';@@ -135,7 +136,7 @@ function AccountCard({binding={getBalanceQuery(account)}type="financial"style={{ fontSize: 16, color: 'inherit' }}- getStyle={value => value < 0 && { color: 'inherit' }}+ getStyle={makeAmountFullStyle}data-testid="account-balance"/></Button>diff --git a/packages/desktop-client/src/components/mobile/transactions/Transaction.jsx b/packages/desktop-client/src/components/mobile/transactions/Transaction.jsxindex 855c7f44a6..09bd6073c5 100644--- a/packages/desktop-client/src/components/mobile/transactions/Transaction.jsx+++ b/packages/desktop-client/src/components/mobile/transactions/Transaction.jsx@@ -14,6 +14,7 @@ import {SvgLockClosed,} from '../../../icons/v2';import { styles, theme } from '../../../style';+import { makeAmountFullStyle } from '../../budget/util';import { Button } from '../../common/Button';import { Text } from '../../common/Text';import { TextOneLine } from '../../common/TextOneLine';@@ -208,6 +209,7 @@ export const Transaction = memo(function Transaction({marginLeft: 25,marginRight: 5,fontSize: 14,+ ...makeAmountFullStyle(amount),}}>{integerToCurrency(amount)}diff --git a/upcoming-release-notes/2665.md b/upcoming-release-notes/2665.mdnew file mode 100644index 0000000000..d3a522fb27--- /dev/null+++ b/upcoming-release-notes/2665.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [joel-jeremy]+---++Add amount colors to mobile accounts and transaction list.