Skip to content

Commit 1422db8

Browse files
committed
Fixed: group current month spending amount getting empty
1 parent fa44eb4 commit 1422db8

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Splito/UI/Home/Groups/CalculateExpensesFunctions.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public func getUpdatedMemberBalanceFor(expense: Expense, group: Groups, updateTy
142142
// Check if the member already has an entry in the member balance array
143143
if let index = memberBalance.firstIndex(where: { $0.id == member }) {
144144
if memberBalance[index].balanceByCurrency[currency] == nil {
145-
memberBalance[index].balanceByCurrency[currency] = GroupCurrencyBalance(balance: 0.0, totalSummary: [])
145+
memberBalance[index].balanceByCurrency[currency] = GroupCurrencyBalance(balance: 0, totalSummary: [])
146146
}
147147

148148
switch updateType {
@@ -241,7 +241,7 @@ func getInitialGroupSummaryFor(member: String, expense: Expense) -> GroupTotalSu
241241
let memberSummary = GroupMemberSummary(groupTotalSpending: expense.amount,
242242
totalPaidAmount: expense.paidBy[member] ?? 0,
243243
totalShare: splitAmount, paidAmount: 0, receivedAmount: 0,
244-
changeInBalance: (expense.paidBy[member] ?? 0.0) - splitAmount)
244+
changeInBalance: (expense.paidBy[member] ?? 0) - splitAmount)
245245

246246
let totalSummary = GroupTotalSummary(year: expenseYear, month: expenseMonth, summary: memberSummary)
247247
return totalSummary
@@ -265,7 +265,7 @@ public func getUpdatedMemberBalanceFor(transaction: Transactions, group: Groups,
265265
// For payer
266266
if let payerIndex = memberBalance.firstIndex(where: { $0.id == payerId }) {
267267
if memberBalance[payerIndex].balanceByCurrency[currency] == nil {
268-
memberBalance[payerIndex].balanceByCurrency[currency] = GroupCurrencyBalance(balance: 0.0, totalSummary: [])
268+
memberBalance[payerIndex].balanceByCurrency[currency] = GroupCurrencyBalance(balance: 0, totalSummary: [])
269269
}
270270

271271
switch updateType {
@@ -351,7 +351,7 @@ public func getUpdatedMemberBalanceFor(transaction: Transactions, group: Groups,
351351
// For receiver
352352
if let receiverIndex = memberBalance.firstIndex(where: { $0.id == receiverId }) {
353353
if memberBalance[receiverIndex].balanceByCurrency[currency] == nil {
354-
memberBalance[receiverIndex].balanceByCurrency[currency] = GroupCurrencyBalance(balance: 0.0, totalSummary: [])
354+
memberBalance[receiverIndex].balanceByCurrency[currency] = GroupCurrencyBalance(balance: 0, totalSummary: [])
355355
}
356356

357357
switch updateType {

Splito/UI/Home/Groups/Group/GroupHomeViewModel.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,12 @@ class GroupHomeViewModel: BaseViewModel, ObservableObject {
147147
}
148148

149149
private func getCalculatedCurrentMonthSpending(group: Groups, userId: String?) -> [String: Double] {
150-
return getTotalSummaryForCurrentMonth(group: group, userId: userId)
150+
let currentMonthSpendingAmounts = getTotalSummaryForCurrentMonth(group: group, userId: userId)
151151
.mapValues { summaries in
152152
summaries.reduce(0) { $0 + $1.summary.totalShare }
153153
}
154154
.filter({ $0.value != 0 })
155+
return currentMonthSpendingAmounts.isEmpty ? [Currency.defaultCurrency.code: 0] : currentMonthSpendingAmounts
155156
}
156157

157158
func refetchTransactionsCount() {

0 commit comments

Comments
 (0)