diff --git a/BDKSwiftExampleWallet/Model/BalanceDisplayFormat.swift b/BDKSwiftExampleWallet/Model/BalanceDisplayFormat.swift index 0e88a430..6f93373d 100644 --- a/BDKSwiftExampleWallet/Model/BalanceDisplayFormat.swift +++ b/BDKSwiftExampleWallet/Model/BalanceDisplayFormat.swift @@ -11,12 +11,14 @@ enum BalanceDisplayFormat: String, CaseIterable, Codable { case bitcoinSats = "bitcoinSats" case bitcoin = "btc" case sats = "sats" + case bip21q = "bip21q" case fiat = "usd" var displayText: String { switch self { case .sats, .bitcoinSats: return "sats" case .bitcoin: return "" + case .bip21q: return "₿" case .fiat: return "USD" } } diff --git a/BDKSwiftExampleWallet/View/WalletView.swift b/BDKSwiftExampleWallet/View/WalletView.swift index 68ec3775..579c0189 100644 --- a/BDKSwiftExampleWallet/View/WalletView.swift +++ b/BDKSwiftExampleWallet/View/WalletView.swift @@ -296,10 +296,12 @@ extension WalletView { switch balanceFormat { case .sats: return viewModel.balanceTotal.formatted(.number) - case .bitcoinSats: - return viewModel.balanceTotal.formattedSatoshis() case .bitcoin: return String(format: "%.8f", Double(viewModel.balanceTotal) / 100_000_000) + case .bitcoinSats: + return viewModel.balanceTotal.formattedSatoshis() + case .bip21q: + return viewModel.balanceTotal.formatted(.number) case .fiat: return viewModel.satsPrice.formatted(.number.precision(.fractionLength(2))) } @@ -316,7 +318,7 @@ extension WalletView { removal: .move(edge: .trailing).combined(with: .opacity) ) ) - .opacity(balanceFormat == .sats ? 0 : 1) + .opacity(balanceFormat == .sats || balanceFormat == .bip21q ? 0 : 1) .id("symbol-\(balanceFormat)") .animation(.spring(response: 0.3, dampingFraction: 0.7), value: balanceFormat) }