[taler-taler-ios] 13/30: 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 8fbf2b46759656ae4abda0ccb722c95868532f83
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sat Nov 18 16:57:27 2023 +0100

    cleanup
---
 TalerWallet1/Model/Transaction.swift | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/TalerWallet1/Model/Transaction.swift 
b/TalerWallet1/Model/Transaction.swift
index 2436d8c..3f7c69e 100644
--- a/TalerWallet1/Model/Transaction.swift
+++ b/TalerWallet1/Model/Transaction.swift
@@ -459,27 +459,23 @@ enum Transaction: Decodable, Hashable, Identifiable, 
Sendable {
         switch self {
             case .withdrawal(let withdrawalTransaction):
                 let details = withdrawalTransaction.details.withdrawalDetails
-                return details.type == .bankIntegrated // && 
details.bankConfirmationUrl != nil
-            default:
-                return false
+                guard details.bankConfirmationUrl != nil else { return false }
+                if let confirmed = details.confirmed {
+                    return details.type == .bankIntegrated && confirmed == 
false
+                }
+            default: break
         }
+        return false
     }
     var common: TransactionCommon {
-        switch self {
-            case .dummy(let dummyTransaction):
-                return dummyTransaction.common
-            case .withdrawal(let withdrawalTransaction):
-                return withdrawalTransaction.common
-            case .payment(let paymentTransaction):
-                return paymentTransaction.common
-            case .refund(let refundTransaction):
-                return refundTransaction.common
-            case .reward(let rewardTransaction):
-                return rewardTransaction.common
-            case .refresh(let refreshTransaction):
-                return refreshTransaction.common
-            case .peer2peer(let p2pTransaction):
-                return p2pTransaction.common
+        return switch self {
+            case .dummy(let dummyTransaction):           
dummyTransaction.common
+            case .withdrawal(let withdrawalTransaction): 
withdrawalTransaction.common
+            case .payment(let paymentTransaction):       
paymentTransaction.common
+            case .refund(let refundTransaction):         
refundTransaction.common
+            case .reward(let rewardTransaction):         
rewardTransaction.common
+            case .refresh(let refreshTransaction):       
refreshTransaction.common
+            case .peer2peer(let p2pTransaction):         p2pTransaction.common
         }
     }
 
@@ -505,7 +501,6 @@ enum Transaction: Decodable, Hashable, Identifiable, 
Sendable {
                 result["summary"] = p2pTransaction.details.info.summary
                 result[TALERURI] = p2pTransaction.details.talerUri ?? ""
         }
-
         return result
     }
 }

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