ui: transaction details

Author: reez

LDKNodeMonday/View/Home/Payments/PaymentDetailView.swift

@@ -10,69 +10,100 @@ import SwiftUI
 
 struct PaymentDetailView: View {
     let payment: PaymentDetails
+    let displayBalanceType: DisplayBalanceType
+    let price: Double
     @Environment(\.dismiss) var dismiss
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
 
-            VStack(alignment: .leading, spacing: 12) {
-
-                HStack {
-                    Spacer()
-                    Image(
-                        systemName: payment.isChainPayment
-                            ? "bitcoinsign.circle" : "bolt.circle"
-                    )
-                    .foregroundColor(.primary)
-                    .font(.largeTitle)
-                    Spacer()
-                }
+            Text("Transaction Detail").bold()
                 .padding()
+                .padding(.bottom, 20)
+
+            VStack(alignment: .leading, spacing: 12) {
 
                 Group {
-                    if let amountMsat = payment.amountMsat {
+                    if let amountMsat = payment.amountMsat, amountMsat > 0 {
                         Divider()
                         DetailRowView(
                             label: "Amount",
-                            value: "\(amountMsat.mSatsAsSats.formatted()) sats"
+                            primaryValue: payment.primaryAmount(
+                                displayBalanceType: displayBalanceType,
+                                price: price
+                            ),
+                            secondaryValue: payment.secondaryAmount(
+                                displayBalanceType: displayBalanceType,
+                                price: price
+                            ),
+                            primaryColor: payment.amountColor,
+                            secondaryColor: payment.secondaryAmountColor
                         )
                     }
                     Divider()
                     DetailRowView(label: "Status", value: payment.title)
                     Divider()
-                    DetailRowView(label: "Payment Type", value: payment.paymentKindString)
+                    DetailRowView(
+                        label: "Payment Type",
+                        value: payment.paymentKindString,
+                        systemImageName: payment.isChainPayment
+                            ? "bitcoinsign.circle" : "bolt.circle"
+                    )
                     Divider()
                     DetailRowView(label: "Date", value: payment.formattedDate)
                 }
                 .padding(.horizontal)
                 .padding(.vertical, 4)
 
             }
-            .padding(.top)
 
         }
     }
 }
 
 struct DetailRowView: View {
     let label: String
-    let value: String
+    var value: String? = nil
+    var systemImageName: String? = nil
+    var primaryValue: String? = nil
+    var secondaryValue: String? = nil
+    var primaryColor: Color? = .primary
+    var secondaryColor: Color? = .secondary
 
     var body: some View {
         HStack {
             Text(label)
-                .foregroundColor(.secondary)
-            Spacer()
-            Text(value)
                 .foregroundColor(.primary)
+            Spacer()
+            if let systemImageName = systemImageName, let value = value {
+                Image(systemName: systemImageName)
+                    .foregroundColor(.secondary)
+                Text(value)
+                    .foregroundColor(.secondary)
+            } else if let primaryValue = primaryValue, let secondaryValue = secondaryValue {
+                VStack(alignment: .trailing) {
+                    Text(primaryValue)
+                        .foregroundColor(primaryColor)
+                    Text(secondaryValue)
+                        .font(.caption)
+                        .foregroundColor(secondaryColor)
+                }
+            } else if let value = value {
+                Text(value)
+                    .foregroundColor(.secondary)
+            }
         }
     }
 }
 
 #if DEBUG
     struct PaymentDetailView_Previews: PreviewProvider {
         static var previews: some View {
-            PaymentDetailView(payment: mockPayments.first!)
+            PaymentDetailView(
+                payment: mockPayments.first!,
+                displayBalanceType: .fiatSats,
+                price: 70000.0
+            )
         }
     }
 #endif

LDKNodeMonday/View/Home/Payments/PaymentsListView.swift

@@ -85,9 +85,13 @@ struct PaymentsListView: View {
         .listStyle(.plain)
         .padding(.horizontal)
         .sheet(item: $selectedPayment) { paymentDetail in
-            PaymentDetailView(payment: paymentDetail)
-                .presentationDetents([.medium])
-                .presentationDragIndicator(.hidden)
+            PaymentDetailView(
+                payment: paymentDetail,
+                displayBalanceType: displayBalanceType,
+                price: price
+            )
+            .presentationDetents([.medium])
+            .presentationDragIndicator(.hidden)
         }
     }
 }

LDKNodeMonday/View/Home/Send/SendManualEntry.swift

@@ -64,7 +64,8 @@ struct SendManualEntry: View {
                             viewModel.address.extractPaymentInfo()
 
                         if extractedPaymentAddress != nil && viewModel.paymentAddress == nil {
-                            viewModel.amountSat = extractedAmount != 0 ? extractedAmount : viewModel.amountSat
+                            viewModel.amountSat =
+                                extractedAmount != 0 ? extractedAmount : viewModel.amountSat
                             viewModel.paymentAddress = extractedPaymentAddress
 
                             if extractedAmount != 0 {