commit 023945226d6f447c6de8fd611afeed940f5c9a02 parent 3d5f38bfb93fe0bca0078706dc3566a82ab36fd4 Author: Marc Stibane <marc@taler.net> Date: Fri, 18 Oct 2024 11:51:41 +0200 - currencyName Diffstat:
12 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift @@ -31,8 +31,6 @@ struct ManualWithdraw: View { // @State var ageMenuList: [Int] = [] // @State var selectedAge = 0 @State private var currencyInfo: CurrencyInfo = CurrencyInfo.zero(UNKNOWN) - @State private var currencyName: String = UNKNOWN - @State private var currencySymbol: String = UNKNOWN var body: some View { #if PRINT_CHANGES @@ -48,14 +46,12 @@ struct ManualWithdraw: View { let scopeInfo = exchange.scopeInfo let currency = scopeInfo.currency let currencyInfo = controller.info(for: currency, controller.currencyTicker) - let currencyName = currencyInfo.scope.currency - let currencySymbol = currencyInfo.altUnitSymbol ?? currencyName let navTitle = String(localized: "NavTitle_Withdraw (currency)", - defaultValue: "Withdraw \(currencySymbol)", + defaultValue: "Withdraw \(currencyInfo.symbol)", comment: "NavTitle: Withdraw 'currencySymbol'") let navA11y = String(localized: "NavTitle_Withdraw (currency) A11y", - defaultValue: "Withdraw \(currencyName)", + defaultValue: "Withdraw \(currencyInfo.name)", comment: "NavTitle: Withdraw 'currency'") // let agePicker = AgePicker(ageMenuList: $ageMenuList, selectedAge: $selectedAge) diff --git a/TalerWallet1/Views/Actions/Peer2peer/RequestPayment.swift b/TalerWallet1/Views/Actions/Peer2peer/RequestPayment.swift @@ -241,8 +241,6 @@ struct RequestPaymentContent: View { let currency = scopeInfo.currency amountToTransfer.setCurrency(currency) currencyInfo = controller.info(for: currency, controller.currencyTicker) - currencyName = currencyInfo.scope.currency -// currencySymbol = currencyInfo.altUnitSymbol ?? currencyInfo.specs.name } } // .task(id: amountToTransfer.value) { diff --git a/TalerWallet1/Views/Actions/Peer2peer/SendAmountV.swift b/TalerWallet1/Views/Actions/Peer2peer/SendAmountV.swift @@ -111,8 +111,6 @@ struct SendAmountContent: View { @State private var exchange: Exchange? = nil // wg. noFees @State private var currencyInfo = CurrencyInfo.zero(UNKNOWN) - @State private var currencyName = UNKNOWN - @State private var currencySymbol = UNKNOWN @State private var scopeInfo: ScopeInfo = ScopeInfo.zero() private func shortcutAction(_ shortcut: Amount) { @@ -274,8 +272,6 @@ struct SendAmountContent: View { let currency = scopeInfo.currency amountToTransfer.setCurrency(currency) currencyInfo = controller.info(for: currency, controller.currencyTicker) - currencyName = currencyInfo.scope.currency - currencySymbol = currencyInfo.altUnitSymbol ?? currencyInfo.specs.name do { amountAvailable = try await model.getMaxPeerPushDebitAmountM(scopeInfo) } catch { diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift b/TalerWallet1/Views/Balances/BalancesSectionView.swift @@ -42,8 +42,6 @@ struct BalancesSectionView { @State private var recentTransactions: [Transaction] = [] @State private var pendingTransactions: [Transaction] = [] @State private var currencyInfo = CurrencyInfo.zero(UNKNOWN) - @State private var currencyName: String = UNKNOWN - @State private var currencySymbol: String = UNKNOWN private static func className() -> String {"\(self)"} @@ -141,15 +139,12 @@ extension BalancesSectionView: View { } header: { BarGraphHeader(stack: stack.push(), scopeInfo: scopeInfo, - currencyName: $currencyName, - currencySymbol: $currencySymbol, + currencyInfo: $currencyInfo, shouldReloadBalances: $shouldReloadBalances) }.id(sectionID) .listRowSeparator(.hidden) .task(id: controller.currencyTicker) { currencyInfo = controller.info(for: currency, controller.currencyTicker) - currencyName = currencyInfo.scope.currency - currencySymbol = currencyInfo.altUnitSymbol ?? currencyName } .task(id: shouldReloadBalances + 1_000_000) { symLog.log(".task for BalancesSectionView - load recent+completed+pending") diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeSectionView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeSectionView.swift @@ -27,8 +27,6 @@ struct ExchangeSectionView: View { @State private var shouldReloadBalances: Int = 0 @State private var currencyInfo: CurrencyInfo = CurrencyInfo.zero(UNKNOWN) - @State private var currencyName: String = UNKNOWN - @State private var currencySymbol: String = UNKNOWN @State private var didDelete: Bool = false @State private var disabled: Bool = false @State private var showAlert: Bool = false @@ -78,7 +76,6 @@ struct ExchangeSectionView: View { let scopeInfo = exchange.scopeInfo let currency = scopeInfo.currency // let currencyInfo = controller.info(for: currency, controller.currencyTicker) -// let currencyName = currencyInfo.scope.currency Section { // ForEach(exchanges) { exchange in ExchangeRowView(stack: stack.push(), @@ -130,15 +127,12 @@ struct ExchangeSectionView: View { } header: { BarGraphHeader(stack: stack.push(), scopeInfo: scopeInfo, - currencyName: $currencyName, - currencySymbol: $currencySymbol, + currencyInfo: $currencyInfo, shouldReloadBalances: $shouldReloadBalances) } .task(id: controller.currencyTicker) { symLog.log("task \(didDelete ? 1 : 0)") currencyInfo = controller.info(for: currency, controller.currencyTicker) - currencyName = currencyInfo.scope.currency - currencySymbol = currencyInfo.altUnitSymbol ?? currencyName } .onDisappear() { disabled = false diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift @@ -63,7 +63,6 @@ struct P2pPayURIView: View { .task(id: controller.currencyTicker) { let currency = peerPullDebitResponse.amountRaw.currencyStr currencyInfo = controller.info(for: currency, controller.currencyTicker) -// currencyName = currencyInfo.scope.currency } NavigationLink(destination: LazyView { diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift @@ -72,7 +72,6 @@ struct P2pReceiveURIView: View { .task(id: controller.currencyTicker) { let currency = peerPushCreditResponse.amountRaw.currencyStr currencyInfo = controller.info(for: currency, controller.currencyTicker) -// currencyName = currencyInfo.scope.currency } if tosAccepted { NavigationLink(destination: LazyView { diff --git a/TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift b/TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift @@ -29,7 +29,6 @@ struct PayTemplateV: View { // @State private var insufficient = false // @State private var preparePayResult: PreparePayResult? = nil @State private var templateContract: TemplateContractDetails? = nil - @State private var currencyName = EMPTYSTRING @State private var amountIsEditable = false @State private var amountToTransfer = Amount.zero(currency: EMPTYSTRING) // Update currency when used @State private var amountShortcut = Amount.zero(currency: EMPTYSTRING) // Update currency when used @@ -185,7 +184,6 @@ struct PayTemplateV: View { .task(id: controller.currencyTicker) { let currency = amountToTransfer.currencyStr currencyInfo = controller.info(for: currency, controller.currencyTicker) -// currencyName = currencyInfo.scope.currency } .onAppear() { symLog.log("onAppear") @@ -219,7 +217,6 @@ struct PayTemplateV: View { // announce: announce) // { symLog.log("preparePayForTemplate finished") amountToTransfer = prepAmount ?? zeroAmount - currencyName = prepCurrency summary = prepSummary ?? EMPTYSTRING templateContract = contract // insufficient = result.insufficient diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentView.swift b/TalerWallet1/Views/Sheets/Payment/PaymentView.swift @@ -211,7 +211,6 @@ struct PaymentView: View { let currency = amountToTransfer.currencyStr currencyInfo = controller.info(for: currency, controller.currencyTicker) symLog.log("Info(for: \(currency)) loaded: \(currencyInfo.scope.currency)") -// currencyName = currencyInfo.scope.currency } } else { LoadingView(scopeInfo: nil, message: url.host) diff --git a/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift b/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift @@ -51,7 +51,6 @@ struct RefundURIView: View { } .task(id: controller.currencyTicker) { currencyInfo = controller.info(for: currency, controller.currencyTicker) -// currencyName = currencyInfo.scope.currency } } else { LoadingView(scopeInfo: nil, message: url.host) diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift @@ -25,7 +25,6 @@ struct WithdrawURIView: View { @AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic @State private var withdrawUriInfo: WithdrawUriInfoResponse? = nil - @State private var currencyName = EMPTYSTRING @State private var amountIsEditable = false @State private var amountToTransfer = Amount.zero(currency: EMPTYSTRING) // Update currency when used @State private var amountShortcut = Amount.zero(currency: EMPTYSTRING) // Update currency when used @@ -170,7 +169,6 @@ struct WithdrawURIView: View { .task(id: controller.currencyTicker) { let currency = amountToTransfer.currencyStr currencyInfo = controller.info(for: currency, controller.currencyTicker) - currencyName = currencyInfo.scope.currency } .onAppear() { symLog.log("onAppear") diff --git a/TalerWallet1/Views/Sheets/WithdrawExchangeV.swift b/TalerWallet1/Views/Sheets/WithdrawExchangeV.swift @@ -44,7 +44,6 @@ struct WithdrawExchangeV: View { } .task(id: controller.currencyTicker) { currencyInfo = controller.info(for: currency, controller.currencyTicker) -// currencyName = currencyInfo.scope.currency } } else { LoadingView(scopeInfo: nil, message: "No exchangeBaseUrl!")