commit 3b2c4cf74e88e0d4d6776e8d6f2a2517bbd168a6 parent 216de171a0529cb0c0c8ae80cca2252805781de2 Author: Marc Stibane <marc@taler.net> Date: Tue, 6 May 2025 12:22:57 +0000 cleanup, background Diffstat:
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Views/Actions/Peer2peer/P2PSubjectV.swift b/TalerWallet1/Views/Actions/Peer2peer/P2PSubjectV.swift @@ -23,6 +23,7 @@ struct P2PSubjectV: View { let stack: CallStack let cash: OIMcash let scope: ScopeInfo + let available: Amount let feeLabel: (String, String)? let feeIsNotZero: Bool? // nil = no fees at all, false = no fee for this tx let outgoing: Bool @@ -182,6 +183,7 @@ struct P2PSubjectV: View { if controller.oimModeActive { OIMSubjectView(stack: stack.push(), cash: cash, + available: available, amount: $amountToTransfer, fwdButtonTapped: $sendOrRequest) .environmentObject(NamespaceWrapper(namespace)) // keep OIMviews apart diff --git a/TalerWallet1/Views/Actions/Peer2peer/RequestPayment.swift b/TalerWallet1/Views/Actions/Peer2peer/RequestPayment.swift @@ -252,6 +252,7 @@ struct RequestPaymentContent: View { let inputDestination = P2PSubjectV(stack: stack.push(), cash: cash, scope: balance.scopeInfo, + available: balance.available, feeLabel: feeLabel, feeIsNotZero: feeIsNotZero(), outgoing: false, @@ -261,6 +262,7 @@ struct RequestPaymentContent: View { let shortcutDestination = P2PSubjectV(stack: stack.push(), cash: cash, scope: balance.scopeInfo, + available: balance.available, feeLabel: nil, feeIsNotZero: feeIsNotZero(), outgoing: false, diff --git a/TalerWallet1/Views/Actions/Peer2peer/SendAmountView.swift b/TalerWallet1/Views/Actions/Peer2peer/SendAmountView.swift @@ -144,6 +144,7 @@ struct SendAmountView: View { let inputDestination = P2PSubjectV(stack: stack.push(), cash: cash, scope: balance.scopeInfo, + available: balance.available, feeLabel: (feeLabel(feeString.0), feeLabel(feeString.1)), feeIsNotZero: feeIsNotZero(), outgoing: true, @@ -153,6 +154,7 @@ struct SendAmountView: View { let shortcutDestination = P2PSubjectV(stack: stack.push(), cash: cash, scope: balance.scopeInfo, + available: balance.available, feeLabel: nil, feeIsNotZero: feeIsNotZero(), outgoing: true, diff --git a/TalerWallet1/Views/OIM/OIMSubjectView.swift b/TalerWallet1/Views/OIM/OIMSubjectView.swift @@ -13,6 +13,7 @@ import taler_swift struct OIMSubjectView: View { let stack: CallStack let cash: OIMcash + let available: Amount @Binding var amount: Amount // let decimal: Int // 0 for ¥,HUF; 2 for $,€,£; 3 for ﷼,₯ (arabic) @Binding var fwdButtonTapped: Bool @@ -21,7 +22,7 @@ struct OIMSubjectView: View { @State private var amountVal: UInt64 = 0 @State private var sending = false // user tapped on Send - @State private var appearing = false + @State private var appeared = false @State private var ignoreTapped: UInt64 = 0 @State private var selectedGoal: String? let goals = ["Buy goods in shop", "Rent", "Schooling", "Repay loan", "Medical or health issue"] @@ -53,7 +54,7 @@ struct OIMSubjectView: View { action: sendAction ) { VStack { - OIMtitleView(cash: cash, amount: amount, isSending: true, secondAmount: amount) + OIMtitleView(cash: cash, amount: available, isSending: true, secondAmount: amount) Spacer() HStack { ForEach(goals, id: \.self) { goal in @@ -61,6 +62,7 @@ struct OIMSubjectView: View { if goal == selectedGoal { Image(goal) .resizable() + .background(Color.white) .scaledToFit() // .id(goal) .matchedGeometryEffect(id: goal, in: wrapper.namespace) @@ -73,6 +75,7 @@ struct OIMSubjectView: View { } else { Image(goal) .resizable() + .background(Color.white) .scaledToFit() // .id(goal) .matchedGeometryEffect(id: goal, in: wrapper.namespace) @@ -84,8 +87,8 @@ struct OIMSubjectView: View { } } } - .opacity(appearing ? 1.0 : 0.01) - .scaleEffect(appearing ? 1.0 : 0.3) + .opacity(appeared ? 1.0 : 0.01) + .scaleEffect(appeared ? 1.0 : 0.3) Spacer() OIMlineView(stack: stack.push(), @@ -99,7 +102,7 @@ struct OIMSubjectView: View { }.task { amountVal = amount.centValue withAnimation(.basic1) { - appearing = true + appeared = true } } }