Merge pull request #158 from synonymdev/feat/tx-detail-outputs

Display outputs in transaction details

Author: jvsena42

Bitkit/Utilities/AddressChecker.swift

@@ -14,6 +14,40 @@ struct AddressInfo: Codable {
     let mempool_stats: AddressStats
 }
 
+struct TxInput: Codable {
+    let txid: String?
+    let vout: Int?
+    let prevout: TxOutput?
+    let scriptsig: String?
+    let scriptsig_asm: String?
+    let witness: [String]?
+    let is_coinbase: Bool?
+    let sequence: Int64?
+}
+
+struct TxOutput: Codable {
+    let scriptpubkey: String
+    let scriptpubkey_asm: String?
+    let scriptpubkey_type: String?
+    let scriptpubkey_address: String?
+    let value: Int64
+    let n: Int?
+}
+
+struct TxStatus: Codable {
+    let confirmed: Bool
+    let block_height: Int?
+    let block_hash: String?
+    let block_time: Int64?
+}
+
+struct TxDetails: Codable {
+    let txid: String
+    let vin: [TxInput]
+    let vout: [TxOutput]
+    let status: TxStatus
+}
+
 enum AddressCheckerError: Error {
     case invalidUrl
     case networkError(Error)
@@ -47,4 +81,30 @@ class AddressChecker {
             throw AddressCheckerError.networkError(error)
         }
     }
+
+    /// Fetches full transaction details from the Esplora endpoint for the given txid.
+    /// - Parameter txid: Hex transaction identifier.
+    static func getTransaction(txid: String) async throws -> TxDetails {
+        guard let url = URL(string: "\(Env.esploraServerUrl)/tx/\(txid)") else {
+            throw AddressCheckerError.invalidUrl
+        }
+
+        do {
+            let (data, response) = try await URLSession.shared.data(from: url)
+
+            guard let httpResponse = response as? HTTPURLResponse,
+                  httpResponse.statusCode == 200
+            else {
+                throw AddressCheckerError.invalidResponse
+            }
+
+            let decoder = JSONDecoder()
+            return try decoder.decode(TxDetails.self, from: data)
+        } catch let error as DecodingError {
+            Logger.error("decoding error \(error)")
+            throw AddressCheckerError.invalidResponse
+        } catch {
+            throw AddressCheckerError.networkError(error)
+        }
+    }
 }

Bitkit/Utilities/LocalizeHelpers.swift

@@ -55,6 +55,64 @@ enum LocalizationHelper {
             return key
         }
     }
+
+    /// Formats a string using ICU MessageFormat with pluralization support
+    static func formatPlural(_ pattern: String, arguments: [String: Any], locale: Locale = Locale.current) -> String {
+        return formatterPlural(pattern, arguments: arguments)
+    }
+
+    // TODO: implement a ICU message format library
+    /// Fallback pluralization formatter for when ICU MessageFormat isn't available
+    private static func formatterPlural(_ pattern: String, arguments: [String: Any]) -> String {
+        var result = pattern
+
+        // Handle basic plural syntax: {count, plural, one {...} other {...}}
+        let pluralRegex = try! NSRegularExpression(pattern: "\\{(\\w+),\\s*plural,\\s*one\\s*\\{([^}]+)\\}\\s*other\\s*\\{([^}]+)\\}\\}", options: [])
+
+        let matches = pluralRegex.matches(in: pattern, options: [], range: NSRange(location: 0, length: pattern.count))
+
+        for match in matches.reversed() { // Process in reverse to maintain string indices
+            let fullMatchRange = match.range
+            let countVarRange = match.range(at: 1)
+            let oneFormRange = match.range(at: 2)
+            let otherFormRange = match.range(at: 3)
+
+            let countVarName = String(pattern[Range(countVarRange, in: pattern)!])
+            let oneForm = String(pattern[Range(oneFormRange, in: pattern)!])
+            let otherForm = String(pattern[Range(otherFormRange, in: pattern)!])
+
+            if let countValue = arguments[countVarName] {
+                let count: Int = if let intValue = countValue as? Int {
+                    intValue
+                } else if let doubleValue = countValue as? Double {
+                    Int(doubleValue)
+                } else if let stringValue = countValue as? String, let intValue = Int(stringValue) {
+                    intValue
+                } else {
+                    0
+                }
+
+                let selectedForm = (count == 1) ? oneForm : otherForm
+                var processedForm = selectedForm.replacingOccurrences(of: "#", with: "\(count)")
+
+                // Replace other variables in the selected form
+                for (key, value) in arguments {
+                    if key != countVarName {
+                        processedForm = processedForm.replacingOccurrences(of: "{\(key)}", with: "\(value)")
+                    }
+                }
+
+                result = result.replacingCharacters(in: Range(fullMatchRange, in: result)!, with: processedForm)
+            }
+        }
+
+        // Replace any remaining simple variables
+        for (key, value) in arguments {
+            result = result.replacingOccurrences(of: "{\(key)}", with: "\(value)")
+        }
+
+        return result
+    }
 }
 
 // MARK: - Public API
@@ -71,6 +129,11 @@ func t(_ key: String, comment: String = "", variables: [String: String] = [:]) -
     return localizedString
 }
 
+func tPlural(_ key: String, comment: String = "", arguments: [String: Any] = [:]) -> String {
+    let localizedString = LocalizationHelper.getString(for: key, comment: comment)
+    return LocalizationHelper.formatPlural(localizedString, arguments: arguments)
+}
+
 // These are for keys that are not yet translated
 func tTodo(_ key: String, comment: String = "", variables: [String: String] = [:]) -> String {
     var localizedString = key

Bitkit/Views/Wallets/Activity/ActivityExplorerView.swift

@@ -8,6 +8,8 @@ struct ActivityExplorerView: View {
     @EnvironmentObject var app: AppViewModel
     @EnvironmentObject var currency: CurrencyViewModel
 
+    @State private var txDetails: TxDetails?
+
     private var onchain: OnchainActivity? {
         guard case let .onchain(activity) = item else { return nil }
         return activity
@@ -32,6 +34,19 @@ struct ActivityExplorerView: View {
         return URL(string: "\(baseUrl)/tx/\(txId)")
     }
 
+    private func loadTransactionDetails() async {
+        guard let onchain else { return }
+
+        do {
+            let details = try await AddressChecker.getTransaction(txid: onchain.txId)
+            await MainActor.run {
+                txDetails = details
+            }
+        } catch {
+            Logger.warn("Failed to load transaction details: \(error)")
+        }
+    }
+
     private var amountPrefix: String {
         switch item {
         case let .lightning(activity):
@@ -101,22 +116,35 @@ struct ActivityExplorerView: View {
                     content: onchain.txId,
                 )
 
-                InfoSection(
-                    title: "INPUT",
-                    content: "\(onchain.txId):0",
-                )
+                if let txDetails {
+                    CaptionText(tPlural("wallet__activity_input", arguments: ["count": txDetails.vin.count]))
+                        .textCase(.uppercase)
+                        .padding(.bottom, 8)
+                    VStack(alignment: .leading, spacing: 4) {
+                        ForEach(Array(txDetails.vin.enumerated()), id: \.offset) { _, input in
+                            let txId = input.txid ?? ""
+                            let vout = input.vout ?? 0
+                            BodySSBText("\(txId):\(vout)")
+                                .lineLimit(1)
+                                .truncationMode(.middle)
+                        }
+                    }
+
+                    Divider()
+                        .padding(.vertical, 16)
 
-                CaptionText("OUTPUTS (2)")
-                    .textCase(.uppercase)
-                    .padding(.bottom, 8)
-                VStack(alignment: .leading, spacing: 4) {
-                    ForEach(0 ..< 2, id: \.self) { i in
-                        BodySSBText("bcrt1q...output\(i)")
-                            .lineLimit(1)
-                            .truncationMode(.middle)
+                    CaptionText(tPlural("wallet__activity_output", arguments: ["count": txDetails.vout.count]))
+                        .textCase(.uppercase)
+                        .padding(.bottom, 8)
+                    VStack(alignment: .leading, spacing: 4) {
+                        ForEach(txDetails.vout.indices, id: \.self) { i in
+                            BodySSBText(txDetails.vout[i].scriptpubkey_address ?? "")
+                                .lineLimit(1)
+                                .truncationMode(.middle)
+                        }
                     }
+                    .padding(.bottom, 16)
                 }
-                .padding(.bottom, 16)
 
                 Divider()
                     .padding(.bottom, 16)
@@ -156,6 +184,11 @@ struct ActivityExplorerView: View {
         .navigationBarHidden(true)
         .padding(.horizontal, 16)
         .bottomSafeAreaPadding()
+        .task {
+            if onchain != nil {
+                await loadTransactionDetails()
+            }
+        }
     }
 }