taler-ios

commit 01cdde738f910580511e586899e6d0c151d08cfc
parent 2f9dba81a7d9300eb4b84c10e48261047ed5d1cd
Author: Marc Stibane <marc@taler.net>
Date:   Mon, 25 Nov 2024 20:58:32 +0100

get rid of P2P

Diffstat:
M
TalerWallet1/Model/Transaction.swift
 | 
2
+-
M
TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift
 | 
2
+-
M
TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
 | 
6
+++---
M
TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
 | 
4
++--
M
TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
 | 
6
+++---

5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/TalerWallet1/Model/Transaction.swift b/TalerWallet1/Model/Transaction.swift
@@ -498,7 +498,7 @@ enum RefreshReason: String, Decodable {
                                                   comment: "RefreshReason")
             case .abortDeposit:         return String(localized: "Abort Deposit",
                                                   comment: "RefreshReason")
-            case .abortPeerPushDebit:   return String(localized: "Abort P2P Send",
+            case .abortPeerPushDebit:   return String(localized: "Abort Sending",
                                                     comment: "RefreshReason")
             case .recoup:           return String(localized: "Recoup",
                                                   comment: "RefreshReason")
diff --git a/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift b/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift
@@ -9,7 +9,7 @@ import SwiftUI
 import taler_swift
 import SymLog
 
-// Called when initiating a P2P transaction: Send coins or Send Request(Invoice)
+// Called when initiating a P2P transaction: Send or Request(Invoice)
 struct P2PReadyV: View {
     private let symLog = SymLogV(0)
     let stack: CallStack
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
@@ -6,7 +6,7 @@ import SwiftUI
 import taler_swift
 import SymLog
 
-// Called when accepting a scanned P2P transaction: Receive coins or Pay Request(Invoice)
+// Called when accepting a scanned P2P transaction: Receive, or pay Request(Invoice)
 struct P2pAcceptDone: View {
     private let symLog = SymLogV(0)
     let stack: CallStack
@@ -35,8 +35,8 @@ struct P2pAcceptDone: View {
         let _ = Self._printChanges()
         let _ = symLog.vlog()       // just to get the # to compare it with .onAppear & onDisappear
 #endif
-        let navTitle = incoming ? String(localized: "Received P2P", comment: "Title, short")
-                                : String(localized: "Paid P2P", comment: "Title, short")
+        let navTitle = incoming ? String(localized: "Received", comment: "Nav Title, short")
+                                : String(localized: "Paid", comment: "Nav Title, short")
         LoadingView(scopeInfo: nil, message: "Accepting...")
             .navigationBarBackButtonHidden(true)
 //            .interactiveDismissDisabled()           // can only use "Done" button to dismiss
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
@@ -7,7 +7,7 @@ import taler_swift
 import SymLog
 
 // Called either when scanning a QR code or tapping the provided link
-// from another user's Send Request(Invoice). We show the P2P details.
+// from another user's Request(Invoice). We show the P2P details.
 struct P2pPayURIView: View {
     private let symLog = SymLogV(0)
     let stack: CallStack
@@ -24,7 +24,7 @@ struct P2pPayURIView: View {
 
     @State private var peerPullDebitResponse: PreparePeerPullDebitResponse?
 
-    let navTitle = String(localized: "Pay P2P", comment: "Nav Title")
+    let navTitle = String(localized: "Pay Request", comment: "Nav Title")
 
     @MainActor
     private func viewDidLoad() async {
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
@@ -10,7 +10,7 @@ import taler_swift
 import SymLog
 
 // Will be called either by the user scanning a QR code or tapping the provided link,
-// from another user's SendCoins. We show the P2P details - but first the ToS must be accepted.
+// from another user's Send. We show the P2P details - but first the ToS must be accepted.
 struct P2pReceiveURIView: View {
     private let symLog = SymLogV(0)
     let stack: CallStack
@@ -29,7 +29,7 @@ struct P2pReceiveURIView: View {
     @State private var peerPushCreditResponse: PreparePeerPushCreditResponse? = nil
     @State private var exchange: Exchange? = nil
 
-    let navTitle = String(localized: "P2P Receive")
+    let navTitle = String(localized: "Receive", comment: "Nav Title")
 
     @MainActor
     private func viewDidLoad() async {
@@ -101,7 +101,7 @@ struct P2pReceiveURIView: View {
                                                 transactionId: peerPushCreditResponse.transactionId,
                                                      incoming: true)
                         NavigationLink(destination: destination) {
-                            Text("Accept P2P Receive")      // SHEET_RCV_P2P_ACCEPT
+                            Text("Accept and receive")      // SHEET_RCV_P2P_ACCEPT
                         }
                         .buttonStyle(TalerButtonStyle(type: .prominent))
                         .padding(.horizontal)