taler-ios

commit 8a6ec56ac0fca133b4a1b4cd1397799e0ec6ee08
parent 9b9273933e1a6a67bbdab8b2c94886cd090fb8eb
Author: Marc Stibane <marc@taler.net>
Date:   Sun, 25 Jun 2023 09:42:44 +0200

remove dismissFirst

Diffstat:
M
TalerWallet1/Views/HelperViews/CopyShare.swift
 | 
9
++-------
M
TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
 | 
2
+-
M
TalerWallet1/Views/Transactions/ManualDetails.swift
 | 
2
+-

3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/CopyShare.swift b/TalerWallet1/Views/HelperViews/CopyShare.swift
@@ -41,12 +41,8 @@ struct ShareButton: View {
     @Environment(\.isEnabled) private var isEnabled: Bool
 
     let textToShare: String
-    let dismissFirst: Bool
 
     func shareAction() -> Void {
-        if dismissFirst {
-            dismissTop()        // cannot open another sheet from within a sheet
-        }
         symLog.log(textToShare)
         ShareSheet.shareSheet(url: textToShare)
     }
@@ -66,13 +62,12 @@ struct CopyShare: View {
     @Environment(\.isEnabled) private var isEnabled: Bool
 
     let textToCopy: String
-    let dismissFirst: Bool
 
     var body: some View {
         HStack {
             CopyButton(textToCopy: textToCopy, vertical: false)
                 .buttonStyle(TalerButtonStyle(type: .bordered))
-            ShareButton(textToShare: textToCopy, dismissFirst: dismissFirst)
+            ShareButton(textToShare: textToCopy)
                 .buttonStyle(TalerButtonStyle(type: .bordered))
         } // two buttons
     }
@@ -80,6 +75,6 @@ struct CopyShare: View {
 // MARK: -
 struct CopyShare_Previews: PreviewProvider {
     static var previews: some View {
-        CopyShare(textToCopy: "Hallö", dismissFirst: false)
+        CopyShare(textToCopy: "Hallö")
     }
 }
diff --git a/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift b/TalerWallet1/Views/HelperViews/QRCodeDetailView.swift
@@ -31,7 +31,7 @@ struct QRCodeDetailView: View {
                 Text(talerURI)
                     .padding(.bottom)
 
-                CopyShare(textToCopy: talerURI, dismissFirst: true)
+                CopyShare(textToCopy: talerURI)
                     .disabled(false)
             }
         }
diff --git a/TalerWallet1/Views/Transactions/ManualDetails.swift b/TalerWallet1/Views/Transactions/ManualDetails.swift
@@ -39,7 +39,7 @@ struct ManualDetails: View {
                 .listRowSeparator(.hidden)
             HStack {
                 Spacer()
-                ShareButton(textToShare: payto, dismissFirst: false)
+                ShareButton(textToShare: payto)
                     .accessibilityLabel("Share PayTo ULR")
                     .disabled(false)
                 Spacer()