[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] branch master updated (128e3ab -> 06c6f38)
From: |
gnunet |
Subject: |
[taler-taler-ios] branch master updated (128e3ab -> 06c6f38) |
Date: |
Wed, 05 Jul 2023 14:11:42 +0200 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a change to branch master
in repository taler-ios.
from 128e3ab iOS: bump version to 0.9.3 (12)
new d1251ec Added summary for P2P in Detail View
new de01b1a Check that amount is valid
new 06c6f38 iOS: bump version to 0.9.3 (13)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
TalerWallet.xcodeproj/project.pbxproj | 4 ++--
TalerWallet1/Views/Exchange/ManualWithdraw.swift | 27 +++++++++++-----------
TalerWallet1/Views/Peer2peer/RequestPayment.swift | 2 +-
.../Views/Transactions/TransactionDetailView.swift | 9 +++++---
4 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/TalerWallet.xcodeproj/project.pbxproj
b/TalerWallet.xcodeproj/project.pbxproj
index d29993a..0f42ea1 100644
--- a/TalerWallet.xcodeproj/project.pbxproj
+++ b/TalerWallet.xcodeproj/project.pbxproj
@@ -965,7 +965,7 @@
CODE_SIGN_ENTITLEMENTS = "GNU
Taler.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Developer";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 12;
+ CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = GUDDQ9428Y;
ENABLE_PREVIEWS = YES;
@@ -1007,7 +1007,7 @@
CODE_SIGN_ENTITLEMENTS = "GNU
Taler.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Distribution";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 12;
+ CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = GUDDQ9428Y;
ENABLE_PREVIEWS = YES;
diff --git a/TalerWallet1/Views/Exchange/ManualWithdraw.swift
b/TalerWallet1/Views/Exchange/ManualWithdraw.swift
index 50b7c38..9e350ab 100644
--- a/TalerWallet1/Views/Exchange/ManualWithdraw.swift
+++ b/TalerWallet1/Views/Exchange/ManualWithdraw.swift
@@ -31,18 +31,18 @@ struct ManualWithdraw: View {
// let agePicker = AgePicker(ageMenuList: $ageMenuList, selectedAge:
$selectedAge)
ScrollViewReader { scrollView in
- VStack {
- Text("from \(exchange.exchangeBaseUrl.trimURL())")
- .font(.title3)
- CurrencyInputView(currencyField: currencyField,
- title: String(localized: "Amount to withdraw:"))
+ VStack {
+ Text("from \(exchange.exchangeBaseUrl.trimURL())")
+ .font(.title3)
+ CurrencyInputView(currencyField: currencyField,
+ title: String(localized: "Amount to
withdraw:"))
- let someCoins = SomeCoins(details: withdrawalAmountDetails)
- QuiteSomeCoins(someCoins: someCoins, shouldShowFee: true,
- currency: currency, amountEffective:
withdrawalAmountDetails?.amountEffective)
+ let someCoins = SomeCoins(details: withdrawalAmountDetails)
+ QuiteSomeCoins(someCoins: someCoins, shouldShowFee: true,
+ currency: currency, amountEffective:
withdrawalAmountDetails?.amountEffective)
- if !someCoins.invalid {
- if !someCoins.tooMany {
+ let disabled = (centsToTransfer == 0) || someCoins.invalid ||
someCoins.tooMany
+ if !disabled {
// agePicker
if let tosAccepted = withdrawalAmountDetails?.tosAccepted {
@@ -67,10 +67,9 @@ struct ManualWithdraw: View {
}.buttonStyle(TalerButtonStyle(type: .prominent))
}
}
- } // tooMany
- } // invalid
- Spacer()
- }
+ } // disabled
+ Spacer()
+ }
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal)
diff --git a/TalerWallet1/Views/Peer2peer/RequestPayment.swift
b/TalerWallet1/Views/Peer2peer/RequestPayment.swift
index db40929..f0d5085 100644
--- a/TalerWallet1/Views/Peer2peer/RequestPayment.swift
+++ b/TalerWallet1/Views/Peer2peer/RequestPayment.swift
@@ -38,7 +38,7 @@ struct RequestPayment: View {
currency: currency, amountEffective:
peerPullCheck?.amountEffective)
HStack {
- let disabled = centsToTransfer == 0
+ let disabled = (centsToTransfer == 0) || someCoins.invalid ||
someCoins.tooMany
NavigationLink(destination: LazyView {
PaymentPurpose(scopeInfo: scopeInfo,
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
index 6c35345..0c87221 100644
--- a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -197,9 +197,8 @@ struct TransactionDetailView: View {
baseURL: details.exchangeBaseUrl,
large: false)
case .payment(let paymentTransaction):
let details = paymentTransaction.details
- let info = details.info
- Text(info.summary)
- .font(.title)
+ Text(details.info.summary)
+ .font(.title2)
.lineLimit(4)
.padding(.bottom)
ThreeAmountsSheet(common: common, topTitle:
String(localized: "Sum to be paid:"),
@@ -222,6 +221,10 @@ struct TransactionDetailView: View {
baseURL: nil, large: true) //
TODO: baseURL
case .peer2peer(let p2pTransaction):
let details = p2pTransaction.details
// TODO: details
+ Text(details.info.summary)
+ .font(.title2)
+ .lineLimit(4)
+ .padding(.bottom)
// TODO: isSendCoins should show QR only while not
expired
if pending || transaction.isSendCoins {
QRCodeDetails(transaction: transaction)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (128e3ab -> 06c6f38),
gnunet <=