Kensetsu case

Author: ShlyapkinIN

SoraPassport.xcodeproj/project.pbxproj

@@ -583,6 +583,7 @@
 		36DB19C229EDDA9100B3E3BF /* OnboardingMainProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36DB19B729EDDA9100B3E3BF /* OnboardingMainProtocol.swift */; };
 		36DB19C329EDDA9100B3E3BF /* OnboardingMainInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36DB19B829EDDA9100B3E3BF /* OnboardingMainInteractor.swift */; };
 		36DB19C529EDEB9F00B3E3BF /* OnboardingMainPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36DB19C429EDEB9F00B3E3BF /* OnboardingMainPresenter.swift */; };
+		36DB33D42C29BAE500058E71 /* String+Kensetsu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36DB33D32C29BAE500058E71 /* String+Kensetsu.swift */; };
 		36DBFE0628FC48C600735535 /* ZeroBalanceCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36DBFE0428FC48C600735535 /* ZeroBalanceCell.swift */; };
 		36DBFE0728FC48C600735535 /* ZeroBalanceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36DBFE0528FC48C600735535 /* ZeroBalanceItem.swift */; };
 		36E00BB029DB2DAD0023D8BD /* AssetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E00BAF29DB2DAD0023D8BD /* AssetProvider.swift */; };
@@ -2044,6 +2045,7 @@
 		36DB19B729EDDA9100B3E3BF /* OnboardingMainProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingMainProtocol.swift; sourceTree = "<group>"; };
 		36DB19B829EDDA9100B3E3BF /* OnboardingMainInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingMainInteractor.swift; sourceTree = "<group>"; };
 		36DB19C429EDEB9F00B3E3BF /* OnboardingMainPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingMainPresenter.swift; sourceTree = "<group>"; };
+		36DB33D32C29BAE500058E71 /* String+Kensetsu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Kensetsu.swift"; sourceTree = "<group>"; };
 		36DBFE0428FC48C600735535 /* ZeroBalanceCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZeroBalanceCell.swift; sourceTree = "<group>"; };
 		36DBFE0528FC48C600735535 /* ZeroBalanceItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZeroBalanceItem.swift; sourceTree = "<group>"; };
 		36E00BAF29DB2DAD0023D8BD /* AssetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetProvider.swift; sourceTree = "<group>"; };
@@ -3589,6 +3591,7 @@
 				5E6587EA28CA1CEA000E7234 /* DispatchQueue+debounce.swift */,
 				5E7DCA9F28D880B500C37182 /* Decima+Substrate.swift */,
 				364D64C22A96191400072106 /* Sequence+Async.swift */,
+				36DB33D32C29BAE500058E71 /* String+Kensetsu.swift */,
 			);
 			path = Foundation;
 			sourceTree = "<group>";
@@ -7467,6 +7470,7 @@
 				3645269528C1286E00260340 /* NodesPresenter.swift in Sources */,
 				945A576B25DE8701003E4023 /* TimeInterval+Time.swift in Sources */,
 				0292035E219B188900D9BACD /* InvitedUserData.swift in Sources */,
+				36DB33D42C29BAE500058E71 /* String+Kensetsu.swift in Sources */,
 				9481B482286EFC6000A472E2 /* WebSocketEngine+Connection.swift in Sources */,
 				366D53C129527A4C0094CE36 /* ContactCell.swift in Sources */,
 				84CB1DC5230B49AA003635F9 /* SkeletonCellViewModel.swift in Sources */,

SoraPassport/Common/Extensions/Foundation/String+Kensetsu.swift

@@ -0,0 +1,15 @@
+//
+//  String+Kensetsu.swift
+//  SoraPassport
+//
+//  Created by Ivan Shlyapkin on 6/24/24.
+//  Copyright © 2024 Soramitsu. All rights reserved.
+//
+
+import Foundation
+
+extension String {
+    var kensetsuCase: String {
+        self == WalletAssetId.kxor ? WalletAssetId.xor.rawValue : self
+    }
+}

SoraPassport/Common/Network/Polkaswap/PolkaswapNetworkOperationFactory.swift

@@ -79,7 +79,7 @@ protocol PolkaswapNetworkOperationFactoryProtocol: AnyObject {
 
 final class PolkaswapNetworkOperationFactory: PolkaswapNetworkOperationFactoryProtocol {
     func dexId(for baseAssetId: String) -> UInt32 {
-        if baseAssetId == WalletAssetId.xor.rawValue {
+        if baseAssetId == WalletAssetId.xor.rawValue || baseAssetId == WalletAssetId.kxor {
             return xorDexID
         } else if baseAssetId == WalletAssetId.xstusd.rawValue {
             return xstusdDexID

SoraPassport/ModulesRedesign/PolkaswapProducts/Liquidity/Supply/ConfirmSupplyLiquidityViewModel.swift

@@ -173,7 +173,7 @@ extension ConfirmSupplyLiquidityViewModel {
             feeDescription: networkFeeDescription
         )
 
-        let dexId = (assetManager.assetInfo(for: baseAssetId)?.isFeeAsset ?? false) ? "0" : "1"
+        let dexId = (assetManager.assetInfo(for: baseAssetId)?.isFeeAsset ?? false) || baseAssetId == WalletAssetId.kxor ? "0" : "1"
         let shareOfPool = details.first(where: { $0.title == Constants.apyTitle })?.assetAmountText.text ?? ""
         let apy = details.first(where: { $0.title == Constants.apyTitle })?.assetAmountText.text ?? ""
 

SoraPassport/ModulesRedesign/PolkaswapProducts/Liquidity/Supply/SupplyLiquidityViewModel.swift

@@ -112,7 +112,10 @@ final class SupplyLiquidityViewModel {
                 view?.updateFirstAsset(symbol: asset.symbol, image: image)
                 updateBalanceData()
                 if !firstAssetId.isEmpty, !secondAssetId.isEmpty {
-                    poolInfo = await poolsService?.getPool(by: firstAssetId, targetAssetId: secondAssetId)
+                    poolInfo = await poolsService?.getPool(
+                        by: firstAssetId.kensetsuCase,
+                        targetAssetId: secondAssetId//.kensetsuCase
+                    )
                 }
                 view?.setAccessoryView(isHidden: false)
                 recalculate(field: .one)
@@ -128,7 +131,10 @@ final class SupplyLiquidityViewModel {
                 view?.updateSecondAsset(symbol: asset.symbol, image: image)
                 updateBalanceData()
                 if !firstAssetId.isEmpty, !secondAssetId.isEmpty {
-                    poolInfo = await poolsService?.getPool(by: firstAssetId, targetAssetId: secondAssetId)
+                    poolInfo = await poolsService?.getPool(
+                        by: firstAssetId.kensetsuCase,
+                        targetAssetId: secondAssetId
+                    )
                 }
                 view?.setAccessoryView(isHidden: false)
                 recalculate(field: .two)
@@ -410,8 +416,8 @@ extension SupplyLiquidityViewModel: LiquidityViewModelProtocol {
               let fiatService = fiatService,
               let assetManager = assetManager else { return }
         wireframe?.showSupplyLiquidityConfirmation(on: view?.controller.navigationController,
-                                                   baseAssetId: firstAssetId,
-                                                   targetAssetId: secondAssetId,
+                                                   baseAssetId: firstAssetId,//.kensetsuCase,
+                                                   targetAssetId: secondAssetId,//.kensetsuCase,
                                                    fiatService: fiatService,
                                                    poolsService: poolsService,
                                                    assetManager: assetManager,
@@ -506,7 +512,7 @@ extension SupplyLiquidityViewModel {
         let group = DispatchGroup()
 
         group.enter()
-        poolsService?.isPairPresentedInNetwork(baseAssetId: firstAssetId,
+        poolsService?.isPairPresentedInNetwork(baseAssetId: firstAssetId.kensetsuCase,
                                                targetAssetId: secondAssetId,
                                                accountId: "",
                                                completion: { [weak self] isPresented in
@@ -515,7 +521,7 @@ extension SupplyLiquidityViewModel {
         })
 
         group.enter()
-        poolsService?.isPairEnabled(baseAssetId: firstAssetId,
+        poolsService?.isPairEnabled(baseAssetId: firstAssetId.kensetsuCase,
                                     targetAssetId: secondAssetId,
                                     accountId: "",
                                     completion: { [weak self] isEnabled in