commit 265b8af7c94f66678dfc15338bb46aaf9d00185a parent a26dfcacc9bc273df3c0da1b84aee4dc2daaa7c1 Author: Marc Stibane <marc@taler.net> Date: Fri, 10 Jul 2026 09:53:00 +0200 cleanup Diffstat:
6 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/TalerWallet1/Model/Model+Exchange.swift b/TalerWallet1/Model/Model+Exchange.swift @@ -30,11 +30,11 @@ enum ExchangeUpdateStatus: String, Codable { case initial case initialUpdate = "initial-update" case suspended - case failed +// case failed case outdatedUpdate = "outdated-update" case ready case readyUpdate = "ready-update" - case unavailable + case unavailable // even if wallet-core doesn't support this, we need it for L10n case unavailableUpdate = "unavailable-update" var localized: String { @@ -42,7 +42,7 @@ enum ExchangeUpdateStatus: String, Codable { case .initial: String(localized: "Exchange_status_initial", defaultValue: "Initial") case .initialUpdate: String(localized: "Exchange_status_initial_update", defaultValue: "Initial (… updating …)") case .suspended: String(localized: "Exchange_status_suspended", defaultValue: "Suspended") - case .failed: String(localized: "Exchange_status_failed", defaultValue: "Failed") +// case .failed: String(localized: "Exchange_status_failed", defaultValue: "Failed") case .outdatedUpdate: String(localized: "Exchange_status_outdated_update", defaultValue: "Outdated (… updating …)") case .ready: String(localized: "Exchange_status_ready", defaultValue: "Ready") case .readyUpdate: String(localized: "Exchange_status_ready_update", defaultValue: "Ready (… updating …)") diff --git a/TalerWallet1/Model/Model+P2P.swift b/TalerWallet1/Model/Model+P2P.swift @@ -84,7 +84,7 @@ struct InitiatePeerPushDebitResponse: Codable { let mergePriv: String let pursePub: String let exchangeBaseUrl: String - let talerUri: String? +// let talerUri: String? let transactionId: String } fileprivate struct InitiatePeerPushDebit: WalletBackendFormattedRequest { diff --git a/TalerWallet1/Resources/Assets.xcassets/taler-logo-qr.imageset/taler-logo-qr.svg b/TalerWallet1/Resources/Assets.xcassets/taler-logo-qr.imageset/taler-logo-qr.svg @@ -13,16 +13,26 @@ id="g3" transform="translate(-1,-1.1)"> <path - d="m 86.7,1.1 c 15.6,0 29,9.4 36,23.2 h -5.9 A 35.1,35.1 0 0 0 86.7,6.5 C 67,6.5 51,23.6 51,44.7 c 0,10.4 3.8,19.7 10,26.6 a 31.4,31.4 0 0 1 -4.2,3 A 45.2,45.2 0 0 1 46,44.7 C 46,20.7 64.2,1.1 86.7,1.1 Z m 35.8,64.3 a 40.4,40.4 0 0 1 -39,22.8 c 3,-1.5 6,-3.5 8.6,-5.7 a 35.6,35.6 0 0 0 24.6,-17.1 z" + d="m86.7,1.1 c15.6,0,29 9.4 36,23.2 h-5.9 a35.1,35.1 0 0 0 -30.1,-17.8 c-19.7,0 -35.7,17.1 -35.7,38.2 c0,10.4 3.8,19.7 10,26.6 a31.4,31.4 0 0 1 -4.2,3 a45.2,45.2 0 0 1 -10.8,-29.6 c 0,-24 18.2,-43.6 40.7,-43.6z + m35.8,64.3 a40.4,40.4 0 0 1 -39,22.8 c3,-1.5 6,-3.5 8.6,-5.7 a35.6,35.6 0 0 0 24.6,-17.1z" id="path1" /> <path - d="m 64.2,1.1 3.1,0.1 C 64.3,2.8 61.4,4.7 58.8,7 A 37.5,37.5 0 0 0 28.6,44.7 c 0,14.3 7.3,26.7 18,33.3 a 29.6,29.6 0 0 1 -8.5,0.2 c -9,-8 -14.6,-20 -14.6,-33.5 0,-24 18.2,-43.6 40.7,-43.6 z m 5.4,81.4 A 35.6,35.6 0 0 0 94.2,65.4 h 5.9 a 40.4,40.4 0 0 1 -39,22.8 c 3,-1.5 5.9,-3.5 8.5,-5.7 z M 94.4,24.3 A 37,37 0 0 0 81.8,11.5 29.6,29.6 0 0 1 90.3,11.3 c 4,3.6 7.4,8 9.9,13 z" + d="m64.2,1.1l3.1,0.1c-3,1.6,-5.9,3.5,-8.5,5.8a37.5,37.5,0,0,0,-30.2,37.7c0,14.3,7.3,26.7,18,33.3a29.6,29.6,0,0,1,-8.5,0.2c-9,-8,-14.6,-20,-14.6,-33.5c0,-24,18.2,-43.6,40.7,-43.6z + m5.4,81.4a35.6,35.6,0,0,0,24.6,-17.1h5.9a40.4,40.4,0,0,1,-39,22.8c3,-1.5,5.9,-3.5,8.5,-5.7z + m24.8,-58.2a37,37,0,0,0,-12.6,-12.8a29.6,29.6,0,0,1,8.5,-0.2c4,3.6,7.4,8,9.9,13z" id="path2" /> <path - d="m 41.8,1.1 c 1,0 2,0 3.1,0.2 -3,1.5 -5.9,3.4 -8.5,5.6 A 37.5,37.5 0 0 0 6.1,44.7 c 0,21.1 16,38.3 35.7,38.3 12.6,0 23.6,-7 30,-17.6 h 5.8 a 40.4,40.4 0 0 1 -35.8,23 C 19.3,88.4 1,68.8 1,44.7 1,20.7 19.2,1.1 41.7,1.1 Z m 30.1,23.2 a 38.1,38.1 0 0 0 -4.5,-6.1 c 1.3,-1.2 2.7,-2.2 4.3,-3 2.3,2.7 4.4,5.8 6,9.1 z" + d="m41.8,1.1c1,0,2,0,3.1,0.2c-3,1.5,-5.9,3.4,-8.5,5.6a37.5,37.5,0,0,0,-30.3,37.8c0,21.1,16,38.3,35.7,38.3c12.6,0,23.6,-7,30,-17.6h5.8a40.4,40.4,0,0,1,-35.8,23c-22.5,0,-40.8,-19.6,-40.8,-43.7c0,-24,18.2,-43.6,40.7,-43.6z + m30.1,23.2a38.1,38.1,0,0,0,-4.5,-6.1c1.3,-1.2,2.7,-2.2,4.3,-3c2.3,2.7,4.4,5.8,6,9.1z" id="path3" /> </g> <path - d="m 75.1,33.3 h 9.2 v -5 H 60.9 v 5 H 70 v 26 h 5.1 z m 16.5,18.5 h 13.7 l 3,7.4 h 5.3 L 100.9,28 H 96.2 L 83.5,59.2 h 5.2 z m 11.8,-4.9 h -9.9 l 5,-12.4 z m 19.4,-18.6 h -4.6 v 31 h 20.6 v -5 h -16 z m 42.7,0 H 144 v 31 h 21.6 v -5 H 149 V 46 h 14.5 V 41.1 H 149 v -8 h 16.4 z m 24.7,10.1 c 0,1.6 -0.5,2.8 -1.6,3.8 -1.1,1 -2.6,1.4 -4.4,1.4 h -7.4 V 33.2 h 7.4 c 1.9,0 3.4,0.4 4.4,1.3 1,0.9 1.6,2.2 1.6,3.9 z m 6,20.8 -7.7,-11.7 c 1,-0.3 1.9,-0.7 2.7,-1.3 a 8.8,8.8 0 0 0 3.6,-4.6 c 0.4,-1 0.5,-2.2 0.5,-3.5 0,-1.5 -0.2,-2.9 -0.7,-4.1 a 8.4,8.4 0 0 0 -2.1,-3.1 c -1,-0.8 -2,-1.5 -3.4,-2 -1.3,-0.4 -2.8,-0.6 -4.5,-0.6 h -12.9 v 31 h 5 v -11 h 6.5 l 7,10.8 z" + d="m75.1,33.3h9.2v-5h-23.4v5h9.1v26h5.1z + m16.5,18.5h13.7l3,7.4h5.3l-12.7,-31.2h-4.7l-12.7,31.2h5.2z + m11.8,-4.9h-9.9l5,-12.4z + m19.4,-18.6h-4.6v31h20.6v-5h-16z + m42.7,0h-21.5v31h21.6v-5h-16.6v-8.3h14.5v-4.9h-14.5v-8h16.4z + m24.7,10.1c0,1.6,-0.5,2.8,-1.6,3.8c-1.1,1,-2.6,1.4,-4.4,1.4h-7.4v-10.4h7.4c1.9,0,3.4,0.4,4.4,1.3c1,0.9,1.6,2.2,1.6,3.9z + m6,20.8l-7.7,-11.7c1,-0.3,1.9,-0.7,2.7,-1.3a8.8,8.8,0,0,0,3.6,-4.6c0.4,-1,0.5,-2.2,0.5,-3.5c0,-1.5,-0.2,-2.9,-0.7,-4.1a8.4,8.4,0,0,0,-2.1,-3.1c-1,-0.8,-2,-1.5,-3.4,-2c-1.3,-0.4,-2.8,-0.6,-4.5,-0.6h-12.9v31h5v-11h6.5l7,10.8z" id="path4" /> </svg> diff --git a/TalerWallet1/Views/Settings/BackupView.swift b/TalerWallet1/Views/Settings/BackupView.swift @@ -122,7 +122,7 @@ struct BackupView: View { Spacer() } .background { - Color.primary.opacity(isSelected ? 0.12 : 0.001) + Color.primary.opacity(isSelected ? 0.12 : INVISIBLE) } .onTapGesture { withAnimation { selectedBackup = file } diff --git a/TalerWallet1/Views/Sheets/Payment/ChoicesView.swift b/TalerWallet1/Views/Sheets/Payment/ChoicesView.swift @@ -67,7 +67,7 @@ struct ChoicesView: View, Sendable { amount: contractChoice.amount) .foregroundColor(isPaymentPossible ? .primary : .secondary ) } .overlay { - Color.primary.opacity(0.001) // Color.clear doesn't accept taps! + Color.primary.opacity(INVISIBLE) // Color.clear doesn't accept taps! .contentShape(.rect) .onTapGesture { if isPaymentPossible { diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryList.swift b/TalerWallet1/Views/Transactions/TransactionSummaryList.swift @@ -179,7 +179,6 @@ struct PaymentTransactionView: View { let selectionDetail: ChoiceSelectionDetail = choice.0 // let contractChoice: ContractChoice = choice.1 -// if selectionDetail.status == .paymentPossible { PaymentView2(stack: stack.push(), // TODO: details.info.merchant.name paid: false, raw: selectionDetail.amountRaw, @@ -189,7 +188,6 @@ struct PaymentTransactionView: View { summary: summary(details.info), products: details.info?.products ?? [], balanceDetails: selectionDetail.balanceDetails) -// } } } } @@ -277,12 +275,10 @@ struct TransactionSummaryList: View { if let url { controller.removeURL(url) } -// paymentDone = true } else { if let url { controller.removeURL(url) // TODO: pending might fail - in which case we might want to try again } -// paymentPending = true } } }
