misc: name output (#175)

Author: reez

BDKSwiftExampleWallet/Resources/Localizable.xcstrings

@@ -90,22 +90,22 @@
     "%@ sats fee" : {
 
     },
-    "%lld Transaction%@" : {
+    "%lld Output%@" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "%1$lld Transaction%2$@"
+            "value" : "%1$lld Output%2$@"
           }
         }
       }
     },
-    "%lld UTXO%@" : {
+    "%lld Transaction%@" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "%1$lld UTXO%2$@"
+            "value" : "%1$lld Transaction%2$@"
           }
         }
       }
@@ -426,6 +426,9 @@
           }
         }
       }
+    },
+    "No Outputs" : {
+
     },
     "No seed available" : {
 
@@ -439,9 +442,6 @@
           }
         }
       }
-    },
-    "No UTXOs" : {
-
     },
     "OK" : {
       "localizations" : {
@@ -462,6 +462,9 @@
           }
         }
       }
+    },
+    "Outputs" : {
+
     },
     "Receive" : {
       "localizations" : {
@@ -684,9 +687,6 @@
           }
         }
       }
-    },
-    "UTXOs" : {
-
     },
     "Vout: %u" : {
 

BDKSwiftExampleWallet/View Model/Activity/ActivityListViewModel.swift

@@ -19,12 +19,12 @@ class ActivityListViewModel {
     var progress: Float = 0.0
     var inspectedScripts: UInt64 = 0
     var totalScripts: UInt64 = 0
-    var utxos: [LocalOutput] = []
+    var localOutputs: [LocalOutput] = []
     var displayMode: DisplayMode = .transactions
 
     enum DisplayMode {
         case transactions
-        case utxos
+        case outputs
     }
 
     init(
@@ -37,9 +37,9 @@ class ActivityListViewModel {
         self.transactions = transactions
     }
 
-    func getUTXOs() {
+    func listUnspent() {
         do {
-            self.utxos = try bdkClient.listUnspent()
+            self.localOutputs = try bdkClient.listUnspent()
         } catch let error as WalletError {
             self.walletViewError = .generic(message: error.localizedDescription)
             self.showingWalletViewErrorAlert = true

BDKSwiftExampleWallet/View/Activity/ActivityListView.swift

@@ -30,20 +30,20 @@ struct ActivityListView: View {
                     )
                 } else {
                     LocalOutputListView(
-                        localOutputs: viewModel.utxos,
+                        localOutputs: viewModel.localOutputs,
                         walletSyncState: viewModel.walletSyncState
                     )
                 }
             }
             .task {
                 viewModel.getTransactions()
-                viewModel.getUTXOs()
+                viewModel.listUnspent()
             }
         }
         .navigationTitle(
             viewModel.displayMode == .transactions
                 ? "\(viewModel.transactions.count) Transaction\(viewModel.transactions.count == 1 ? "" : "s")"
-                : "\(viewModel.utxos.count) UTXO\(viewModel.utxos.count == 1 ? "" : "s")"
+                : "\(viewModel.localOutputs.count) Output\(viewModel.localOutputs.count == 1 ? "" : "s")"
         )
         .navigationBarTitleDisplayMode(.inline)
         .padding(.top)
@@ -59,7 +59,7 @@ struct CustomSegmentedControl: View {
     var body: some View {
         HStack(spacing: 20) {
             segmentButton(for: .transactions)
-            segmentButton(for: .utxos)
+            segmentButton(for: .outputs)
             Spacer()
         }
     }
@@ -68,7 +68,7 @@ struct CustomSegmentedControl: View {
         Button(action: {
             selection = mode
         }) {
-            Text(mode == .transactions ? "Transactions" : "UTXOs").bold()
+            Text(mode == .transactions ? "Transactions" : "Outputs").bold()
                 .foregroundColor(selection == mode ? .primary : .gray)
         }
     }

BDKSwiftExampleWallet/View/Activity/LocalOutputItemView.swift

@@ -9,7 +9,7 @@ import BitcoinDevKit
 import SwiftUI
 
 struct LocalOutputItemView: View {
-    let utxo: LocalOutput
+    let output: LocalOutput
     let isRedacted: Bool
     @Environment(\.dynamicTypeSize) var dynamicTypeSize
 
@@ -33,15 +33,15 @@ struct LocalOutputItemView: View {
 
             VStack(alignment: .leading, spacing: 5) {
 
-                Text(utxo.outpoint.txid)
+                Text(output.outpoint.txid)
                     .truncationMode(.middle)
                     .lineLimit(1)
                     .fontDesign(.monospaced)
                     .fontWeight(.semibold)
                     .font(.title)
                     .foregroundColor(.primary)
 
-                Text("Vout: \(utxo.outpoint.vout)")
+                Text("Vout: \(output.outpoint.vout)")
                     .lineLimit(dynamicTypeSize.isAccessibilitySize ? 2 : 1)
                     .font(.caption2)
                     .fontWidth(.condensed)
@@ -54,7 +54,7 @@ struct LocalOutputItemView: View {
 
             Spacer()
 
-            Text("\(utxo.txout.value) sats")
+            Text("\(output.txout.value) sats")
                 .font(.subheadline)
                 .fontWeight(.semibold)
                 .fontDesign(.rounded)
@@ -69,5 +69,5 @@ struct LocalOutputItemView: View {
 }
 
 #Preview {
-    LocalOutputItemView(utxo: .mock, isRedacted: false)
+    LocalOutputItemView(output: .mock, isRedacted: false)
 }

BDKSwiftExampleWallet/View/Activity/LocalOutputListView.swift

@@ -15,17 +15,17 @@ struct LocalOutputListView: View {
     var body: some View {
         List {
             if localOutputs.isEmpty && walletSyncState == .syncing {
-                LocalOutputItemView(utxo: .mock, isRedacted: true)
+                LocalOutputItemView(output: .mock, isRedacted: true)
                     .listRowInsets(EdgeInsets())
                     .listRowSeparator(.hidden)
             } else if localOutputs.isEmpty {
-                Text("No UTXOs")
+                Text("No Outputs")
                     .font(.subheadline)
                     .listRowInsets(EdgeInsets())
                     .listRowSeparator(.hidden)
             } else {
-                ForEach(localOutputs, id: \.outpoint) { utxo in
-                    LocalOutputItemView(utxo: utxo, isRedacted: false)
+                ForEach(localOutputs, id: \.outpoint) { output in
+                    LocalOutputItemView(output: output, isRedacted: false)
                 }
                 .listRowInsets(EdgeInsets())
                 .listRowSeparator(.hidden)