A local-first personal finance app
use consistent colours on the budget page (#6747)
Matt Fiddaman7a5bfe7c205d
diff --git a/packages/component-library/src/theme.ts b/packages/component-library/src/theme.tsindex af19b53d66..c205c346cf 100644--- a/packages/component-library/src/theme.ts+++ b/packages/component-library/src/theme.ts@@ -13,6 +13,9 @@ export const theme = {pageTextPositive: 'var(--color-pageTextPositive)',pageTextLink: 'var(--color-pageTextLink)',pageTextLinkLight: 'var(--color-pageTextLinkLight)',+ numberPositive: 'var(--color-numberPositive)',+ numberNegative: 'var(--color-numberNegative)',+ numberNeutral: 'var(--color-numberNeutral)',cardBackground: 'var(--color-cardBackground)',cardBorder: 'var(--color-cardBorder)',cardShadow: 'var(--color-cardShadow)',@@ -191,6 +194,12 @@ export const theme = {reportsNumberPositive: 'var(--color-reportsNumberPositive)',reportsNumberNegative: 'var(--color-reportsNumberNegative)',reportsNumberNeutral: 'var(--color-reportsNumberNeutral)',+ budgetNumberPositive: 'var(--color-budgetNumberPositive)',+ budgetNumberNegative: 'var(--color-budgetNumberNegative)',+ budgetNumberNeutral: 'var(--color-budgetNumberNeutral)',+ budgetNumberZero: 'var(--color-budgetNumberZero)',+ templateNumberFunded: 'var(--color-templateNumberFunded)',+ templateNumberUnderFunded: 'var(--color-templateNumberUnderFunded)',noteTagBackground: 'var(--color-noteTagBackground)',noteTagBackgroundHover: 'var(--color-noteTagBackgroundHover)',noteTagDefault: 'var(--color-noteTagDefault)',diff --git a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.pngindex 41b747b277..88a04ae93b 100644Binary files a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.pngindex 219ab9c77e..2af38ae14c 100644Binary files a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--321fd-ed-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--321fd-ed-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.pngindex 23f021369e..25a047b00d 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--321fd-ed-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--321fd-ed-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--4bb70-ed-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--4bb70-ed-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.pngindex e6fbaa4ab0..4aaf05d292 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--4bb70-ed-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--4bb70-ed-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a85-ed-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a85-ed-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.pngindex e56cfaa7ef..2191b8a912 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a85-ed-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a85-ed-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.pngindex 54a0e63ec4..f2deca1beb 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.pngindex 65a428fc28..69e2124a13 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.pngindex 8ade1cd92e..89bbca99dc 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.pngindex 8a04a8251d..e5ed93500d 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.pngindex ee333be0f8..84991b22ac 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.pngindex bb1492baec..551cff7664 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.pngindex 9a31899dd7..707c05b727 100644Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.pngindex f572457cb1..76e850a995 100644Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-3-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-3-chromium-linux.pngindex 7394f445df..05e7a263e9 100644Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.pngindex fe058ec31c..ec330060df 100644Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.pngindex 36416eaa86..09594e1e03 100644Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.pngindex 0a136bc115..3e8148f413 100644Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-1-chromium-linux.png b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-1-chromium-linux.pngindex 5a6a13043f..cf2bf2e43f 100644Binary files a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-1-chromium-linux.png and b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-1-chromium-linux.pngindex a4e524c066..b70274687a 100644Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-2-chromium-linux.pngindex e98f003780..460842bb18 100644Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-3-chromium-linux.pngindex f3c10f8f09..ac73484c3e 100644Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-1-chromium-linux.pngindex 6aa58edd6c..963c544985 100644Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.pngindex b49ab377f8..7fa8a9a7ae 100644Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.pngindex 1483e1792b..6145c88a75 100644Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.pngindex d659ef628b..d63fadc5d1 100644Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/accounts/Balance.tsx b/packages/desktop-client/src/components/accounts/Balance.tsxindex e46f17211d..6292cf2e40 100644--- a/packages/desktop-client/src/components/accounts/Balance.tsx+++ b/packages/desktop-client/src/components/accounts/Balance.tsx@@ -233,9 +233,9 @@ export function Balances({fontWeight: 400,color:props.value < 0- ? theme.errorText+ ? theme.numberNegative: props.value > 0- ? theme.noticeTextLight+ ? theme.numberPositive: theme.pageTextSubdued,}}/>diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsxindex 80c8e99da1..d02354a13a 100644--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx@@ -160,11 +160,11 @@ export function BalanceWithCarryover({<><span style={{ fontWeight: 'bold' }}>{getDifferenceToGoal(balanceValue) === 0 ? (- <span style={{ color: theme.noticeText }}>+ <span style={{ color: theme.templateNumberFunded }}><Trans>Fully funded</Trans></span>) : getDifferenceToGoal(balanceValue) > 0 ? (- <span style={{ color: theme.noticeText }}>+ <span style={{ color: theme.templateNumberFunded }}><Trans>Overfunded ({{@@ -177,7 +177,7 @@ export function BalanceWithCarryover({</Trans></span>) : (- <span style={{ color: theme.errorText }}>+ <span style={{ color: theme.templateNumberUnderFunded }}><Trans>Underfunded ({{diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsxindex ec4753d070..9fa7da54a1 100644--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx@@ -84,13 +84,15 @@ export function ToBudgetAmount({fontWeight: 400,userSelect: 'none',cursor: 'pointer',- color: isNegative ? theme.errorText : theme.pageTextPositive,+ color: isNegative+ ? theme.budgetNumberNegative+ : theme.numberPositive,marginBottom: -1,borderBottom: '1px solid transparent',':hover': {borderColor: isNegative- ? theme.errorBorder- : theme.pageTextPositive,+ ? theme.budgetNumberNegative+ : theme.numberPositive,},},amountStyle,diff --git a/packages/desktop-client/src/components/budget/util.ts b/packages/desktop-client/src/components/budget/util.tsindex 0a00c5900c..def1bc08a4 100644--- a/packages/desktop-client/src/components/budget/util.ts+++ b/packages/desktop-client/src/components/budget/util.ts@@ -63,7 +63,7 @@ export function separateGroups(categoryGroups: CategoryGroupEntity[]) {export function makeAmountGrey(value: number | string | null): CSSProperties {return value === 0 || value === '0' || value === '' || value == null- ? { color: theme.tableTextSubdued }+ ? { color: theme.budgetNumberZero }: null;}@@ -82,7 +82,7 @@ export function makeBalanceAmountStyle(const currencyValue = normalizeIntegerValue(value);if (currencyValue < 0) {- return { color: theme.errorText };+ return { color: theme.budgetNumberNegative };}if (goalValue == null) {@@ -90,14 +90,15 @@ export function makeBalanceAmountStyle(if (greyed) {return greyed;}+ return { color: theme.budgetNumberPositive };} else {const budgetedAmount = normalizeIntegerValue(budgetedValue);const goalAmount = normalizeIntegerValue(goalValue);if (budgetedAmount < goalAmount) {- return { color: theme.warningText };+ return { color: theme.templateNumberUnderFunded };}- return { color: theme.noticeText };+ return { color: theme.templateNumberFunded };}}@@ -109,9 +110,11 @@ 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.budgetNumberPositive;+ const negativeColorToUse =+ colors?.negativeColor || theme.budgetNumberNegative;+ const zeroColorToUse = colors?.zeroColor || theme.budgetNumberZero;return {color:value < 0diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountsPage.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountsPage.tsxindex 769fc7ba91..3689d11008 100644--- a/packages/desktop-client/src/components/mobile/accounts/AccountsPage.tsx+++ b/packages/desktop-client/src/components/mobile/accounts/AccountsPage.tsx@@ -225,7 +225,11 @@ function AccountListItem({{...props}style={{fontSize: 16,- ...makeAmountFullStyle(props.value),+ ...makeAmountFullStyle(props.value, {+ positiveColor: theme.numberPositive,+ negativeColor: theme.numberNegative,+ zeroColor: theme.numberNeutral,+ }),}}data-testid="account-balance"/>diff --git a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsxindex 71eff29fe3..841928a25d 100644--- a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx+++ b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx@@ -227,7 +227,9 @@ export const FocusableAmountInput = memo(function FocusableAmountInput({focused={focused && !disabled}style={{...makeAmountFullStyle(value, {- zeroColor: isNegative ? theme.errorText : theme.noticeText,+ zeroColor: isNegative ? theme.numberNegative : theme.numberNeutral,+ positiveColor: theme.numberPositive,+ negativeColor: theme.numberNegative,}),width: 80,justifyContent: 'center',@@ -277,7 +279,11 @@ export const FocusableAmountInput = memo(function FocusableAmountInput({><Textstyle={{- ...makeAmountFullStyle(value),+ ...makeAmountFullStyle(value, {+ positiveColor: theme.numberPositive,+ negativeColor: theme.numberNegative,+ zeroColor: theme.numberNeutral,+ }),fontSize: 15,userSelect: 'none',...textStyle,diff --git a/packages/desktop-client/src/components/reports/SummaryNumber.tsx b/packages/desktop-client/src/components/reports/SummaryNumber.tsxindex b97c58974e..6dc49b85f2 100644--- a/packages/desktop-client/src/components/reports/SummaryNumber.tsx+++ b/packages/desktop-client/src/components/reports/SummaryNumber.tsx@@ -39,6 +39,7 @@ export function SummaryNumber({const [fontSize, setFontSize] = useState<number>(initialFontSize);const refDiv = useRef<HTMLDivElement>(null);const format = useFormat();+ const isNumericValue = Number.isFinite(value);let displayAmount =contentType === 'percentage'@@ -76,11 +77,13 @@ export function SummaryNumber({<Viewref={mergedRef as Ref<HTMLDivElement>}aria-label={- value === 0- ? t('Zero amount')- : value < 0- ? t('Negative amount: {{amount}}', { amount: displayAmount })- : t('Positive amount: {{amount}}', { amount: displayAmount })+ !isNumericValue+ ? t('Unknown amount')+ : value === 0+ ? t('Zero amount')+ : value < 0+ ? t('Negative amount: {{amount}}', { amount: displayAmount })+ : t('Positive amount: {{amount}}', { amount: displayAmount })}style={{alignItems: 'center',@@ -94,8 +97,9 @@ export function SummaryNumber({margin: `${CONTAINER_MARGIN}px 0`,justifyContent: 'center',transition: animate ? 'font-size 0.3s ease' : '',- color:- value === 0+ color: !isNumericValue+ ? theme.reportsNumberNeutral+ : value === 0? theme.reportsNumberNeutral: value < 0? theme.reportsNumberNegativediff --git a/packages/desktop-client/src/style/themes/dark.ts b/packages/desktop-client/src/style/themes/dark.tsindex c1d2d12b0f..ea6ca2e2b3 100644--- a/packages/desktop-client/src/style/themes/dark.ts+++ b/packages/desktop-client/src/style/themes/dark.ts@@ -39,6 +39,16 @@ export const tableRowBackgroundHighlightText = colorPalette.navy150;export const tableRowHeaderBackground = colorPalette.navy700;export const tableRowHeaderText = colorPalette.navy150;+export const numberPositive = colorPalette.green400;+export const numberNegative = colorPalette.red300;+export const numberNeutral = colorPalette.navy500;+export const budgetNumberNegative = numberNegative;+export const budgetNumberZero = tableTextSubdued;+export const budgetNumberNeutral = tableText;+export const budgetNumberPositive = budgetNumberNeutral;+export const templateNumberFunded = numberPositive;+export const templateNumberUnderFunded = colorPalette.orange300;+export const sidebarBackground = colorPalette.navy900;export const sidebarItemBackgroundPending = colorPalette.orange200;export const sidebarItemBackgroundPositive = colorPalette.green500;@@ -198,9 +208,9 @@ export const reportsGreen = colorPalette.green400;export const reportsGray = colorPalette.gray400;export const reportsLabel = pageText;export const reportsInnerLabel = colorPalette.navy800;-export const reportsNumberNegative = reportsRed;-export const reportsNumberNeutral = pageText;-export const reportsNumberPositive = reportsGreen;+export const reportsNumberPositive = numberPositive;+export const reportsNumberNegative = numberNegative;+export const reportsNumberNeutral = numberNeutral;export const reportsChartFill = reportsNumberPositive;export const noteTagBackground = colorPalette.purple700;diff --git a/packages/desktop-client/src/style/themes/development.ts b/packages/desktop-client/src/style/themes/development.tsindex 13fe5d46d0..ca1efc1fd7 100644--- a/packages/desktop-client/src/style/themes/development.ts+++ b/packages/desktop-client/src/style/themes/development.ts@@ -39,6 +39,16 @@ export const tableRowBackgroundHighlightText = colorPalette.navy700;export const tableRowHeaderBackground = colorPalette.navy50;export const tableRowHeaderText = colorPalette.navy800;+export const numberPositive = colorPalette.green400;+export const numberNegative = colorPalette.red300;+export const numberNeutral = colorPalette.navy100;+export const budgetNumberNegative = numberNegative;+export const budgetNumberZero = tableTextSubdued;+export const budgetNumberNeutral = tableText;+export const budgetNumberPositive = budgetNumberNeutral;+export const templateNumberFunded = numberPositive;+export const templateNumberUnderFunded = colorPalette.orange300;+export const sidebarBackground = colorPalette.navy900;export const sidebarItemBackgroundPending = colorPalette.orange200;export const sidebarItemBackgroundPositive = colorPalette.green500;@@ -198,9 +208,9 @@ export const reportsGreen = colorPalette.green400;export const reportsGray = colorPalette.gray400;export const reportsLabel = colorPalette.navy900;export const reportsInnerLabel = colorPalette.navy800;-export const reportsNumberNegative = reportsRed;-export const reportsNumberNeutral = pageText;-export const reportsNumberPositive = reportsGreen;+export const reportsNumberPositive = numberPositive;+export const reportsNumberNegative = numberNegative;+export const reportsNumberNeutral = numberNeutral;export const reportsChartFill = reportsNumberPositive;export const noteTagBackground = colorPalette.purple125;diff --git a/packages/desktop-client/src/style/themes/light.ts b/packages/desktop-client/src/style/themes/light.tsindex 564b97220c..26fcdc31f0 100644--- a/packages/desktop-client/src/style/themes/light.ts+++ b/packages/desktop-client/src/style/themes/light.ts@@ -39,6 +39,16 @@ export const tableRowBackgroundHighlightText = colorPalette.navy700;export const tableRowHeaderBackground = colorPalette.navy50;export const tableRowHeaderText = colorPalette.navy800;+export const numberPositive = colorPalette.green700;+export const numberNegative = colorPalette.red500;+export const numberNeutral = colorPalette.navy100;+export const budgetNumberZero = tableTextSubdued;+export const budgetNumberNegative = numberNegative;+export const budgetNumberNeutral = tableText;+export const budgetNumberPositive = budgetNumberNeutral;+export const templateNumberFunded = numberPositive;+export const templateNumberUnderFunded = colorPalette.orange700;+export const sidebarBackground = colorPalette.navy900;export const sidebarItemBackgroundPending = colorPalette.orange200;export const sidebarItemBackgroundPositive = colorPalette.green500;@@ -200,9 +210,9 @@ export const reportsGreen = colorPalette.green400;export const reportsGray = colorPalette.gray400;export const reportsLabel = colorPalette.navy900;export const reportsInnerLabel = colorPalette.navy800;-export const reportsNumberNegative = reportsRed;-export const reportsNumberNeutral = pageText;-export const reportsNumberPositive = reportsGreen;+export const reportsNumberPositive = numberPositive;+export const reportsNumberNegative = numberNegative;+export const reportsNumberNeutral = numberNeutral;export const reportsChartFill = reportsNumberPositive;export const noteTagBackground = colorPalette.purple125;diff --git a/packages/desktop-client/src/style/themes/midnight.ts b/packages/desktop-client/src/style/themes/midnight.tsindex eced100288..dba9bbe35b 100644--- a/packages/desktop-client/src/style/themes/midnight.ts+++ b/packages/desktop-client/src/style/themes/midnight.ts@@ -39,6 +39,16 @@ export const tableRowBackgroundHighlightText = colorPalette.gray800;export const tableRowHeaderBackground = colorPalette.gray700;export const tableRowHeaderText = colorPalette.gray150;+export const numberPositive = colorPalette.green400;+export const numberNegative = colorPalette.red300;+export const numberNeutral = colorPalette.gray500;+export const budgetNumberNegative = numberNegative;+export const budgetNumberZero = tableTextSubdued;+export const budgetNumberNeutral = tableText;+export const budgetNumberPositive = budgetNumberNeutral;+export const templateNumberFunded = numberPositive;+export const templateNumberUnderFunded = colorPalette.orange300;+export const sidebarBackground = colorPalette.gray900;export const sidebarItemBackgroundPending = colorPalette.orange200;export const sidebarItemBackgroundPositive = colorPalette.green400;@@ -200,9 +210,9 @@ export const reportsGreen = colorPalette.green400;export const reportsGray = colorPalette.gray400;export const reportsLabel = pageText;export const reportsInnerLabel = colorPalette.navy800;-export const reportsNumberNegative = reportsRed;-export const reportsNumberNeutral = pageText;-export const reportsNumberPositive = reportsGreen;+export const reportsNumberPositive = numberPositive;+export const reportsNumberNegative = numberNegative;+export const reportsNumberNeutral = numberNeutral;export const reportsChartFill = reportsNumberPositive;export const noteTagBackground = colorPalette.purple800;diff --git a/upcoming-release-notes/6747.md b/upcoming-release-notes/6747.mdnew file mode 100644index 0000000000..1f5d943259--- /dev/null+++ b/upcoming-release-notes/6747.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [matt-fidd]+---++Use consistent colours on the budget page