[PWN-9260] [WIP] Withdrawal

Packages/KeyAppKit/Sources/BankTransfer/Models/WithdrawProvider.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+//Can't come up with a good name
+public protocol WithdrawalInfoType {
+    var IBAN: String? { get }
+    var BIC: String? { get }
+    var receiver: String { get }
+}
+
+public protocol WithdrawProvider {
+    associatedtype WithdrawalInfo: WithdrawalInfoType
+
+    func withdrawalInfo() async throws -> WithdrawalInfo
+    func save(IBAN: String, BIC: String, receiver: String) async throws
+}

Packages/KeyAppKit/Sources/BankTransfer/Striga/Mock/MockStrigaLocalProvider.swift

@@ -88,6 +88,14 @@ public actor MockStrigaLocalProvider: StrigaLocalProvider {
         fatalError()
     }
 
+    public func getCachedWithdrawalInfo() async -> StrigaWithdrawalInfo? {
+        fatalError()
+    }
+
+    public func save(withdrawalInfo: StrigaWithdrawalInfo) async throws {
+        fatalError()
+    }
+
     public func clear() async {
         self.cachedRegistrationData = nil
         self.useCase = .unregisteredUser

Packages/KeyAppKit/Sources/BankTransfer/Striga/Models/StrigaWithdrawalInfo.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+public struct StrigaWithdrawalInfo: WithdrawalInfoType, Codable {
+    public var IBAN: String?
+    public var BIC: String?
+    public var receiver: String
+
+    public init(IBAN: String? = nil, BIC: String? = nil, receiver: String) {
+        self.IBAN = IBAN
+        self.BIC = BIC
+        self.receiver = receiver
+    }
+}

Packages/KeyAppKit/Sources/BankTransfer/Striga/Repository/DataProviders/StrigaLocalProvider.swift

@@ -10,6 +10,9 @@ public protocol StrigaLocalProvider {
     func getWhitelistedUserDestinations() async throws -> [StrigaWhitelistAddressResponse]
     func save(whitelisted: [StrigaWhitelistAddressResponse]) async throws
 
+    func getCachedWithdrawalInfo() async -> StrigaWithdrawalInfo?
+    func save(withdrawalInfo: StrigaWithdrawalInfo) async throws
+
     func clear() async
 }
 
@@ -39,6 +42,14 @@ public actor StrigaLocalProviderImpl {
 
 extension StrigaLocalProviderImpl: StrigaLocalProvider {
 
+    public func getCachedWithdrawalInfo() async -> StrigaWithdrawalInfo? {
+        return get(from: cacheFileFor(.withdrawalInfo))
+    }
+
+    public func save(withdrawalInfo: StrigaWithdrawalInfo) async throws {
+        try await save(model: withdrawalInfo, in: cacheFileFor(.withdrawalInfo))
+    }
+
     public func getCachedRegistrationData() -> StrigaUserDetailsResponse? {
         return get(from: cacheFileFor(.registration))
     }
@@ -88,6 +99,8 @@ extension StrigaLocalProviderImpl: StrigaLocalProvider {
         case registration
         case account
         case whitelisted
+        case withdrawalInfo
+
     }
 
     private func cacheFileFor(_ name: CacheFileName) -> URL {

Packages/KeyAppKit/Sources/BankTransfer/Striga/Repository/StrigaBankTransferUserDataRepository.swift

@@ -412,3 +412,23 @@ private extension UserWallet {
         self.accounts = UserAccounts(eur: eur, usdc: usdc)
     }
 }
+
+extension StrigaBankTransferUserDataRepository: WithdrawProvider {
+    public typealias WithdrawalInfo = StrigaWithdrawalInfo
+
+    public func withdrawalInfo() async throws -> WithdrawalInfo {
+        await localProvider.getCachedWithdrawalInfo() ??
+        /// GetAccountStatement here
+        WithdrawalInfo(IBAN: "IBAN", BIC: "BIC", receiver: "Receiver")
+    }
+
+    public func save(IBAN: String, BIC: String, receiver: String) async throws {
+        try await localProvider.save(
+            withdrawalInfo: .init(
+                IBAN: IBAN,
+                BIC: BIC,
+                receiver: receiver
+            )
+        )
+    }
+}

p2p_wallet/Injection/Resolver+registerAllServices.swift

@@ -424,6 +424,68 @@ extension Resolver: ResolverRegistering {
         }
         .scope(.session)
 
+        register {
+            StrigaBankTransferUserDataRepository(
+                localProvider: GlobalAppState.shared.strigaMockingEnabled ?
+                    MockStrigaLocalProvider(
+                        useCase: .unregisteredUser,
+                        hasCachedInput: true
+                    ) :
+                    StrigaLocalProviderImpl(),
+                remoteProvider: GlobalAppState.shared.strigaMockingEnabled ?
+                    MockStrigaRemoteProvider(
+                        useCase: .unregisteredUser,
+                        mockUserId: "user-id",
+                        mockKYCToken: "kyc-token"
+                    ) :
+                    StrigaRemoteProviderImpl(
+                        baseURL: GlobalAppState.shared.strigaEndpoint,
+                        solanaKeyPair: Resolver.resolve(UserWalletManager.self).wallet?.account
+                    ),
+                metadataProvider: GlobalAppState.shared.strigaMockingEnabled ?
+                    MockStrigaMetadataProvider(
+                        useCase: .unregisteredUser,
+                        mockUserId: "user-id"
+                    ) :
+                    Resolver.resolve(StrigaMetadataProvider.self),
+                commonInfoProvider: CommonInfoLocalProviderImpl(),
+                solanaKeyPair: Resolver.resolve(UserWalletManager.self).wallet?.account
+            )
+        }
+        .implements(BankTransferUserDataRepository.self)
+        .scope(.session)
+
+        register {
+            StrigaBankTransferUserDataRepository(
+                localProvider: GlobalAppState.shared.strigaMockingEnabled ?
+                    MockStrigaLocalProvider(
+                        useCase: .unregisteredUser,
+                        hasCachedInput: true
+                    ) :
+                    StrigaLocalProviderImpl(),
+                remoteProvider: GlobalAppState.shared.strigaMockingEnabled ?
+                    MockStrigaRemoteProvider(
+                        useCase: .unregisteredUser,
+                        mockUserId: "user-id",
+                        mockKYCToken: "kyc-token"
+                    ) :
+                    StrigaRemoteProviderImpl(
+                        baseURL: GlobalAppState.shared.strigaEndpoint,
+                        solanaKeyPair: Resolver.resolve(UserWalletManager.self).wallet?.account
+                    ),
+                metadataProvider: GlobalAppState.shared.strigaMockingEnabled ?
+                    MockStrigaMetadataProvider(
+                        useCase: .unregisteredUser,
+                        mockUserId: "user-id"
+                    ) :
+                    Resolver.resolve(StrigaMetadataProvider.self),
+                commonInfoProvider: CommonInfoLocalProviderImpl(),
+                solanaKeyPair: Resolver.resolve(UserWalletManager.self).wallet?.account
+            )
+        }
+        .implements((any WithdrawProvider).self)
+        .scope(.session)
+
         register { RelayServiceImpl(
             contextManager: resolve(),
             orcaSwap: resolve(),
@@ -611,32 +673,7 @@ extension Resolver: ResolverRegistering {
 
         register {
             BankTransferServiceImpl<StrigaBankTransferUserDataRepository>(
-                repository: StrigaBankTransferUserDataRepository(
-                    localProvider: GlobalAppState.shared.strigaMockingEnabled ?
-                        MockStrigaLocalProvider(
-                            useCase: .unregisteredUser,
-                            hasCachedInput: true
-                        ) :
-                        StrigaLocalProviderImpl(),
-                    remoteProvider: GlobalAppState.shared.strigaMockingEnabled ?
-                        MockStrigaRemoteProvider(
-                            useCase: .unregisteredUser,
-                            mockUserId: "user-id",
-                            mockKYCToken: "kyc-token"
-                        ) :
-                        StrigaRemoteProviderImpl(
-                            baseURL: GlobalAppState.shared.strigaEndpoint,
-                            solanaKeyPair: Resolver.resolve(UserWalletManager.self).wallet?.account
-                        ),
-                    metadataProvider: GlobalAppState.shared.strigaMockingEnabled ?
-                        MockStrigaMetadataProvider(
-                            useCase: .unregisteredUser,
-                            mockUserId: "user-id"
-                        ) :
-                        Resolver.resolve(StrigaMetadataProvider.self),
-                    commonInfoProvider: CommonInfoLocalProviderImpl(),
-                    solanaKeyPair: Resolver.resolve(UserWalletManager.self).wallet?.account
-                )
+                repository: resolve()
             )
         }
         .implements((any BankTransferService).self)

p2p_wallet/Scenes/Main/BankTransfer/Claim/StrigaClaimTransaction.swift

@@ -50,3 +50,42 @@ struct StrigaClaimTransaction: StrigaClaimTransactionType {
         return .fakeTransactionSignature(id: UUID().uuidString)
     }
 }
+
+protocol StrigaWithdrawTransactionType {
+    var IBAN: String { get }
+    var BIC: String { get }
+    var feeAmount: FeeAmount { get }
+    var amount: Double { get }
+}
+
+/// Default implemetation of `StrigaClaimTransactionType`
+struct StrigaWithdrawTransaction: StrigaWithdrawTransactionType {
+
+    // MARK: - Properties
+    var IBAN: String
+
+    var BIC: String
+
+    var amount: Double
+
+    let token: Token = .usdc
+    let feeAmount: FeeAmount
+    let fromAddress: String
+    let receivingAddress: String
+
+    var mainDescription: String {
+        ""
+    }
+
+    // MARK: - Methods
+
+    func createRequest() async throws -> String {
+        // get transaction from proxy api
+
+        // sign transaction
+
+        // TODO: - send to blockchain
+        try? await Task.sleep(seconds: 1)
+        return .fakeTransactionSignature(id: UUID().uuidString)
+    }
+}

p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/FirstStep/StrigaRegistrationFirstStepView.swift

@@ -3,7 +3,7 @@ import KeyAppUI
 import CountriesAPI
 
 fileprivate typealias TextField = StrigaRegistrationTextField
-fileprivate typealias Cell = StrigaRegistrationCell
+fileprivate typealias Cell = StrigaFormCell
 fileprivate typealias DetailedButton = StrigaRegistrationDetailedButton
 
 struct StrigaRegistrationFirstStepView: View {

p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/FirstStep/StrigaRegistrationFirstStepViewModel.swift

@@ -40,7 +40,7 @@ final class StrigaRegistrationFirstStepViewModel: BaseViewModel, ObservableObjec
     let choosePhoneCountryCode = PassthroughSubject<Country?, Never>()
     let back = PassthroughSubject<Void, Never>()
 
-    var fieldsStatuses = [StrigaRegistrationField: StrigaRegistrationTextFieldStatus]()
+    var fieldsStatuses = [StrigaRegistrationField: StrigaFormTextFieldStatus]()
 
     @Published var selectedCountryOfBirth: Country?
     @Published private var dateOfBirthModel: StrigaUserDetailsResponse.DateOfBirth?

p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/SecondStep/StrigaRegistrationSecondStepView.swift

@@ -2,7 +2,7 @@ import SwiftUI
 import KeyAppUI
 
 fileprivate typealias TextField = StrigaRegistrationTextField
-fileprivate typealias Cell = StrigaRegistrationCell
+fileprivate typealias Cell = StrigaFormCell
 fileprivate typealias DetailedButton = StrigaRegistrationDetailedButton
 
 struct StrigaRegistrationSecondStepView: View {

p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/SecondStep/StrigaRegistrationSecondStepViewModel.swift

@@ -41,7 +41,7 @@ final class StrigaRegistrationSecondStepViewModel: BaseViewModel, ObservableObje
     let chooseCountry = PassthroughSubject<Country?, Never>()
     let openHardError = PassthroughSubject<Void, Never>()
 
-    var fieldsStatuses = [StrigaRegistrationField: StrigaRegistrationTextFieldStatus]()
+    var fieldsStatuses = [StrigaRegistrationField: StrigaFormTextFieldStatus]()
 
     @Published var selectedCountry: Country?
     @Published var selectedIndustry: Industry?

p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/Subviews/StrigaRegistrationTextField.swift

@@ -1,25 +1,25 @@
 import SwiftUI
 import KeyAppUI
 
-struct StrigaRegistrationTextField: View {
+struct StrigaRegistrationTextField<TextFieldType: Identifiable & Hashable>: View {
 
-    let field: StrigaRegistrationField
+    let field: TextFieldType
     let placeholder: String
     let isEnabled: Bool
     let onSubmit: () -> Void
     let submitLabel: SubmitLabel
 
     @Binding var text: String
-    @Binding var focus: StrigaRegistrationField?
+    @Binding var focus: TextFieldType?
 
-    @FocusState private var isFocused: StrigaRegistrationField?
+    @FocusState private var isFocused: TextFieldType?
 
     init(
-        field: StrigaRegistrationField,
+        field: TextFieldType,
         placeholder: String,
         text: Binding<String>,
         isEnabled: Bool = true,
-        focus: Binding<StrigaRegistrationField?>,
+        focus: Binding<TextFieldType?>,
         onSubmit: @escaping () -> Void,
         submitLabel: SubmitLabel
     ) {
@@ -58,17 +58,17 @@ struct StrigaRegistrationTextField: View {
 struct StrigaRegistrationTextField_Previews: PreviewProvider {
     static var previews: some View {
         VStack {
-            StrigaRegistrationTextField(
-                field: .email,
+            StrigaRegistrationTextField<StrigaRegistrationField>(
+                field: StrigaRegistrationField.email,
                 placeholder: "Enter email",
                 text: .constant(""),
                 focus: .constant(nil),
                 onSubmit: { },
                 submitLabel: .next
             )
 
-            StrigaRegistrationTextField(
-                field: .phoneNumber,
+            StrigaRegistrationTextField<StrigaRegistrationField>(
+                field: StrigaRegistrationField.phoneNumber,
                 placeholder: "Enter phone",
                 text: .constant(""),
                 focus: .constant(nil),

p2p_wallet/Scenes/Main/BankTransfer/StrigaRegistration/Subviews/StringRegistrationCell.swift

@@ -1,19 +1,19 @@
 import SwiftUI
 import KeyAppUI
 
-enum StrigaRegistrationTextFieldStatus: Equatable {
+enum StrigaFormTextFieldStatus: Equatable {
     case valid
     case invalid(error: String)
 }
 
-struct StrigaRegistrationCell<Content: View>: View {
+struct StrigaFormCell<Content: View>: View {
     let title: String
-    let status: StrigaRegistrationTextFieldStatus
+    let status: StrigaFormTextFieldStatus
     @ViewBuilder private var content: () -> Content
 
     init(
         title: String,
-        status: StrigaRegistrationTextFieldStatus? = .valid,
+        status: StrigaFormTextFieldStatus? = .valid,
         @ViewBuilder content: @escaping () -> Content
     ) {
         self.title = title