Fix amount with currency

BaseStyle/BaseStyle/CustomUI/Buttons/CapsuleButton.swift

@@ -12,13 +12,17 @@ public struct CapsuleButton: View {
     private let buttonName: String
     private let paddingHr: CGFloat
     private let paddingVr: CGFloat
+    private let cornerRadius: Double
     private let isEnabled: Bool
+
     private let onClick: (() -> Void)?
 
-    public init(buttonName: String, isEnabled: Bool = true, paddingHr: CGFloat = 73, paddingVr: CGFloat = 12, onClick: (() -> Void)?) {
+    public init(buttonName: String, isEnabled: Bool = true, paddingHr: CGFloat = 73,
+                paddingVr: CGFloat = 12, cornerRadius: Double = 12, onClick: (() -> Void)?) {
         self.buttonName = buttonName
         self.paddingHr = paddingHr
         self.paddingVr = paddingVr
+        self.cornerRadius = cornerRadius
         self.isEnabled = isEnabled
         self.onClick = onClick
     }
@@ -37,7 +41,7 @@ public struct CapsuleButton: View {
             .padding(.horizontal, paddingHr)
             .padding(.vertical, paddingVr)
             .background(primaryColor)
-            .cornerRadius(12)
+            .cornerRadius(cornerRadius)
         }
         .buttonStyle(.scale)
         .disabled(!isEnabled)

Data/Data/Extension/Double+Extension.swift

@@ -9,10 +9,13 @@ import Foundation
 
 public extension Double {
 
-    func formattedCurrencyWithSign(_ code: String?) -> String {
+    func formattedCurrency(_ code: String?, _ showSign: Bool = false) -> String {
         let amount: String
         let formatter = NumberFormatter()
         formatter.locale = Locale.current
+        formatter.numberStyle = .decimal // Added decimal which includes comma separator
+        formatter.minimumFractionDigits = 2
+        formatter.maximumFractionDigits = 2
 
         if let formattedAmount = formatter.string(from: NSNumber(value: self)) {
             amount = formattedAmount.hasPrefix("-") ? String(formattedAmount.dropFirst()) : formattedAmount
@@ -21,17 +24,11 @@ public extension Double {
         }
 
         let currencySymbol = Currency.getCurrencyFromCode(code).symbol
-        return currencySymbol.isEmpty ? amount : (currencySymbol + " " + amount)
-    }
-
-    var formattedCurrency: String {
-        let formatter = NumberFormatter()
-        formatter.locale = Locale.current
-
-        if let formattedAmount = formatter.string(from: NSNumber(value: self)) {
-            return formattedAmount.hasPrefix("-") ? String(formattedAmount.dropFirst()) : formattedAmount
+        if showSign {
+            let sign = self < 0 ? "-" : ""
+            return currencySymbol.isEmpty ? "\(sign)\(amount)" : "\(sign)\(currencySymbol) \(amount)"
         } else {
-            return String(format: "%.2f", self.rounded())  // Fallback to a basic decimal format
+            return currencySymbol.isEmpty ? amount : (currencySymbol + " " + amount)
         }
     }
 

Data/Data/Model/AppUser.swift

@@ -17,7 +17,7 @@ public struct AppUser: Identifiable, Codable, Hashable, Sendable {
     public var imageUrl: String?
     public var deviceFcmToken: String?
     public var loginType: LoginType
-    public var totalOweAmount: [String: Double]
+    public var totalOweAmount: [String: Double] /// [currency: balance]
     public var isActive: Bool
 
     public var fullName: String {

Data/Data/Model/Currency/Currency.swift

@@ -13,7 +13,15 @@ public struct Currency: Decodable, Hashable {
     public let symbol: String
     public let region: String
 
-    public static var defaultCurrency = Currency(code: "INR", name: "Indian Rupee", symbol: "₹", region: "IN")
+    private static var defaultLocalCurrency = Currency(code: "INR", name: "Indian Rupee", symbol: "₹", region: "IN")
+
+    public static var defaultCurrency: Currency {
+        let allCurrencies = getAllCurrencies()
+        let currentLocal = Locale.current.region?.identifier
+        let currency = allCurrencies.first(where: { $0.region == currentLocal }) ??
+            (allCurrencies.first ?? defaultLocalCurrency)
+        return currency
+    }
 
     public init(code: String, name: String, symbol: String, region: String) {
         self.code = code
@@ -32,12 +40,4 @@ public struct Currency: Decodable, Hashable {
         let currency = allCurrencies.first(where: { $0.code == code }) ?? defaultCurrency
         return currency
     }
-
-    public static func getCurrentLocalCurrency() -> Currency {
-        let allCurrencies = getAllCurrencies()
-        let currentLocal = Locale.current.region?.identifier
-        let currency = allCurrencies.first(where: { $0.region == currentLocal }) ??
-            (allCurrencies.first ?? defaultCurrency)
-        return currency
-    }
 }

Data/Data/Model/Expense.swift

@@ -76,7 +76,7 @@ public struct Expense: Codable, Hashable, Identifiable {
 
     // Calculated properties for better UI representation
     public var formattedAmount: String {
-        return amount.formattedCurrencyWithSign(currencyCode)
+        return amount.formattedCurrency(currencyCode)
     }
 }
 

Splito/UI/Home/ActivityLog/ActivityLogView.swift

@@ -185,10 +185,10 @@ private struct ActivityListCellView: View {
             return ""
         case .expenseAdded, .expenseUpdated, .expenseDeleted, .expenseRestored:
             let action = (amount > 0 ? "get back" : "owe")
-            return (amount == 0) ? "You do not owe anything" : "You \(action) \(amount.formattedCurrencyWithSign(activityLog.amountCurrency))"
+            return (amount == 0) ? "You do not owe anything" : "You \(action) \(amount.formattedCurrency(activityLog.amountCurrency))"
         case .transactionAdded, .transactionUpdated, .transactionDeleted, .transactionRestored:
             let action = (amount > 0 ? "paid" : "received")
-            return (amount == 0) ? "You do not owe anything" : "You \(action) \(amount.formattedCurrencyWithSign(activityLog.amountCurrency))"
+            return (amount == 0) ? "You do not owe anything" : "You \(action) \(amount.formattedCurrency(activityLog.amountCurrency))"
         }
     }
 }

Splito/UI/Home/Expense/AddExpenseViewModel.swift

@@ -57,7 +57,7 @@ class AddExpenseViewModel: BaseViewModel, ObservableObject {
         self.router = router
         self.groupId = groupId
         self.expenseId = expenseId
-        self.selectedCurrency = Currency.getCurrentLocalCurrency()
+        self.selectedCurrency = Currency.defaultCurrency
         super.init()
         loadInitialData()
     }
@@ -356,11 +356,11 @@ extension AddExpenseViewModel {
             let amountDescription = totalSharedAmount < expenseAmount ? "short" : "over"
             let differenceAmount = totalSharedAmount < expenseAmount ? (expenseAmount - totalSharedAmount) : (totalSharedAmount - expenseAmount)
             showAlertFor(title: "Error!",
-                         message: "The amounts do not add up to the total cost of \(expenseAmount.formattedCurrencyWithSign(selectedCurrency.code)). You are \(amountDescription) by \(differenceAmount.formattedCurrencyWithSign(selectedCurrency.code)).")
+                         message: "The amounts do not add up to the total cost of \(expenseAmount.formattedCurrency(selectedCurrency.code)). You are \(amountDescription) by \(differenceAmount.formattedCurrency(selectedCurrency.code)).")
             return false
         } else if selectedPayers.count > 1 && totalPaidAmount != expenseAmount {
             showAlertFor(title: "Error",
-                         message: "The total of everyone's paid shares (\(totalPaidAmount.formattedCurrencyWithSign(selectedCurrency.code))) is different than the total cost (\(expenseAmount.formattedCurrencyWithSign(selectedCurrency.code)))")
+                         message: "The total of everyone's paid shares (\(totalPaidAmount.formattedCurrency(selectedCurrency.code))) is different than the total cost (\(expenseAmount.formattedCurrency(selectedCurrency.code)))")
             return false
         } else if selectedPayers.count == 1 && selectedPayers.values.reduce(0, +) != expenseAmount {
             showAlertFor(title: "Error",

Splito/UI/Home/Expense/Detail Selection/Expense Split Option/ExpenseSplitOptionsTabView.swift

@@ -257,7 +257,7 @@ struct MemberCellView: View {
                         .foregroundStyle(primaryText)
 
                     if let splitAmount {
-                        Text(splitAmount.formattedCurrencyWithSign(amountCurrency))
+                        Text(splitAmount.formattedCurrency(amountCurrency))
                             .font(.body3(12))
                             .foregroundStyle(disableText)
                     }

Splito/UI/Home/Expense/Detail Selection/Expense Split Option/ExpenseSplitOptionsView.swift

@@ -71,14 +71,14 @@ private struct SplitOptionsBottomView: View {
         switch viewModel.selectedTab {
         case .equally:
             let selectedCurrency = viewModel.selectedCurrency
-            BottomInfoCardView(title: "\(viewModel.splitAmount.formattedCurrencyWithSign(selectedCurrency))/person",
+            BottomInfoCardView(title: "\(viewModel.splitAmount.formattedCurrency(selectedCurrency))/person",
                                value: "\(viewModel.selectedMembers.count) people",
                                memberCount: viewModel.selectedMembers.count, isAllSelected: viewModel.isAllSelected,
                                isForEqualSplit: true, onAllBtnTap: viewModel.handleAllBtnAction)
         case .fixedAmount:
             let selectedCurrency = viewModel.selectedCurrency
-            BottomInfoCardView(title: "\(viewModel.totalFixedAmount.formattedCurrencyWithSign(selectedCurrency)) of \(viewModel.expenseAmount.formattedCurrencyWithSign(selectedCurrency))",
-                               value: "\((viewModel.expenseAmount - viewModel.totalFixedAmount).formattedCurrencyWithSign(selectedCurrency)) left")
+            BottomInfoCardView(title: "\(viewModel.totalFixedAmount.formattedCurrency(selectedCurrency)) of \(viewModel.expenseAmount.formattedCurrency(selectedCurrency))",
+                               value: "\((viewModel.expenseAmount - viewModel.totalFixedAmount).formattedCurrency(selectedCurrency)) left")
         case .percentage:
             BottomInfoCardView(title: "\(String(format: "%.0f", viewModel.totalPercentage))% of 100%",
                                value: "\(String(format: "%.0f", 100 - viewModel.totalPercentage))% left")

Splito/UI/Home/Expense/Detail Selection/Expense Split Option/ExpenseSplitOptionsViewModel.swift

@@ -190,7 +190,7 @@ class ExpenseSplitOptionsViewModel: BaseViewModel, ObservableObject {
                 let amountDescription = totalFixedAmount < expenseAmount ? "short" : "over"
                 let differenceAmount = totalFixedAmount < expenseAmount ? (expenseAmount - totalFixedAmount) : (totalFixedAmount - expenseAmount)
 
-                showAlertFor(title: "Whoops!", message: "The amounts do not add up to the total cost of \(expenseAmount.formattedCurrencyWithSign(selectedCurrency)). You are \(amountDescription) by \(differenceAmount.formattedCurrencyWithSign(selectedCurrency)).")
+                showAlertFor(title: "Whoops!", message: "The amounts do not add up to the total cost of \(expenseAmount.formattedCurrency(selectedCurrency)). You are \(amountDescription) by \(differenceAmount.formattedCurrency(selectedCurrency)).")
                 return completion(false)
             }
         case .percentage:

Splito/UI/Home/Expense/Detail Selection/Payer/ChooseMultiplePayerView.swift

@@ -47,8 +47,8 @@ struct ChooseMultiplePayerView: View {
                 .scrollBounceBehavior(.basedOnSize)
 
                 let currency = viewModel.amountCurrency
-                BottomInfoCardView(title: "\(viewModel.totalAmount.formattedCurrencyWithSign(currency)) of \(viewModel.expenseAmount.formattedCurrencyWithSign(currency))",
-                                   value: "\((viewModel.expenseAmount - viewModel.totalAmount).formattedCurrencyWithSign(currency)) left")
+                BottomInfoCardView(title: "\(viewModel.totalAmount.formattedCurrency(currency)) of \(viewModel.expenseAmount.formattedCurrency(currency))",
+                                   value: "\((viewModel.expenseAmount - viewModel.totalAmount).formattedCurrency(currency)) left")
             }
         }
         .background(surfaceColor)

Splito/UI/Home/Expense/Detail Selection/Payer/ChooseMultiplePayerViewModel.swift

@@ -79,7 +79,7 @@ class ChooseMultiplePayerViewModel: BaseViewModel, ObservableObject {
             let differenceAmount = totalAmount < expenseAmount ? (expenseAmount - totalAmount) : (totalAmount - expenseAmount)
 
             showAlertFor(title: "Whoops!",
-                         message: "The payment values do not add up to the total cost of \(expenseAmount.formattedCurrencyWithSign(amountCurrency)). You are \(amountDescription) by \(differenceAmount.formattedCurrencyWithSign(amountCurrency)).")
+                         message: "The payment values do not add up to the total cost of \(expenseAmount.formattedCurrency(amountCurrency)). You are \(amountDescription) by \(differenceAmount.formattedCurrency(amountCurrency)).")
             return
         }
 

Splito/UI/Home/Expense/Expense Detail/ExpenseDetailsView.swift

@@ -211,9 +211,9 @@ private struct ExpenseInfoView: View {
                             MemberProfileImageView(imageUrl: userData.imageUrl, height: SUB_IMAGE_HEIGHT, scaleEffect: 0.6)
 
                             if let splitTo = expense?.splitTo, splitTo.contains(userData.id) {
-                                Text("\(memberName.localized) paid \(paidAmount.formattedCurrencyWithSign(currencyCode)) and \(owes.localized) \(splitAmount)")
+                                Text("\(memberName.localized) paid \(paidAmount.formattedCurrency(currencyCode)) and \(owes.localized) \(splitAmount)")
                             } else {
-                                Text("\(memberName.localized) paid \(paidAmount.formattedCurrencyWithSign(currencyCode))")
+                                Text("\(memberName.localized) paid \(paidAmount.formattedCurrency(currencyCode))")
                             }
                         } else if let splitTo = expense?.splitTo, splitTo.contains(userData.id) {
                             MemberProfileImageView(imageUrl: userData.imageUrl, height: SUB_IMAGE_HEIGHT, scaleEffect: 0.6)

Splito/UI/Home/Expense/Expense Detail/ExpenseDetailsViewModel.swift

@@ -356,7 +356,7 @@ class ExpenseDetailsViewModel: BaseViewModel, ObservableObject {
     func getSplitAmount(for member: String) -> String {
         guard let expense else { return "" }
         let finalAmount = expense.getTotalSplitAmountOf(member: member)
-        return finalAmount.formattedCurrencyWithSign(expense.currencyCode)
+        return finalAmount.formattedCurrency(expense.currencyCode)
     }
 
     @objc private func getUpdatedExpense(notification: Notification) {