[taler-taler-ios] 24/32: cleanup

[gnunet]

This is an automated email from the git hooks/post-receive script.

marc-stibane pushed a commit to branch master
in repository taler-ios.

commit b39e1adaeac143c9397bfb724dd5ba177160f511
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sat Jul 13 18:21:51 2024 +0200

    cleanup
---
 TalerWallet1/Controllers/TalerWallet1App.swift     |  2 +-
 .../Views/Transactions/TransactionDetailV.swift    | 21 +++++++++++++--------
 .../Views/Transactions/TransactionSummaryV.swift   | 22 +++++++++++-----------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/TalerWallet1/Controllers/TalerWallet1App.swift 
b/TalerWallet1/Controllers/TalerWallet1App.swift
index 3e408da..ec944f2 100644
--- a/TalerWallet1/Controllers/TalerWallet1App.swift
+++ b/TalerWallet1/Controllers/TalerWallet1App.swift
@@ -1,5 +1,5 @@
 /*
- * This file is part of GNU Taler, ©2022-23 Taler Systems S.A.
+ * This file is part of GNU Taler, ©2022-24 Taler Systems S.A.
  * See LICENSE.md
  */
 /**
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailV.swift 
b/TalerWallet1/Views/Transactions/TransactionDetailV.swift
index e374a12..e3cd1d0 100644
--- a/TalerWallet1/Views/Transactions/TransactionDetailV.swift
+++ b/TalerWallet1/Views/Transactions/TransactionDetailV.swift
@@ -1,11 +1,12 @@
-//
-//  TransactionDetailV.swift
-//  TalerWallet
-//
-//  Created by Marc Stibane on 2024-01-28.
-//  Copyright © 2024 Taler. All rights reserved.
-//
-
+/*
+ * This file is part of GNU Taler, ©2022-24 Taler Systems S.A.
+ * See LICENSE.md
+ */
+/**
+ * Overview when there's more than 1 currency/exchange
+ *
+ * @author Marc Stibane
+ */
 import SwiftUI
 
 struct TransactionDetailV: View {
@@ -18,9 +19,11 @@ struct TransactionDetailV: View {
         Section {
             if let posConfirmation = details.posConfirmation {
                 Text(posConfirmation)
+                    .talerFont(.body)
             }
 //            Text(info.summary)
             Text(info.orderId)
+                .talerFont(.body)
 //            Text(info.merchant.name)
 
             if let fulfillmentUrl = info.fulfillmentUrl {
@@ -32,12 +35,14 @@ struct TransactionDetailV: View {
                 }
             } else if let fulfillmentMessage = info.fulfillmentMessage {
                 Text(fulfillmentMessage)
+                    .talerFont(.body)
             }
             if let products = info.products {
                 ForEach(products) {product in
                     Section {
                         if let product_id = product.product_id {
                             Text(product_id)
+                                .talerFont(.body)
                         }
                     }
                 }
diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryV.swift 
b/TalerWallet1/Views/Transactions/TransactionSummaryV.swift
index b2a6695..9a5daee 100644
--- a/TalerWallet1/Views/Transactions/TransactionSummaryV.swift
+++ b/TalerWallet1/Views/Transactions/TransactionSummaryV.swift
@@ -14,12 +14,12 @@ extension Transaction {             // for Dummys
         let amount = Amount.zero(currency: dummyCurrency)
         let now = Timestamp.now()
         let common = TransactionCommon(type: .dummy,
-                                       txState: TransactionState(major: 
.pending),
-                                       amountEffective: amount,
-                                       amountRaw: amount,
-                                       transactionId: "",
-                                       timestamp: now,
-                                       txActions: [])
+                                    txState: TransactionState(major: .pending),
+                            amountEffective: amount,
+                                  amountRaw: amount,
+                              transactionId: "",
+                                  timestamp: now,
+                                  txActions: [])
         self = .dummy(DummyTransaction(common: common))
     }
 }
@@ -103,7 +103,7 @@ struct TransactionSummaryV: View {
         let a11yDate = TalerDater.accessibilityDate(date) ?? dateString
         let navTitle2 = transaction.isDone ? transaction.localizedTypePast
                                            : transaction.localizedType
-        VStack {
+        Group {
             List {
                 if developerMode {
                     if transaction.isSuspendable { if let suspendAction {
@@ -224,8 +224,8 @@ struct TransactionSummaryV: View {
         @AppStorage("minimalistic") var minimalistic: Bool = false
 
         var body: some View {
-            VStack(alignment: .leading) {  // Show Hint that User should 
Confirm on bank website
-                if !minimalistic {
+            VStack(alignment: .leading) {
+                if !minimalistic {      // show hint that the user should 
authorize on bank website
                     Text("The bank is waiting for your authorization.")
 //                        .fixedSize(horizontal: false, vertical: true)       
// wrap in scrollview
                         .multilineTextAlignment(.leading)                   // 
otherwise
@@ -256,8 +256,8 @@ struct TransactionSummaryV: View {
                 case .manual:               // "Make a wire transfer of 
\(amount) to"
                     ManualDetailsV(common: common, details: withdrawalDetails)
 
-                case .bankIntegrated:       // "Confirm now" (with bank)
-                    if !transaction.isPendingKYC {              // cannot 
confirm if KYC is needed first
+                case .bankIntegrated:       // "Authorize now" (with bank)
+                    if !transaction.isPendingKYC {              // cannot 
authorize if KYC is needed first
                         let confirmed = withdrawalDetails.confirmed ?? false
                         if !confirmed {
                             if let confirmationUrl = 
withdrawalDetails.bankConfirmationUrl {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.