A local-first personal finance app
change the mobile budget balance colors to be the same as desktop (#2940)
youngcwa9ee670eb430
diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsxindex 87a3f07697..c90a255d11 100644--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx@@ -18,8 +18,8 @@ type BalanceWithCarryoverProps = Omit<> & {carryover: Binding;balance: Binding;- goal?: Binding;- budgeted?: Binding;+ goal: Binding;+ budgeted: Binding;disabled?: boolean;carryoverStyle?: CSSProperties;};@@ -79,7 +79,7 @@ export function BalanceWithCarryover({height={carryoverStyle?.height || 7}style={makeBalanceAmountStyle(balanceValue,- goalValue,+ isGoalTemplatesEnabled ? goalValue : null,budgetedValue,)}/>diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsxindex 96db06589f..73be166ac2 100644--- a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx+++ b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx@@ -8,6 +8,7 @@ import { collapseModals, pushModal } from 'loot-core/client/actions';import { rolloverBudget, reportBudget } from 'loot-core/src/client/queries';import * as monthUtils from 'loot-core/src/shared/months';+import { useFeatureFlag } from '../../../hooks/useFeatureFlag';import { useLocalPref } from '../../../hooks/useLocalPref';import { useNavigate } from '../../../hooks/useNavigate';import { SvgLogo } from '../../../icons/logo';@@ -21,7 +22,7 @@ import { SvgViewShow } from '../../../icons/v2';import { useResponsive } from '../../../ResponsiveProvider';import { theme, styles } from '../../../style';import { BalanceWithCarryover } from '../../budget/BalanceWithCarryover';-import { makeAmountFullStyle, makeAmountGrey } from '../../budget/util';+import { makeAmountGrey, makeBalanceAmountStyle } from '../../budget/util';import { Button } from '../../common/Button';import { Card } from '../../common/Card';import { Label } from '../../common/Label';@@ -331,6 +332,12 @@ const ExpenseCategory = memo(function ExpenseCategory({}) {const opacity = blank ? 0 : 1;+ const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');+ const goalTemp = useSheetValue(goal);+ const goalValue = isGoalTemplatesEnabled ? goalTemp : null;+ const budgetedTemp = useSheetValue(budgeted);+ const budgetedValue = isGoalTemplatesEnabled ? budgetedTemp : null;+const [budgetType = 'rollover'] = useLocalPref('budgetType');const dispatch = useDispatch();@@ -574,9 +581,11 @@ const ExpenseCategory = memo(function ExpenseCategory({mode="oneline"style={{maxWidth: columnWidth,- ...makeAmountFullStyle(value, {- zeroColor: theme.pillTextSubdued,- }),+ ...makeBalanceAmountStyle(+ value,+ goalValue,+ budgetedValue,+ ),textAlign: 'right',fontSize: 12,}}diff --git a/upcoming-release-notes/2940.md b/upcoming-release-notes/2940.mdnew file mode 100644index 0000000000..5bbf2c3830--- /dev/null+++ b/upcoming-release-notes/2940.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [youngcw]+---++Fix mobile budget coloring to show template colors