diff --git a/web/src/pages/BudgetSidebar.vue b/web/src/pages/BudgetSidebar.vue index 9ae0fa7..ae6a4e2 100644 --- a/web/src/pages/BudgetSidebar.vue +++ b/web/src/pages/BudgetSidebar.vue @@ -36,7 +36,7 @@ const OffBudgetAccountsBalance = computed(() => accountStore.OffBudgetAccountsBa
{{account.Name}} - +
  • @@ -46,7 +46,7 @@ const OffBudgetAccountsBalance = computed(() => accountStore.OffBudgetAccountsBa
    {{account.Name}} - +
  • diff --git a/web/src/stores/budget-account.ts b/web/src/stores/budget-account.ts index db0cd12..8f0fe0f 100644 --- a/web/src/stores/budget-account.ts +++ b/web/src/stores/budget-account.ts @@ -31,7 +31,9 @@ export interface Account { ID: string Name: string OnBudget: boolean - Balance: number + ClearedBalance: number + WorkingBalance: number + ReconciledBalance: number Transactions: string[] } @@ -95,13 +97,13 @@ export const useAccountStore = defineStore("budget/account", { return [...state.Accounts.values()].filter(x => x.OnBudget); }, OnBudgetAccountsBalance(state): number { - return this.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0); + return this.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.ClearedBalance), 0); }, OffBudgetAccounts(state) { return [...state.Accounts.values()].filter(x => !x.OnBudget); }, OffBudgetAccountsBalance(state): number { - return this.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0); + return this.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.ClearedBalance), 0); }, TransactionsList(state) : Transaction[] { return this.CurrentAccount!.Transactions.map(x => {