diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx index 24612aa8326ece375f04da1e6a8add5d9102ec49..067bf43eeb4396fc5ed63ced620e148193d5c0e8 100644 --- a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx +++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx @@ -375,7 +375,7 @@ function CategoryItem({ borderTop: `1px solid ${theme.pillBorder}`, } : {}; - const [budgetType] = useLocalPref('budgetType'); + const [budgetType = 'rollover'] = useLocalPref('budgetType'); const balance = useSheetValue( budgetType === 'rollover' diff --git a/packages/desktop-client/src/components/budget/index.tsx b/packages/desktop-client/src/components/budget/index.tsx index 16c0211dbd360ca13fef242e10904066c89dcb7e..9f41747400999c211b3c116720b4b2944aa676ad 100644 --- a/packages/desktop-client/src/components/budget/index.tsx +++ b/packages/desktop-client/src/components/budget/index.tsx @@ -75,8 +75,7 @@ function BudgetInner(props: BudgetInnerProps) { start: startMonth, end: startMonth, }); - const [budgetTypePref] = useLocalPref('budgetType'); - const budgetType = budgetTypePref || 'rollover'; + const [budgetType = 'rollover'] = useLocalPref('budgetType'); const [maxMonthsPref] = useGlobalPref('maxMonths'); const maxMonths = maxMonthsPref || 1; const [initialized, setInitialized] = useState(false); diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx index 91e84611503f6fd20a2ab24efa766c377ad03dec..3fa93d7c4020dfa5010e9c0807d1346559637dee 100644 --- a/packages/desktop-client/src/components/mobile/budget/index.tsx +++ b/packages/desktop-client/src/components/mobile/budget/index.tsx @@ -461,8 +461,7 @@ function BudgetInner(props: BudgetInnerProps) { export function Budget() { const { list: categories, grouped: categoryGroups } = useCategories(); - const [_budgetType] = useLocalPref('budgetType'); - const budgetType = _budgetType || 'rollover'; + const [budgetType = 'rollover'] = useLocalPref('budgetType'); const spreadsheet = useSpreadsheet(); useSetThemeColor(theme.mobileViewTheme); return ( diff --git a/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx b/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx index e98d0ea3a59000fc7ed3163d456120de26b58f2b..9fbb26da2872ea8ca9b615fc70047a71197f1d0f 100644 --- a/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx +++ b/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx @@ -15,7 +15,7 @@ import { Setting } from './UI'; export function BudgetTypeSettings() { const dispatch = useDispatch(); - const [budgetType] = useLocalPref('budgetType'); + const [budgetType = 'rollover'] = useLocalPref('budgetType'); const [loading, setLoading] = useState(false); const currentMonth = monthUtils.currentMonth(); diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx index 79cc91ccb188e55fd00cf2f9c815064149697012..0cd2da83834d222d94a14825e422b38dd4e70d7b 100644 --- a/packages/desktop-client/src/components/settings/Experimental.tsx +++ b/packages/desktop-client/src/components/settings/Experimental.tsx @@ -57,7 +57,7 @@ function FeatureToggle({ } function ReportBudgetFeature() { - const [budgetType] = useLocalPref('budgetType'); + const [budgetType = 'rollover'] = useLocalPref('budgetType'); const enabled = useFeatureFlag('reportBudget'); const blockToggleOff = budgetType === 'report' && enabled; return ( diff --git a/upcoming-release-notes/3169.md b/upcoming-release-notes/3169.md new file mode 100644 index 0000000000000000000000000000000000000000..be8369f8bb5201cf18850f5b22b2ef3be0785531 --- /dev/null +++ b/upcoming-release-notes/3169.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [YusefOuda] +--- + +Fix budget type toggle not working the first time