Merge pull request #1307 from novasamatech/fix/swap-corner-cases

Fix swap corner cases
novasamatech · Dec 17, 2024 · e9f2a83 · e9f2a83
2 parents 6a366cf + 51ca28b
commit e9f2a83
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 34 deletions.
diff --git a/...mmon/Services/AssetExchange/CrosschainExchange/CrosschainExchangeOperationPrototype.swift b/...mmon/Services/AssetExchange/CrosschainExchange/CrosschainExchangeOperationPrototype.swift
@@ -26,7 +26,7 @@ final class CrosschainExchangeOperationPrototype: AssetExchangeBaseOperationProt
 
 private extension CrosschainExchangeOperationPrototype {
     private func isChainWithExpensiveCrossChain(chainId: ChainModel.Id) -> Bool {
-        chainId == KnowChainId.polkadot && chainId == KnowChainId.statemint
+        chainId == KnowChainId.polkadot || chainId == KnowChainId.statemint
     }
 }
 

diff --git a/novawallet/Modules/Swaps/Base/Model/SwapDetailsViewModelFactory.swift b/novawallet/Modules/Swaps/Base/Model/SwapDetailsViewModelFactory.swift
@@ -12,7 +12,7 @@ protocol SwapDetailsViewModelFactoryProtocol: SwapBaseViewModelFactoryProtocol {
 
     func slippageViewModel(slippage: BigRational, locale: Locale) -> String
 
-    func walletViewModel(walletAddress: WalletDisplayAddress) -> WalletAccountViewModel?
+    func walletViewModel(metaAccountResponse: MetaChainAccountResponse) -> WalletAccountViewModel?
 }
 
 final class SwapDetailsViewModelFactory: SwapBaseViewModelFactory {
@@ -72,7 +72,7 @@ extension SwapDetailsViewModelFactory: SwapDetailsViewModelFactoryProtocol {
         slippage.decimalValue.map { percentForamatter.value(for: locale).stringFromDecimal($0) ?? "" } ?? ""
     }
 
-    func walletViewModel(walletAddress: WalletDisplayAddress) -> WalletAccountViewModel? {
-        try? walletViewModelFactory.createViewModel(from: walletAddress)
+    func walletViewModel(metaAccountResponse: MetaChainAccountResponse) -> WalletAccountViewModel? {
+        try? walletViewModelFactory.createViewModel(from: metaAccountResponse)
     }
 }
diff --git a/novawallet/Modules/Swaps/Base/SwapBasePresenter.swift b/novawallet/Modules/Swaps/Base/SwapBasePresenter.swift
@@ -116,7 +116,7 @@ class SwapBasePresenter {
         )
     }
 
-    func getMaxModel() -> SwapMaxModel? {
+    func getMaxModel() -> SwapMaxModel {
         .init(
             payChainAsset: getPayChainAsset(),
             feeChainAsset: getFeeChainAsset(),

diff --git a/novawallet/Modules/Swaps/Confirm/SwapConfirmPresenter.swift b/novawallet/Modules/Swaps/Confirm/SwapConfirmPresenter.swift
@@ -91,8 +91,9 @@ final class SwapConfirmPresenter: SwapBasePresenter {
     }
 
     override func applySwapMax() {
+        let maxAmount = getMaxModel().calculate()
+
         guard
-            let maxAmount = getMaxModel()?.calculate(),
             maxAmount > 0,
             let maxAmountInPlank = maxAmount.toSubstrateAmount(
                 precision: initState.chainAssetIn.assetDisplayInfo.assetPrecision
@@ -289,11 +290,7 @@ extension SwapConfirmPresenter {
             return
         }
 
-        guard let walletAddress = WalletDisplayAddress(response: chainAccountResponse) else {
-            view?.didReceiveWallet(viewModel: nil)
-            return
-        }
-        let viewModel = viewModelFactory.walletViewModel(walletAddress: walletAddress)
+        let viewModel = viewModelFactory.walletViewModel(metaAccountResponse: chainAccountResponse)
 
         view?.didReceiveWallet(viewModel: viewModel)
     }

diff --git a/novawallet/Modules/Swaps/Setup/Model/SwapIssueCheckParams.swift b/novawallet/Modules/Swaps/Setup/Model/SwapIssueCheckParams.swift
@@ -10,4 +10,5 @@ struct SwapIssueCheckParams {
     let payAssetExistense: AssetBalanceExistence?
     let receiveAssetExistense: AssetBalanceExistence?
     let quoteResult: Result<AssetExchangeQuote, Error>?
+    let fee: AssetExchangeFee?
 }
diff --git a/novawallet/Modules/Swaps/Setup/Model/SwapIssueViewModelFactory.swift b/novawallet/Modules/Swaps/Setup/Model/SwapIssueViewModelFactory.swift
@@ -28,14 +28,19 @@ final class SwapIssueViewModelFactory {
     }
 
     func detectInsufficientBalance(in model: SwapIssueCheckParams) -> SwapSetupViewIssue? {
-        if let payAmount = model.payAmount,
-           let payChainAsset = model.payChainAsset,
-           let balance = model.payAssetBalance?.transferable.decimal(precision: payChainAsset.asset.precision),
-           payAmount > balance {
-            return .insufficientBalance
-        } else {
+        guard
+            let payAmount = model.payAmount,
+            payAmount > 0,
+            let payChainAsset = model.payChainAsset
+        else {
             return nil
         }
+
+        let assetDisplayInfo = payChainAsset.assetDisplayInfo
+        let balance = model.payAssetBalance?.transferable.decimal(assetInfo: assetDisplayInfo) ?? 0
+        let fee = model.fee?.totalFeeInAssetIn(payChainAsset).decimal(assetInfo: assetDisplayInfo) ?? 0
+
+        return payAmount + fee > balance ? .insufficientBalance : nil
     }
 
     func detectMinBalanceViolationOnReceive(in model: SwapIssueCheckParams, locale: Locale) -> SwapSetupViewIssue? {
@@ -45,7 +50,7 @@ final class SwapIssueViewModelFactory {
             let minBalance = model.receiveAssetExistense?.minBalance.decimal(
                 precision: receiveChainAsset.asset.precision
             ),
-            let beforeSwapBalance = model.receiveAssetBalance?.freeInPlank.decimal(
+            let beforeSwapBalance = model.receiveAssetBalance?.balanceCountingEd.decimal(
                 precision: receiveChainAsset.asset.precision
             ) else {
             return nil

diff --git a/novawallet/Modules/Swaps/Setup/Model/SwapsSetupViewModelFactory.swift b/novawallet/Modules/Swaps/Setup/Model/SwapsSetupViewModelFactory.swift
@@ -6,7 +6,7 @@ protocol SwapsSetupViewModelFactoryProtocol: SwapBaseViewModelFactoryProtocol, S
 
     func payTitleViewModel(
         assetDisplayInfo: AssetBalanceDisplayInfo?,
-        maxValue: BigUInt?,
+        maxValue: Decimal?,
         locale: Locale
     ) -> TitleHorizontalMultiValueView.Model
 
@@ -130,21 +130,17 @@ extension SwapsSetupViewModelFactory: SwapsSetupViewModelFactoryProtocol {
 
     func payTitleViewModel(
         assetDisplayInfo: AssetBalanceDisplayInfo?,
-        maxValue: BigUInt?,
+        maxValue: Decimal?,
         locale: Locale
     ) -> TitleHorizontalMultiValueView.Model {
         let title = R.string.localizable.swapsSetupAssetSelectPayTitle(
             preferredLanguages: locale.rLanguages
         )
 
         if let assetDisplayInfo = assetDisplayInfo, let maxValue = maxValue {
-            let amountDecimal = Decimal.fromSubstrateAmount(
-                maxValue,
-                precision: Int16(assetDisplayInfo.assetPrecision)
-            ) ?? 0
             let maxValueString = balanceViewModelFactoryFacade.amountFromValue(
                 targetAssetInfo: assetDisplayInfo,
-                value: amountDecimal
+                value: maxValue
             ).value(for: locale)
 
             return .init(

diff --git a/novawallet/Modules/Swaps/Setup/SwapSetupPresenter.swift b/novawallet/Modules/Swaps/Setup/SwapSetupPresenter.swift
@@ -75,7 +75,7 @@ final class SwapSetupPresenter: SwapBasePresenter {
             return nil
         }
 
-        let maxAmount = getMaxModel()?.calculate() ?? 0
+        let maxAmount = getMaxModel().calculate()
         return payAmountInput.absoluteValue(from: maxAmount)
     }
 
@@ -197,6 +197,7 @@ final class SwapSetupPresenter: SwapBasePresenter {
         provideIssues()
         provideFeeViewModel()
         provideRouteViewModel()
+        providePayTitle()
         switchFeeChainAssetIfNecessary()
     }
 
@@ -236,6 +237,7 @@ final class SwapSetupPresenter: SwapBasePresenter {
             provideButtonState()
         }
 
+        providePayTitle()
         provideIssues()
     }
 
@@ -254,8 +256,8 @@ extension SwapSetupPresenter {
             return nil
         }
 
-        let maxAmount = getMaxModel()?.calculate()
-        return input.absoluteValue(from: maxAmount ?? 0)
+        let maxAmount = getMaxModel().calculate()
+        return input.absoluteValue(from: maxAmount)
     }
 
     func getIssueParams() -> SwapIssueCheckParams {
@@ -268,16 +270,26 @@ extension SwapSetupPresenter {
             receiveAssetBalance: receiveAssetBalance,
             payAssetExistense: payAssetBalanceExistense,
             receiveAssetExistense: receiveAssetBalanceExistense,
-            quoteResult: quoteResult
+            quoteResult: quoteResult,
+            fee: fee
         )
     }
 
     private func providePayTitle() {
-        let payTitleViewModel = viewModelFactory.payTitleViewModel(
-            assetDisplayInfo: payChainAsset?.assetDisplayInfo,
-            maxValue: payAssetBalance?.transferable,
-            locale: selectedLocale
-        )
+        let payTitleViewModel = if let payChainAsset, payAssetBalance != nil {
+            viewModelFactory.payTitleViewModel(
+                assetDisplayInfo: payChainAsset.assetDisplayInfo,
+                maxValue: getMaxModel().calculate(),
+                locale: selectedLocale
+            )
+        } else {
+            viewModelFactory.payTitleViewModel(
+                assetDisplayInfo: nil,
+                maxValue: nil,
+                locale: selectedLocale
+            )
+        }
+
         view?.didReceiveTitle(payViewModel: payTitleViewModel)
     }
 
@@ -715,6 +727,7 @@ extension SwapSetupPresenter: SwapSetupPresenterProtocol {
         Swift.swap(&payChainAsset, &receiveChainAsset)
         feeChainAsset = payChainAsset?.chain.utilityChainAsset()
         canPayFeeInPayAsset = false
+        fee = nil
 
         interactor.update(payChainAsset: payChainAsset)
         interactor.update(receiveChainAsset: receiveChainAsset)