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.png index 4a74795c3596fa560881d1042fca6910d5e109da..30877a0cf108334bf65a036f0a6a0f87122c854a 100644 Binary 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 differ diff --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.png index c94118d01fdbfaab252d1bfe48a914ef72eed8fd..a5cbce5f3a3c597ac9e83da69ebb0ba70c044c06 100644 Binary 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 differ diff --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.png index 2baf84cd33f60b684273eac2634e8df52764b871..d6b1c6055b658f87401aa3cc01a2c03b51680d29 100644 Binary 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 differ diff --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.png index 4179ae330de2ce3703049b25fe9cfe9c41c8b040..1fd2cb08e91169897dcaac812e861a44a420e63e 100644 Binary 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 differ diff --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.png index 2f7558963121e4a64f549249a7569883552c4d97..d8ca55a9bc2c8cc48bfffa5371f2ac7cfef3b380 100644 Binary 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 differ diff --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.png index 0eadc7a8b1b1d90d4ee4781ce4962a29597a7a9f..5194f7d7c74a0a253f24eb154eb2a1a40f82fc34 100644 Binary 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 differ diff --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.png index e9013e3c296c6392f9c03f793914a6f8bab68432..fbdf3f7d79d8688825d0c655ce1981cad3800c0f 100644 Binary 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 differ diff --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.png index 229dd51550e27fc86f45430b2bc9ed85e17a7203..f1864febe38c3e316dc82e935ad5e8eb90f443b9 100644 Binary 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 differ diff --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.png index 5efe59d5e13b206a2271f2c18fbf70b0b9567f2c..d1db7b72ab970fcf18ff5fcc074b77090693093d 100644 Binary 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 differ diff --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.png index 1198008571cc377e3c20b8665344cbfbe61e5598..9f22f964fe9e983c1ed3b4d950aac97785dad622 100644 Binary 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 differ diff --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.png index 197fb1fabb32aec3afafb1d05764bf9d40ed501e..f11e904a0f6d9b27cb907397c2bbdd7811e81c03 100644 Binary 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 differ diff --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.png index 24e40f4469cf52679894803551ad8d57e5be9ee1..38af663c40ed0f8800a987216fa43c5fb2d27222 100644 Binary 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 differ diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx index f42220a16bfeb08f3b7854b243d73ff4bb671c87..bc3275e4493554f78eeb8cc80301cd02f79ce044 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({ <SvgArrowThinRight width={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.ts index 14b389518a02fa8d7520cf9b1ba31930d374faca..e0153e152e7d23b415d7506ff8d21b28a549c020 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.jsx index 0625bcfa459cc79aad8d786f2eef917527542723..1d73becf7d6c792101860bb5e02595cf533a707a 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.jsx index 855c7f44a63382d24fc1acc1493f93f75a4d858e..09bd6073c5e12d03ce7abf135a7e5617416d4293 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.md new file mode 100644 index 0000000000000000000000000000000000000000..d3a522fb271c7e67c8bded2940664d74f9709244 --- /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.