From a53b24bc51005f8d96e74bcade3cbf5cbb58ae38 Mon Sep 17 00:00:00 2001 From: 0xChqrles Date: Thu, 4 Jul 2024 15:10:52 +0200 Subject: [PATCH] last fixes --- app/App/Models/Model.swift | 2 +- app/App/Navigation/Core/Home/HomeView.swift | 41 +++++++++------ .../Navigation/Core/Home/TransferRow.swift | 2 + .../Core/Onramp/OnrampStripeView.swift | 5 +- .../xcshareddata/swiftpm/Package.resolved | 51 +++++++++++++++++++ 5 files changed, 83 insertions(+), 18 deletions(-) create mode 100644 app/Vault.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/app/App/Models/Model.swift b/app/App/Models/Model.swift index d28aaeb1..d7e7a144 100644 --- a/app/App/Models/Model.swift +++ b/app/App/Models/Model.swift @@ -474,7 +474,7 @@ extension Model { self.currentTask = Task { let response = try! await withCheckedThrowingContinuation { (continuation: CheckedContinuation) in - VaultService.shared.send(GetFunkitStripeCheckoutQuote(address: self.address, amount: self.amount)) { result in + VaultService.shared.send(GetFunkitStripeCheckoutQuote(address: self.address, amount: String(self.parsedAmount))) { result in DispatchQueue.main.async { switch result { case .success(let response): diff --git a/app/App/Navigation/Core/Home/HomeView.swift b/app/App/Navigation/Core/Home/HomeView.swift index 495315fa..6434ea56 100644 --- a/app/App/Navigation/Core/Home/HomeView.swift +++ b/app/App/Navigation/Core/Home/HomeView.swift @@ -146,31 +146,40 @@ struct HomeView: View { // PENDING - VStack(spacing: 32) { - ForEach(txHistory.groupedPendingTransactions[day] ?? [], id: \.self.id) { transfer in + let pendingTransfers = txHistory.groupedPendingTransactions[day] ?? [] - TransferRow(transfer: transfer) + if !pendingTransfers.isEmpty { + VStack(spacing: 32) { + ForEach(pendingTransfers, id: \.self.id) { transfer in + + TransferRow(transfer: transfer) + } + .padding(16) + .background(.accent.opacity(0.2)) + .animatePlaceholder(isLoading: .constant(true)) } - .padding(16) - .background(.accent.opacity(0.2)) + .background(.background2) + .clipShape(RoundedRectangle(cornerRadius: 16)) } - .background(.background2) - .clipShape(RoundedRectangle(cornerRadius: 16)) // CONFIRMED - VStack(spacing: 32) { - ForEach(txHistory.groupedTransactions[day] ?? [], id: \.self.id) { transfer in + let confirmedTransfers = txHistory.groupedTransactions[day] ?? [] - TransferRow(transfer: transfer) - .onAppear { - self.txHistoryModel.onItemAppear(transfer) - } + if !confirmedTransfers.isEmpty { + VStack(spacing: 32) { + ForEach(confirmedTransfers, id: \.self.id) { transfer in + + TransferRow(transfer: transfer) + .onAppear { + self.txHistoryModel.onItemAppear(transfer) + } + } } + .padding(16) + .background(.background2) + .clipShape(RoundedRectangle(cornerRadius: 16)) } - .padding(16) - .background(.background2) - .clipShape(RoundedRectangle(cornerRadius: 16)) } .padding(.horizontal, 16) } diff --git a/app/App/Navigation/Core/Home/TransferRow.swift b/app/App/Navigation/Core/Home/TransferRow.swift index b729e5e9..65ee49e1 100644 --- a/app/App/Navigation/Core/Home/TransferRow.swift +++ b/app/App/Navigation/Core/Home/TransferRow.swift @@ -15,6 +15,8 @@ struct TransferRow: View { init(transfer: Transaction) { self.transfer = transfer + + print(transfer.to) } var body: some View { diff --git a/app/App/Navigation/Core/Onramp/OnrampStripeView.swift b/app/App/Navigation/Core/Onramp/OnrampStripeView.swift index 3caf13f4..cee59952 100644 --- a/app/App/Navigation/Core/Onramp/OnrampStripeView.swift +++ b/app/App/Navigation/Core/Onramp/OnrampStripeView.swift @@ -95,7 +95,10 @@ struct OnrampStripeView: View { } .frame(maxWidth: .infinity, maxHeight: .infinity) .onAppear { - self.model.createOnrampCheckout() + Task { + try await Task.sleep(for: .seconds(1)) + self.model.createOnrampCheckout() + } } .navigationBarItems( leading: IconButton { diff --git a/app/Vault.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app/Vault.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..768db7e4 --- /dev/null +++ b/app/Vault.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,51 @@ +{ + "originHash" : "1fbc22d98a38f7670b283d4e1502f232da4fa7b0bcb28be022908ef3d3a31380", + "pins" : [ + { + "identity" : "bigint", + "kind" : "remoteSourceControl", + "location" : "https://github.com/attaswift/BigInt.git", + "state" : { + "revision" : "0ed110f7555c34ff468e72e1686e59721f2b0da6", + "version" : "5.3.0" + } + }, + { + "identity" : "confettiswiftui", + "kind" : "remoteSourceControl", + "location" : "https://github.com/simibac/ConfettiSwiftUI.git", + "state" : { + "revision" : "f45961f97bbae6fff6e2e64546fea0189425ad92", + "version" : "1.1.0" + } + }, + { + "identity" : "cryptoswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/krzyzanowskim/CryptoSwift.git", + "state" : { + "revision" : "039f56c5d7960f277087a0be51f5eb04ed0ec073", + "version" : "1.5.1" + } + }, + { + "identity" : "phonenumberkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/marmelroy/PhoneNumberKit", + "state" : { + "revision" : "ee5d7114934e60812c9b47c333f01b67d002be2d", + "version" : "3.7.10" + } + }, + { + "identity" : "starknet.swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/software-mansion/starknet.swift", + "state" : { + "branch" : "main", + "revision" : "4e20de5a4117e951bbd3aec28413d33d4620c560" + } + } + ], + "version" : 3 +}