taler-ios

commit 0ee1405c40134c124edda6d1f2e45a478b5fa21a
parent d66b0de7bee6e4d4ee3ba9e2c678ad65d7f539d7
Author: Marc Stibane <marc@taler.net>
Date:   Mon, 24 Jul 2023 16:37:16 +0200

Move Status to top

Diffstat:
M
TalerWallet1/Views/Transactions/ThreeAmounts.swift
 | 
7
-------
M
TalerWallet1/Views/Transactions/TransactionDetailView.swift
 | 
16
+++++++++++++---

2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/TalerWallet1/Views/Transactions/ThreeAmounts.swift b/TalerWallet1/Views/Transactions/ThreeAmounts.swift
@@ -85,13 +85,6 @@ struct ThreeAmountsView: View {
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .listRowSeparator(.hidden)
             }
-            if let status {
-                HStack {
-                    Spacer()
-                    Text("Status: \(status)")
-                        .font(.title2)
-                }.padding()
-            }
         }
     }
 }
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -67,7 +67,16 @@ struct TransactionDetailView: View {
                 } // Suspend + Resume buttons
                 Text(dateString)
                     .font(.title2)
-//                .listRowSeparator(.hidden)
+                    .listRowSeparator(.hidden)
+                HStack {
+                    Text(verbatim: "|")   // only reason for this leading-aligned text is to get a nice full length listRowSeparator
+                        .font(.title2)
+                        .accessibilityHidden(true)
+                        .foregroundColor(Color.clear)
+                    Spacer()
+                    Text("Status: \(common.txState.major.localizedState)")
+                        .font(.title2)
+                }    .listRowSeparator(.automatic)
                 SwitchCase(transaction: $transaction)
 
                 if transaction.isAbortable { if let abortAction {
@@ -180,9 +189,10 @@ struct TransactionDetailView: View {
                                     if !confirmed {
                                         if let confirmationUrl = withdrawalDetails.bankConfirmationUrl {
                                             if let destination = URL(string: confirmationUrl) {
-                                                VStack {  // Show Hint that User should Confirm on bank website
+                                                VStack(alignment: .leading) {  // Show Hint that User should Confirm on bank website
                                                     Text("Waiting for bank confirmation")
-                                                        .multilineTextAlignment(.leading)
+                                                        .fixedSize(horizontal: false, vertical: true)       // wrap in scrollview
+                                                        .multilineTextAlignment(.leading)                   // otherwise
                                                         .listRowSeparator(.hidden)
                                                     Link("Confirm with bank", destination: destination)
                                                         .buttonStyle(TalerButtonStyle(type: .prominent, narrow: false, aligned: .center))