no message

Author: r1b2ns

BDKSwiftExampleWallet/Model/BalanceDisplayFormat.swift

@@ -15,6 +15,14 @@ enum BalanceDisplayFormat: String, CaseIterable, Codable {
     case fiat = "usd"
     case bip177 = "bip177"
 
+    var displayPrefix: String {
+        switch self {
+        case .bitcoinSats, .bitcoin, .bip177: return "₿"
+        case .fiat: return "$"
+        default : return ""
+        }
+    }
+    
     var displayText: String {
         switch self {
         case .sats, .bitcoinSats: return "sats"

BDKSwiftExampleWallet/Resources/Localizable.xcstrings

@@ -201,12 +201,12 @@
         }
       }
     },
-    "%@%lld sats" : {
+    "%@%@ %@" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "%1$@%2$lld sats"
+            "value" : "%1$@%2$@ %3$@"
           }
         }
       }

BDKSwiftExampleWallet/View Model/Activity/ActivityListViewModel.swift

@@ -22,6 +22,7 @@ class ActivityListViewModel {
     var totalScripts: UInt64 = 0
     var walletSyncState: WalletSyncState
     var walletViewError: AppError?
+    var fiatPrice: Double
 
     private var updateProgress: @Sendable (UInt64, UInt64) -> Void {
         { [weak self] inspected, total in
@@ -41,11 +42,13 @@ class ActivityListViewModel {
     init(
         bdkClient: BDKClient = .live,
         transactions: [CanonicalTx] = [],
-        walletSyncState: WalletSyncState = .notStarted
+        walletSyncState: WalletSyncState = .notStarted,
+        fiatPrice: Double
     ) {
         self.bdkClient = bdkClient
         self.transactions = transactions
         self.walletSyncState = walletSyncState
+        self.fiatPrice = fiatPrice
     }
 
     func getTransactions() {

BDKSwiftExampleWallet/View/Activity/ActivityListView.swift

@@ -27,7 +27,8 @@ struct ActivityListView: View {
                         viewModel: .init(),
                         transactions: viewModel.transactions,
                         walletSyncState: viewModel.walletSyncState,
-                        format: .bip177
+                        format: .bip177,
+                        fiatPrice: viewModel.fiatPrice
                     )
                     .transition(.blurReplace)
                 } else {
@@ -81,5 +82,5 @@ struct CustomSegmentedControl: View {
 }
 
 #Preview {
-    ActivityListView(viewModel: .init())
+    ActivityListView(viewModel: .init(fiatPrice: 714.23))
 }

BDKSwiftExampleWallet/View/Activity/TransactionItemView.swift

@@ -14,15 +14,18 @@ struct TransactionItemView: View {
     let txDetails: TxDetails
     let isRedacted: Bool
     private let format: BalanceDisplayFormat
+    private var fiatPrice: Double
 
     init(
         txDetails: TxDetails,
         isRedacted: Bool,
-        format: BalanceDisplayFormat
+        format: BalanceDisplayFormat,
+        fiatPrice: Double
     ) {
         self.txDetails = txDetails
         self.isRedacted = isRedacted
         self.format = format
+        self.fiatPrice = fiatPrice
     }
 
     var body: some View {
@@ -109,10 +112,11 @@ struct TransactionItemView: View {
             Spacer()
 
             let delta = txDetails.balanceDelta
-            let prefix = delta >= 0 ? "+ " : "- "
-            let amount = abs(delta)
+            let prefix = (delta >= 0 ? "+ " : "- ").appending("\(format.displayPrefix) ")
+            let amount = format.formatted(UInt64(abs(delta)), fiatPrice: fiatPrice)
+            let suffix = format.displayText
 
-            Text("\(prefix)\(amount) sats")
+            Text("\(prefix)\(amount) \(suffix)")
                 .font(.subheadline)
                 .fontWeight(.semibold)
                 .fontDesign(.rounded)
@@ -132,7 +136,8 @@ struct TransactionItemView: View {
         TransactionItemView(
             txDetails: .mock,
             isRedacted: false,
-            format: .bip177
+            format: .bip177,
+            fiatPrice: 714.23
         )
     }
 #endif

BDKSwiftExampleWallet/View/Activity/TransactionListView.swift

@@ -14,17 +14,20 @@ struct TransactionListView: View {
     let transactions: [CanonicalTx]
     let walletSyncState: WalletSyncState
     private let format: BalanceDisplayFormat
+    private let fiatPrice: Double
 
     init(
         viewModel: TransactionListViewModel,
         transactions: [CanonicalTx],
         walletSyncState: WalletSyncState,
-        format: BalanceDisplayFormat
+        format: BalanceDisplayFormat,
+        fiatPrice: Double
     ) {
         self.viewModel = viewModel
         self.transactions = transactions
         self.walletSyncState = walletSyncState
         self.format = format
+        self.fiatPrice = fiatPrice
     }
 
     var body: some View {
@@ -34,7 +37,8 @@ struct TransactionListView: View {
                 TransactionItemView(
                     txDetails: .mock,
                     isRedacted: true,
-                    format: format
+                    format: format,
+                    fiatPrice: fiatPrice
                 )
                 .listRowInsets(EdgeInsets())
                 .listRowSeparator(.hidden)
@@ -117,7 +121,8 @@ struct TransactionListView: View {
                             TransactionItemView(
                                 txDetails: txDetails,
                                 isRedacted: false,
-                                format: format
+                                format: format,
+                                fiatPrice: fiatPrice
                             )
                         }
 
@@ -158,7 +163,8 @@ struct TransactionListView: View {
                 .mock
             ],
             walletSyncState: .synced,
-            format: .bip177
+            format: .bip177,
+            fiatPrice: 714.23
         )
     }
     #Preview {
@@ -168,7 +174,8 @@ struct TransactionListView: View {
             ),
             transactions: [],
             walletSyncState: .synced,
-            format: .bip177
+            format: .bip177,
+            fiatPrice: 714.23
         )
     }
 #endif

BDKSwiftExampleWallet/View/Home/BalanceView.swift

@@ -14,10 +14,6 @@ struct BalanceView: View {
     private var format: BalanceDisplayFormat
     private let balance: UInt64
     private var fiatPrice: Double
-    private var satsPrice: Double {
-        let usdValue = Double(balance).valueInUSD(price: fiatPrice)
-        return usdValue
-    }
 
     private var currencySymbol: some View {
         Image(systemName: format == .fiat ? "dollarsign" : "bitcoinsign")
@@ -38,36 +34,22 @@ struct BalanceView: View {
     @MainActor
     private var formattedBalance: String {
         return format.formatted(balance, fiatPrice: fiatPrice)
-//        switch format {
-//        case .sats:
-//            return balance.formatted(.number)
-//        case .bitcoin:
-//            return String(format: "%.8f", Double(balance) / 100_000_000)
-//        case .bitcoinSats:
-//            return balance.formattedSatoshis()
-//        case .bip21q:
-//            return balance.formatted(.number)
-//        case .fiat:
-//            return satsPrice.formatted(.number.precision(.fractionLength(2)))
-//        case .bip177:
-//            return balance.formattedBip177()
-//        }
     }
 
     @MainActor
     var balanceText: some View {
-        Text(format == .fiat && satsPrice == 0 ? "00.00" : formattedBalance)
+        Text(format == .fiat && fiatPrice == 0 ? "00.00" : formattedBalance)
             .contentTransition(.numericText(countsDown: true))
             .fontWeight(.semibold)
             .fontDesign(.rounded)
             .foregroundStyle(
-                format == .fiat && satsPrice == 0 ? .secondary : .primary
+                format == .fiat && fiatPrice == 0 ? .secondary : .primary
             )
             .opacity(
-                format == .fiat && satsPrice == 0 ? balanceTextPulsingOpacity : 1
+                format == .fiat && fiatPrice == 0 ? balanceTextPulsingOpacity : 1
             )
             .animation(.spring(response: 0.4, dampingFraction: 0.8), value: format)
-            .animation(.easeInOut, value: satsPrice)
+            .animation(.easeInOut, value: fiatPrice)
             .onAppear {
                 withAnimation(.easeInOut(duration: 1.5).repeatForever(autoreverses: true)) {
                     balanceTextPulsingOpacity = 0.3

BDKSwiftExampleWallet/View/WalletView.swift

@@ -56,7 +56,8 @@ struct WalletView: View {
                         viewModel: .init(),
                         transactions: viewModel.recentTransactions,
                         walletSyncState: viewModel.walletSyncState,
-                        format: balanceFormat
+                        format: balanceFormat,
+                        fiatPrice: viewModel.price
                     )
                     .refreshable {
                         await viewModel.syncOrFullScan()
@@ -122,7 +123,7 @@ struct WalletView: View {
 
         }
         .navigationDestination(isPresented: $showAllTransactions) {
-            ActivityListView(viewModel: .init())
+            ActivityListView(viewModel: .init(fiatPrice: viewModel.price))
         }
         .navigationDestination(for: NavigationDestination.self) { destination in
             switch destination {