commit db13f85d9bfcd33fa374aaae200f02f04fb1689c
parent c58005f01e12f3ca10e9d2dadecc14b8e7aa3ccd
Author: Marc Stibane <marc@taler.net>
Date: Tue, 26 Nov 2024 08:40:46 +0100
cleanup
Diffstat:
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/TalerWallet.xcodeproj/project.pbxproj b/TalerWallet.xcodeproj/project.pbxproj
@@ -1160,6 +1160,7 @@
buildActionMask = 2147483647;
files = (
4E3EAE7E2A990778009F1BE8 /* Settings.bundle in Resources */,
+ 4EE77E7D2C0280E5007C9064 /* GNU_Taler InfoPlist.xcstrings in Resources */,
4E3EAE842A990778009F1BE8 /* Assets.xcassets in Resources */,
4E3EAE7F2A990778009F1BE8 /* Atkinson-Hyperlegible-Regular-102.otf in Resources */,
4E3EAE802A990778009F1BE8 /* Atkinson-Hyperlegible-Bold-102.otf in Resources */,
@@ -1168,7 +1169,6 @@
4E3EAE9C2AA12467009F1BE8 /* Nunito-Regular.ttf in Resources */,
4E605D922AA8B407002FB9A7 /* Nunito-BlackItalic.ttf in Resources */,
4E3EAE9E2AA12467009F1BE8 /* Nunito-Bold.ttf in Resources */,
- 4EE77E7D2C0280E5007C9064 /* GNU_Taler InfoPlist.xcstrings in Resources */,
4E3EAEA42AA12582009F1BE8 /* Nunito-BoldItalic.ttf in Resources */,
4E605D902AA8B407002FB9A7 /* Nunito-Black.ttf in Resources */,
4E3EAEA22AA12582009F1BE8 /* Nunito-Italic.ttf in Resources */,
@@ -1183,11 +1183,11 @@
buildActionMask = 2147483647;
files = (
4E363CC02A24754200D7E98C /* Settings.bundle in Resources */,
+ 4EE77E7F2C0280E5007C9064 /* Taler_Wallet InfoPlist.xcstrings in Resources */,
4EB094F0298979D30043A8A1 /* Assets.xcassets in Resources */,
4E8C17202A6509BB005B2392 /* Atkinson-Hyperlegible-Regular-102.otf in Resources */,
4E8C17222A6509BB005B2392 /* Atkinson-Hyperlegible-Bold-102.otf in Resources */,
4E8C17232A6509BB005B2392 /* Atkinson-Hyperlegible-BoldItalic-102.otf in Resources */,
- 4EE77E7F2C0280E5007C9064 /* Taler_Wallet InfoPlist.xcstrings in Resources */,
4E8C17212A6509BB005B2392 /* Atkinson-Hyperlegible-Italic-102.otf in Resources */,
4E3EAE9D2AA12467009F1BE8 /* Nunito-Regular.ttf in Resources */,
4E605D932AA8B407002FB9A7 /* Nunito-BlackItalic.ttf in Resources */,
diff --git a/TalerWallet1/Views/Balances/BalancesPendingRowV.swift b/TalerWallet1/Views/Balances/BalancesPendingRowV.swift
@@ -79,7 +79,7 @@ fileprivate struct BalancesPendingRowV_Previews: PreviewProvider {
struct BindingViewContainer: View {
@State private var previewTransactions: [Transaction] = []
@State private var previewD: CurrencyInfo = CurrencyInfo.zero(DEMOCURRENCY)
- @State private var selectedBalance: Balance? = nil
+ @State private var selectedPreviewBalance: Balance? = nil
var body: some View {
let flags: [BalanceFlag] = [.incomingConfirmation]
@@ -92,7 +92,7 @@ fileprivate struct BalancesPendingRowV_Previews: PreviewProvider {
BalancesPendingRowV(//symLog: nil,
stack: CallStack("Preview"),
balance: balance,
- selectedBalance: $selectedBalance,
+ selectedBalance: $selectedPreviewBalance,
pendingTransactions: $previewTransactions,
reloadPending: {stack in })
}
diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeSectionView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeSectionView.swift
@@ -30,23 +30,6 @@ struct ExchangeSectionView: View {
@State private var purge: Bool = false
@State private var global: Bool = false
-// func amountAvailable(_ exchange: Exchange?, currency: String?) -> Amount? {
-// if let exchange {
-// for balance in balances {
-// if let baseUrl = balance.scopeInfo.url {
-// if baseUrl == exchange.exchangeBaseUrl {
-// return balance.available
-// }
-// } else if let currency {
-// if currency == balance.scopeInfo.currency {
-// return balance.available
-// }
-// }
-// }
-// }
-// return nil
-// }
-
@MainActor
private func viewDidLoad() async {
if let exc = try? await model.listExchanges(scope: balance.scopeInfo) {