Decouple Transfer from FiatConnect and auto-enable asset on buy

Features/FiatConnect/Package.swift

@@ -38,6 +38,7 @@ let package = Package(
                 "Store",
                 "PrimitivesComponents",
                 .product(name: "FiatService", package: "FeatureServices"),
+                .product(name: "BalanceService", package: "FeatureServices"),
             ],
             path: "Sources"
         ),
@@ -47,6 +48,7 @@ let package = Package(
                 "FiatConnect",
                 .product(name: "PrimitivesTestKit", package: "Primitives"),
                 .product(name: "FiatServiceTestKit", package: "FeatureServices"),
+                .product(name: "BalanceServiceTestKit", package: "FeatureServices"),
             ],
             path: "Tests"
         ),

Features/FiatConnect/Sources/ViewModels/FiatSceneViewModel.swift

@@ -12,6 +12,7 @@
 import Validators
 import BigInt
 import FiatService
+import BalanceService
 
 @MainActor
 @Observable
@@ -43,15 +44,18 @@
         fiatService: FiatService,
         currencyFormatter: CurrencyFormatter = CurrencyFormatter(currencyCode: Currency.usd.rawValue),
         assetAddress: AssetAddress,
-        walletId: WalletId,
+        wallet: Wallet,
+        assetsEnabler: any AssetsEnabler,
         type: FiatQuoteType = .buy,
         amount: Int? = nil
     ) {
         self.fiatService = fiatService
         self.currencyFormatter = currencyFormatter
         self.assetAddress = assetAddress
-        self.walletId = walletId
+        self.wallet = wallet
+        self.assetsEnabler = assetsEnabler
         self.type = type
+        let walletId = wallet.walletId
         self.assetQuery = ObservableQuery(AssetRequest(walletId: walletId, assetId: assetAddress.asset.id), initialValue: .with(asset: assetAddress.asset))
 
         let buyOperation = BuyOperation(
@@ -191,6 +195,7 @@
                 }
 
                 urlState = .data(())
+                Task { await enableAsset() }
                 await UIApplication.shared.open(url, options: [:])
             } catch {
                 urlState = .error(error)
@@ -239,6 +244,14 @@
 // MARK: - Private
 
 extension FiatSceneViewModel {
+    private func enableAsset() async {
+        do {
+            try await assetsEnabler.enableAssets(wallet: wallet, assetIds: [asset.id], enabled: true)
+        } catch {
+            debugLog("FiatSceneViewModel enableAsset error: \(error)")
+        }
+    }
+
     private var balanceModel: BalanceViewModel {
         BalanceViewModel(asset: asset, balance: assetData.balance, formatter: valueFormatter)
     }

Features/FiatConnect/Tests/FiatSceneViewModelTests.swift

@@ -8,6 +8,7 @@ import Formatters
 import FiatService
 import FiatServiceTestKit
 import BigInt
+import BalanceServiceTestKit
 
 @testable import FiatConnect
 
@@ -17,13 +18,14 @@ final class FiatSceneViewModelTests {
         fiatService: FiatService = .mock(),
         currencyFormatter: CurrencyFormatter = .init(locale: Locale.US, currencyCode: Currency.usd.rawValue),
         assetAddress: AssetAddress = .mock(),
-        walletId: WalletId = .mock()
+        wallet: Wallet = .mock()
     ) -> FiatSceneViewModel {
         FiatSceneViewModel(
             fiatService: fiatService,
             currencyFormatter: currencyFormatter,
             assetAddress: assetAddress,
-            walletId: walletId
+            wallet: wallet,
+            assetsEnabler: .mock()
         )
     }
 

Features/Transfer/Package.swift

@@ -34,7 +34,6 @@ let package = Package(
         .package(name: "Stake", path: "../Stake"),
         .package(name: "WalletConnector", path: "../WalletConnector"),
         .package(name: "InfoSheet", path: "../InfoSheet"),
-        .package(name: "FiatConnect", path: "../FiatConnect"),
         .package(name: "Swap", path: "../Swap"),
         .package(name: "Perpetuals", path: "../Perpetuals"),
         .package(name: "EventPresenterService", path: "../EventPresenterService"),
@@ -63,7 +62,6 @@ let package = Package(
                 "Stake",
                 "WalletConnector",
                 "InfoSheet",
-                "FiatConnect",
                 "Swap",
                 "Perpetuals",
                 "EventPresenterService",

Features/Transfer/Sources/Scenes/AmountScene.swift

@@ -8,16 +8,16 @@ import SwiftUI
 import struct Stake.ValidatorViewModel
 import struct Stake.ValidatorView
 
-struct AmountScene: View {
+public struct AmountScene: View {
     @FocusState private var focusedField: Bool
 
     private var model: AmountSceneViewModel
 
-    init(model: AmountSceneViewModel) {
+    public init(model: AmountSceneViewModel) {
         self.model = model
     }
 
-    var body: some View {
+    public var body: some View {
         @Bindable var model = model
         List {
             CurrencyInputValidationView(

Features/Transfer/Sources/Scenes/ConfirmTransferScene.swift

@@ -4,18 +4,15 @@ import SwiftUI
 import Components
 import Style
 import Localization
-import InfoSheet
 import PrimitivesComponents
-import FiatConnect
 import Swap
-import Preferences
 import Primitives
 
 public struct ConfirmTransferScene: View {
-    @State private var model: ConfirmTransferSceneViewModel
+    @Bindable var model: ConfirmTransferSceneViewModel
 
     public init(model: ConfirmTransferSceneViewModel) {
-        _model = State(initialValue: model)
+        self.model = model
     }
 
     public var body: some View {
@@ -36,56 +33,8 @@ public struct ConfirmTransferScene: View {
         )
         .taskOnce { model.fetch() }
         .navigationTitle(model.title)
-        // TODO: - move to navigation view
         .navigationBarTitleDisplayMode(.inline)
         .activityIndicator(isLoading: model.confirmingState.isLoading, message: model.progressMessage)
-        .sheet(item: $model.isPresentingSheet) {
-            switch $0 {
-            case .info(let type):
-                InfoSheetScene(type: type)
-            case .url(let url):
-                SFSafariView(url: url)
-            case .networkFeeSelector:
-                NetworkFeeSheet(model: model.feeModel)
-            case .payloadDetails:
-                NavigationStack {
-                    SimulationPayloadDetailsScene(
-                        primaryFields: model.primaryPayloadFields,
-                        secondaryFields: model.secondaryPayloadFields,
-                        fieldViewModel: model.payloadFieldViewModel(for:),
-                        contextMenuItems: model.contextMenuItems(for:)
-                    )
-                    .presentationDetents([.large])
-                    .presentationBackground(Colors.grayBackground)
-                }
-            case .fiatConnect(let assetAddress, let walletId):
-                NavigationStack {
-                    FiatConnectNavigationView(
-                        model: FiatSceneViewModel(
-                            fiatService: model.fiatService,
-                            assetAddress: assetAddress,
-                            walletId: walletId
-                        )
-                    )
-                    .navigationBarTitleDisplayMode(.inline)
-                    .toolbarDismissItem(type: .close, placement: .topBarLeading)
-                }
-            case .swapDetails:
-                if case let .swapDetails(model) = model.detailsViewModel.itemModel {
-                    NavigationStack {
-                        SwapDetailsView(model: Bindable(model))
-                            .presentationDetentsForCurrentDeviceSize(expandable: true)
-                            .presentationBackground(Colors.grayBackground)
-                    }
-                }
-            case .perpetualDetails(let model):
-                NavigationStack {
-                    PerpetualDetailsView(model: model)
-                        .presentationDetentsForCurrentDeviceSize(expandable: true)
-                        .presentationBackground(Colors.grayBackground)
-                }
-            }
-        }
         .alertSheet($model.isPresentingAlertMessage)
     }
 }

Features/Transfer/Sources/Types/AmountDataProvider.swift

@@ -3,7 +3,7 @@
 import BigInt
 import Primitives
 
-enum AmountDataProvider: AmountDataProvidable, @unchecked Sendable {
+public enum AmountDataProvider: AmountDataProvidable, @unchecked Sendable {
     case transfer(AmountTransferViewModel)
     case stake(AmountStakeViewModel)
     case freeze(AmountFreezeViewModel)

Features/Transfer/Sources/Types/AmountSheetType.swift

@@ -7,13 +7,13 @@ import Components
 import Perpetuals
 import PrimitivesComponents
 
-enum AmountSheetType: Identifiable {
+public enum AmountSheetType: Identifiable {
     case infoAction(InfoSheetType)
-    case fiatConnect(assetAddress: AssetAddress, walletId: WalletId)
+    case fiatConnect(assetAddress: AssetAddress, wallet: Wallet)
     case leverageSelector(selection: SelectionState<LeverageOption>)
     case autoclose(AutocloseOpenData)
 
-    var id: String {
+    public var id: String {
         switch self {
         case let .infoAction(type): "info-action-\(type.id)"
         case .fiatConnect: "fiat-connect"

Features/Transfer/Sources/Types/ConfirmTransferSheetType.swift

@@ -6,16 +6,16 @@ import Primitives
 import Components
 import PrimitivesComponents
 
-enum ConfirmTransferSheetType: Identifiable, Sendable {
+public enum ConfirmTransferSheetType: Identifiable, Sendable {
     case info(InfoSheetType)
     case networkFeeSelector
     case payloadDetails
     case url(URL)
-    case fiatConnect(assetAddress: AssetAddress, walletId: WalletId)
+    case fiatConnect(assetAddress: AssetAddress, wallet: Wallet)
     case swapDetails
     case perpetualDetails(PerpetualDetailsViewModel)
 
-    var id: String {
+    public var id: String {
         switch self {
         case let .info(type): "info-\(type.id)"
         case let .url(url): "url-\(url)"

Features/Transfer/Sources/Types/SelectionState.swift

@@ -3,13 +3,13 @@
 import Foundation
 
 @Observable
-final class SelectionState<T> {
-    let options: [T]
-    var selected: T
-    let isEnabled: Bool
-    let title: String
+public final class SelectionState<T> {
+    public let options: [T]
+    public var selected: T
+    public let isEnabled: Bool
+    public let title: String
 
-    init(
+    public init(
         options: [T],
         selected: T,
         isEnabled: Bool,

Features/Transfer/Sources/ViewModels/AmountEarnViewModel.swift

@@ -6,7 +6,7 @@ import Foundation
 import Localization
 import Primitives
 
-final class AmountEarnViewModel: AmountDataProvidable {
+public final class AmountEarnViewModel: AmountDataProvidable {
     let asset: Asset
     let action: EarnType
     private let earnService: any EarnDataProvidable

Features/Transfer/Sources/ViewModels/AmountFreezeViewModel.swift

@@ -8,7 +8,7 @@ import Primitives
 import PrimitivesComponents
 import Stake
 
-final class AmountFreezeViewModel: AmountDataProvidable {
+public final class AmountFreezeViewModel: AmountDataProvidable {
     enum Action {
         case freeze
         case unfreeze

Features/Transfer/Sources/ViewModels/AmountPerpetualViewModel.swift

@@ -18,7 +18,7 @@ struct AmountPerpetualLimits {
 }
 
 @Observable
-final class AmountPerpetualViewModel: AmountDataProvidable {
+public final class AmountPerpetualViewModel: AmountDataProvidable {
     let asset: Asset
     let data: PerpetualRecipientData
     let leverageSelection: SelectionState<LeverageOption>?

Features/Transfer/Sources/ViewModels/AmountSceneViewModel.swift

@@ -26,13 +26,13 @@ public final class AmountSceneViewModel {
     private let valueConverter = ValueConverter()
     let currencyFormatter: CurrencyFormatter
 
-    let provider: AmountDataProvider
+    public let provider: AmountDataProvider
 
     public let assetQuery: ObservableQuery<AssetRequest>
     var assetData: AssetData { assetQuery.value }
-    var transferState: StateViewType<TransferData> = .noData
+    public var transferState: StateViewType<TransferData> = .noData
     var amountInputModel: InputValidationViewModel
-    var isPresentingSheet: AmountSheetType?
+    public var isPresentingSheet: AmountSheetType?
 
     private var amountInputType: AmountInputType = .asset {
         didSet { amountInputModel.update(validators: inputValidators) }
@@ -60,7 +60,7 @@ public final class AmountSceneViewModel {
         }
     }
 
-    var asset: Asset { provider.asset }
+    public var asset: Asset { provider.asset }
     var title: String { provider.title }
     var canChangeValue: Bool { provider.canChangeValue }
     var isInputDisabled: Bool { !canChangeValue }
@@ -88,8 +88,8 @@ public final class AmountSceneViewModel {
     }
 
     var maxTitle: String { Localized.Transfer.max }
-    var continueTitle: String { Localized.Common.continue }
-    var isNextEnabled: Bool { actionButtonState == .normal }
+    public var continueTitle: String { Localized.Common.continue }
+    public var isNextEnabled: Bool { actionButtonState == .normal }
 
     var inputConfig: any CurrencyInputConfigurable {
         AmountInputConfig(
@@ -113,11 +113,11 @@ extension AmountSceneViewModel {
         }
     }
 
-    func onChangeAssetBalance(_: AssetData, _: AssetData) {
+    public func onChangeAssetBalance(_: AssetData, _: AssetData) {
         amountInputModel.update(validators: inputValidators)
     }
 
-    func onSelectNextButton() {
+    public func onSelectNextButton() {
         Task {
             await fetch()
         }
@@ -148,7 +148,7 @@ extension AmountSceneViewModel {
         isPresentingSheet = .autoclose(perpetual.makeAutocloseData(size: amount))
     }
 
-    func onAutocloseComplete(takeProfit: InputValidationViewModel, stopLoss: InputValidationViewModel) {
+    public func onAutocloseComplete(takeProfit: InputValidationViewModel, stopLoss: InputValidationViewModel) {
         if case let .perpetual(perpetual) = provider {
             perpetual.takeProfit = takeProfit.text.isEmpty ? nil : takeProfit.text
             perpetual.stopLoss = stopLoss.text.isEmpty ? nil : stopLoss.text
@@ -160,11 +160,11 @@ extension AmountSceneViewModel {
         cleanInput()
     }
 
-    func onChangeLeverage(_: LeverageOption, _: LeverageOption) {
+    public func onChangeLeverage(_: LeverageOption, _: LeverageOption) {
         amountInputModel.update(validators: inputValidators)
     }
 
-    func onValidatorSelected(_ validator: DelegationValidator) {
+    public func onValidatorSelected(_ validator: DelegationValidator) {
         if case let .stake(stake) = provider {
             stake.validatorSelection.selected = validator
         }
@@ -214,7 +214,7 @@ private extension AmountSceneViewModel {
     func onSelectBuy() {
         let senderAddress = (try? wallet.account(for: asset.chain).address) ?? ""
         let assetAddress = AssetAddress(asset: asset, address: senderAddress)
-        isPresentingSheet = .fiatConnect(assetAddress: assetAddress, walletId: wallet.walletId)
+        isPresentingSheet = .fiatConnect(assetAddress: assetAddress, wallet: wallet)
     }
 
     var inputValidators: [any TextValidator] {