Refactor amount handling to use AssetData (#1105)

* Refactor amount handling to use AssetBalancePrice

Replaces AmountService with direct usage of AssetBalancePrice and AssetBalancePriceRequest for price and balance retrieval in transfer flows. Updates navigation, view models, and factories to remove AmountService dependency, streamlining asset price and balance observation. Adds new primitives and store request types for asset balance and price. Cleans up related tests and navigation stack initializations.

* Update AssetBalancePriceRequest.swift

* Updates AssetSceneViewModelTests

Removed unused assetid from AssetBalancePrice, since we have id in price

* Removed stakeservice

* Update JobRunnerTests.swift

* Update AmountSceneViewModel.swift

* Updates tests

* Minor updates

Improve getRecipientAddress in AmountSceneViewModel
Improve AssetBalancePriceRequest for app consistent style

* Refactor asset balance and price handling in transfer feature

Replaces AssetBalancePrice and related request/types with AssetData and AssetRequest in AmountSceneViewModel and related views/tests.
Removes obsolete AssetBalancePrice, AssetBalancePriceRequest, and BalancePriceInfo files. Updates usages to reflect new data model for asset balance and price.
Minor test timing adjustments in JobRunnerTests.

* Update core

* Update StakeService+TestKit.swift

* Update AmountSceneViewModel.swift

Author: gemdev111

Features/Transfer/Package.swift

@@ -66,7 +66,6 @@ let package = Package(
                 .product(name: "ChainService", package: "ChainServices"),
                 .product(name: "WalletService", package: "SystemServices"),
                 .product(name: "WalletsService", package: "FeatureServices"),
-                .product(name: "StakeService", package: "ChainServices"),
                 .product(name: "NodeService", package: "ChainServices"),
                 .product(name: "TransactionService", package: "FeatureServices"),
                 .product(name: "ScanService", package: "ChainServices"),
@@ -83,7 +82,6 @@ let package = Package(
             dependencies: [
                 "Transfer",
                 .product(name: "PrimitivesTestKit", package: "Primitives"),
-                .product(name: "StakeServiceTestKit", package: "ChainServices"),
                 .product(name: "WalletsServiceTestKit", package: "FeatureServices"),
                 .product(name: "BlockchainTestKit", package: "Blockchain"),
                 .product(name: "ScanServiceTestKit", package: "ChainServices"),

Features/Transfer/Sources/Navigation/AmountNavigationView.swift

@@ -8,6 +8,7 @@ import InfoSheet
 import Components
 import FiatConnect
 import PrimitivesComponents
+import Store
 
 public struct AmountNavigationView: View {
     @State private var model: AmountSceneViewModel
@@ -20,6 +21,11 @@ public struct AmountNavigationView: View {
         AmountScene(
             model: model
         )
+        .onChangeObserveQuery(
+            request: $model.assetRequest,
+            value: $model.assetData,
+            action: model.onChangeAssetBalance
+        )
         .sheet(item: $model.isPresentingSheet) {
             switch $0 {
             case let .infoAction(type):

Features/Transfer/Sources/Navigation/RecipientNavigationView.swift

@@ -8,18 +8,14 @@ import QRScanner
 
 public struct RecipientNavigationView: View {
     @State private var model: RecipientSceneViewModel
-
-    private let amountService: AmountService
     private let confirmService: ConfirmService
     private let onComplete: VoidAction
 
     public init(
-        amountService: AmountService,
         confirmService: ConfirmService,
         model: RecipientSceneViewModel,
         onComplete: VoidAction
     ) {
-        self.amountService = amountService
         self.confirmService = confirmService
         _model = State(initialValue: model)
         self.onComplete = onComplete
@@ -39,7 +35,6 @@ public struct RecipientNavigationView: View {
                 model: AmountSceneViewModel(
                     input: AmountInput(type: .transfer(recipient: data), asset: model.asset),
                     wallet: model.wallet,
-                    amountService: amountService,
                     onTransferAction: model.onTransferAction
                 )
             )

Features/Transfer/Sources/Services/AmountService.swift

@@ -10,19 +10,19 @@ import Localization
 import Preferences
 import Primitives
 import PrimitivesComponents
-import StakeService
 import Staking
+import Store
 import Style
 import Validators
 import WalletsService
+import Blockchain
 
 @MainActor
 @Observable
 public final class AmountSceneViewModel {
     private let input: AmountInput
     private let wallet: Wallet
 
-    private let amountService: AmountService
     private let onTransferAction: TransferDataAction
 
     private let formatter = ValueFormatter(style: .full)
@@ -32,11 +32,13 @@ public final class AmountSceneViewModel {
     private let perpetualPriceFormatter = PerpetualPriceFormatter()
 
     private var currentValidator: DelegationValidator?
-    private var currentDelegation: Delegation?
     private var amountInputType: AmountInputType = .asset {
         didSet { amountInputModel.update(validators: inputValidators) }
     }
 
+    var assetRequest: AssetRequest
+    var assetData: AssetData = .empty
+
     var amountInputModel: InputValidationViewModel = InputValidationViewModel()
     var delegation: DelegationValidator?
     var isPresentingSheet: AmountSheetType?
@@ -45,15 +47,17 @@ public final class AmountSceneViewModel {
     public init(
         input: AmountInput,
         wallet: Wallet,
-        amountService: AmountService,
         onTransferAction: TransferDataAction
     ) {
         self.input = input
         self.wallet = wallet
-        self.amountService = amountService
         self.onTransferAction = onTransferAction
-        self.currentValidator = defaultValidator
+        self.assetRequest = AssetRequest(
+            walletId: wallet.walletId.id,
+            assetId: input.asset.id
+        )
 
+        self.currentValidator = defaultValidator
         self.amountInputModel = InputValidationViewModel(mode: .onDemand, validators: inputValidators)
 
         // set amount if avaialbe in recipientData
@@ -69,7 +73,6 @@ public final class AmountSceneViewModel {
 
     var isInputDisabled: Bool { !canChangeValue }
     var isBalanceViewEnabled: Bool { !isInputDisabled }
-    var isNextEnabled: Bool { actionButtonState == .normal }
 
     var actionButtonState: ButtonState {
         amountInputModel.text.isNotEmpty && amountInputModel.isValid ? .normal : .disabled
@@ -79,6 +82,7 @@ public final class AmountSceneViewModel {
     var maxTitle: String { Localized.Transfer.max }
     var nextTitle: String { Localized.Common.next }
     var continueTitle: String { Localized.Common.continue }
+    var isNextEnabled: Bool { actionButtonState == .normal }
 
     var inputConfig: any CurrencyInputConfigurable {
         AmountInputConfig(
@@ -174,6 +178,10 @@ extension AmountSceneViewModel {
         }
     }
 
+    func onChangeAssetBalance(_: AssetData, _: AssetData) {
+        amountInputModel.update(validators: inputValidators)
+    }
+
     func onSelectNextButton() {
         do {
             try onNext()
@@ -250,30 +258,27 @@ extension AmountSceneViewModel {
         )
     }
 
+    private func recipientAddress(chain: StakeChain?, validatorId: String) -> String {
+        switch chain {
+        case .cosmos, .osmosis, .injective, .sei, .celestia, .solana, .sui, .tron: validatorId
+        case .smartChain: StakeHub.address
+        case .none, .some(.hyperCore): ""
+        }
+    }
+    
     private var recipientData: RecipientData {
         switch type {
-        case .transfer(recipient: let recipient):
-            return recipient
-        case .deposit(recipient: let recipient):
-            return recipient
-        case .withdraw(recipient: let recipient):
-            return recipient
-        case .perpetual(let recipient, _):
-            return recipient
+        case .transfer(recipient: let recipient): recipient
+        case .deposit(recipient: let recipient): recipient
+        case .withdraw(recipient: let recipient): recipient
+        case .perpetual(let recipient, _): recipient
         case .stake,
              .stakeUnstake,
              .stakeRedelegate,
-             .stakeWithdraw:
-            let recipientAddress = amountService.getRecipientAddress(
-                chain: asset.chain.stakeChain,
-                type: type,
-                validatorId: currentValidator?.id
-            )
-
-            return RecipientData(
+             .stakeWithdraw: RecipientData(
                 recipient: Recipient(
                     name: currentValidator?.name,
-                    address: recipientAddress ?? "",
+                    address: (currentValidator?.id).flatMap { recipientAddress(chain: asset.chain.stakeChain, validatorId: $0) } ?? "",
                     memo: Localized.Stake.viagem
                 ),
                 amount: .none
@@ -284,7 +289,7 @@ extension AmountSceneViewModel {
     private var inputValidators: [any TextValidator] {
         let source: AmountValidator.Source = switch amountInputType {
         case .asset: .asset
-        case .fiat: .fiat(price: getAssetPrice(), converter: valueConverter)
+        case .fiat: .fiat(price: assetData.price?.mapToAssetPrice(assetId: asset.id), converter: valueConverter)
         }
         switch input.type {
         case .transfer,
@@ -318,19 +323,19 @@ extension AmountSceneViewModel {
     }
 
     private var amountValue: String {
-        guard let price = getAssetPrice() else { return .zero }
+        guard let price = assetData.price else { return .zero }
         return (try? valueConverter.convertToAmount(
             fiatValue: amountInputModel.text,
-            price: price,
+            price: price.mapToAssetPrice(assetId: asset.id),
             decimals: asset.decimals.asInt
         )).or(.zero)
     }
 
     private var fiatValue: Decimal {
-        guard let price = getAssetPrice() else { return .zero }
+        guard let price = assetData.price else { return .zero }
         return (try? valueConverter.convertToFiat(
             amount: amountInputModel.text,
-            price: price
+            price: price.mapToAssetPrice(assetId: asset.id)
         )).or(.zero)
     }
 
@@ -437,10 +442,6 @@ extension AmountSceneViewModel {
         try formatter.inputNumber(from: amount, decimals: asset.decimals.asInt)
     }
 
-    private func getAssetPrice() -> AssetPrice? {
-        try? amountService.getPrice(for: asset.id)
-    }
-
     private var minimumValue: BigInt {
         let stakeChain = asset.chain.stakeChain
         switch type {
@@ -483,15 +484,9 @@ extension AmountSceneViewModel {
     private var availableValue: BigInt {
         switch input.type {
         case .transfer, .deposit, .perpetual, .stake:
-            guard let balance = try? amountService.getBalance(walletId: wallet.walletId, assetId: asset.id.identifier) else {
-                return .zero
-            }
-            return balance.available
+            return assetData.balance.available
         case .withdraw:
-            guard let balance = try? amountService.getBalance(walletId: wallet.walletId, assetId: asset.id.identifier) else {
-                return .zero
-            }
-            return balance.withdrawable
+            return assetData.balance.withdrawable
         case .stakeUnstake(let delegation):
             return delegation.base.balanceValue
         case .stakeRedelegate(let delegation, _, _):

Features/Transfer/Sources/ViewModels/AmountSceneViewModel.swift

@@ -12,7 +12,6 @@ import NameService
 import Keystore
 import WalletsService
 import NodeService
-import StakeService
 import SwiftUI
 import ScanService
 import Formatters

Features/Transfer/Sources/ViewModels/RecipientSceneViewModel.swift

@@ -16,7 +16,6 @@ struct AmountSceneViewModelTests {
     @Test
     func testMaxButton() {
         let model = AmountSceneViewModel.mock()
-
         #expect(model.amountInputModel.isValid)
 
         model.onSelectMaxButton()
@@ -54,23 +53,14 @@ struct AmountSceneViewModelTests {
 extension AmountSceneViewModel {
     static func mock(
         type: AmountType = .transfer(recipient: .mock()),
-        asset: Asset = .mockEthereum()
+        assetData: AssetData = .mock(balance: .mock())
     ) -> AmountSceneViewModel {
-        let balanceStore = BalanceStore.mock(db: .mockAssets())
-        return AmountSceneViewModel(
-            input: AmountInput(type: type, asset: asset),
+        let model = AmountSceneViewModel(
+            input: AmountInput(type: type, asset: assetData.asset),
             wallet: .mock(),
-            amountService: AmountService(
-                priceService: .mock(),
-                balanceService:.mock(
-                    balanceStore: balanceStore,
-                    assetsService: .mock(balanceStore: balanceStore),
-                    chainServiceFactory: .mock()
-                ),
-                stakeService: .mock()
-            ),
-            onTransferAction: { _ in
-            }
+            onTransferAction: { _ in }
         )
+        model.assetData = assetData
+        return model
     }
 }

Features/Transfer/Tests/ViewModels/AmountSceneViewModelTests.swift

@@ -21,7 +21,6 @@ struct SelectAssetSceneNavigationStack: View {
     @Environment(\.walletService) private var walletService
     @Environment(\.walletsService) private var walletsService
     @Environment(\.keystore) private var keystore
-    @Environment(\.stakeService) private var stakeService
     @Environment(\.scanService) private var scanService
     @Environment(\.balanceService) private var balanceService
     @Environment(\.priceService) private var priceService
@@ -76,11 +75,6 @@ struct SelectAssetSceneNavigationStack: View {
                 switch input.type {
                 case .send:
                     RecipientNavigationView(
-                        amountService: AmountService(
-                            priceService: priceService,
-                            balanceService: balanceService,
-                            stakeService: stakeService
-                        ),
                         confirmService: ConfirmServiceFactory.create(
                             keystore: keystore,
                             nodeService: nodeService,

Gem/Navigation/Assets/SelectAssetSceneNavigationStack.swift

@@ -52,11 +52,6 @@ struct SelectedAssetNavigationStack: View  {
                 switch input.type {
                 case .send(let type):
                     RecipientNavigationView(
-                        amountService: AmountService(
-                            priceService: priceService,
-                            balanceService: balanceService,
-                            stakeService: stakeService
-                        ),
                         confirmService: ConfirmServiceFactory.create(
                             keystore: keystore,
                             nodeService: nodeService,

Gem/Navigation/Assets/SelectedAssetNavigationStack.swift

@@ -122,16 +122,9 @@ public struct ViewModelFactory: Sendable {
         wallet: Wallet,
         onTransferAction: TransferDataAction
     ) -> AmountSceneViewModel {
-        let amountService = AmountService(
-            priceService: priceService,
-            balanceService: balanceService,
-            stakeService: stakeService
-        )
-        
         return AmountSceneViewModel(
             input: input,
             wallet: wallet,
-            amountService: amountService,
             onTransferAction: onTransferAction
         )
     }