Merge pull request #913 from soramitsu/update_shared_features

VitalyPeryatin · web-flow · commit 08a40933cfd7 · 2023-05-25T09:38:42.000+03:00
Increase version of SharedFeaturesAndroid
diff --git a/app/src/main/java/jp/co/soramitsu/app/root/navigation/Navigator.kt b/app/src/main/java/jp/co/soramitsu/app/root/navigation/Navigator.kt
@@ -115,6 +115,7 @@ import jp.co.soramitsu.wallet.impl.presentation.balance.detail.BalanceDetailFrag
 import jp.co.soramitsu.wallet.impl.presentation.balance.detail.frozen.FrozenAssetPayload
 import jp.co.soramitsu.wallet.impl.presentation.balance.detail.frozen.FrozenTokensFragment
 import jp.co.soramitsu.wallet.impl.presentation.balance.optionswallet.OptionsWalletFragment
+import jp.co.soramitsu.wallet.impl.presentation.balance.walletselector.light.WalletSelectionMode
 import jp.co.soramitsu.wallet.impl.presentation.balance.walletselector.light.WalletSelectorFragment
 import jp.co.soramitsu.wallet.impl.presentation.beacon.main.BeaconFragment
 import jp.co.soramitsu.wallet.impl.presentation.beacon.main.DAppMetadataModel
@@ -367,8 +368,15 @@ class Navigator :
         navController?.navigate(R.id.walletSelectorFragment, WalletSelectorFragment.buildArguments(tag))
     }
 
-    override fun openWalletSelectorForResult(): Flow<Long> {
-        val bundle = WalletSelectorFragment.buildArguments(tag = "")
+    override fun openWalletSelectorForResult(
+        selectedWalletId: Long?,
+        walletSelectionMode: WalletSelectionMode
+    ): Flow<Long> {
+        val bundle = WalletSelectorFragment.buildArguments(
+            tag = "",
+            selectedWalletId = selectedWalletId,
+            walletSelectionMode = walletSelectionMode
+        )
         return openWithResult(
             destinationId = R.id.walletSelectorFragment,
             bundle = bundle,
@@ -700,13 +708,13 @@ class Navigator :
     override fun openSelectChainForXcm(
         selectedChainId: ChainId?,
         xcmChainType: XcmChainType,
-        selectedOriginalChainId: String?,
+        selectedOriginChainId: String?,
         xcmAssetSymbol: String?
     ) {
         val bundle = ChainSelectFragment.getBundleForXcmChains(
             selectedChainId = selectedChainId,
             xcmChainType = xcmChainType,
-            xcmSelectedOriginalChainId = selectedOriginalChainId,
+            xcmSelectedOriginChainId = selectedOriginChainId,
             xcmAssetSymbol = xcmAssetSymbol
         )
         navController?.navigate(R.id.chainSelectFragment, bundle)
diff --git a/build.gradle b/build.gradle
@@ -84,7 +84,7 @@ buildscript {
         minifyRelease = true
         beaconVersion = "3.2.4"
 
-        sharedFeaturesVersion = "0.0.26_snapshot1"
+        sharedFeaturesVersion = "0.0.26_snapshot2"
 
         coilDep = "io.coil-kt:coil:$coilVersion"
         coilSvg = "io.coil-kt:coil-svg:$coilVersion"
diff --git a/common/src/main/java/jp/co/soramitsu/common/compose/component/ActionBar.kt b/common/src/main/java/jp/co/soramitsu/common/compose/component/ActionBar.kt
@@ -51,7 +51,9 @@ fun ActionBar(
 ) {
     Row(Modifier.padding(vertical = 4.dp)) {
         state.actionItems.forEachIndexed { index, actionItem ->
-            val itemClickHandler = remember { { onItemClick(actionItem, state.chainId, state.chainAssetId) } }
+            val itemClickHandler = remember(actionItem, state.chainId, state.chainAssetId) {
+                { onItemClick(actionItem, state.chainId, state.chainAssetId) }
+            }
             val icon = painterResource(id = actionItem.iconId)
             val title = stringResource(id = actionItem.titleId)
             val actionViewState = remember {
diff --git a/common/src/main/java/jp/co/soramitsu/common/compose/component/AssetSelector.kt b/common/src/main/java/jp/co/soramitsu/common/compose/component/AssetSelector.kt
@@ -103,10 +103,7 @@ fun AssetSelector(
 fun Badge(text: String, modifier: Modifier = Modifier) {
     Row(modifier = modifier.background(color = white16, shape = RoundedCornerShape(size = 3.dp))) {
         MarginHorizontal(margin = 6.dp)
-        Text(
-            text = text.uppercase(),
-            style = MaterialTheme.customTypography.capsTitle2
-        )
+        H6(text = text)
         MarginHorizontal(margin = 6.dp)
     }
 }
@@ -132,7 +129,7 @@ fun Badge(
             modifier = Modifier.size(16.dp)
         )
         MarginHorizontal(margin = 4.dp)
-        CapsTitle(text = stringResource(id = labelResId))
+        H6(text = stringResource(id = labelResId))
     }
 }
 
@@ -158,7 +155,7 @@ fun Badge(
             )
         }
         MarginHorizontal(margin = 4.dp)
-        CapsTitle(text = stringResource(id = labelResId))
+        H6(text = stringResource(id = labelResId))
     }
 }
 
diff --git a/feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/api/domain/model/XcmChainType.kt b/feature-wallet-api/src/main/java/jp/co/soramitsu/wallet/api/domain/model/XcmChainType.kt
@@ -5,5 +5,5 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 enum class XcmChainType : Parcelable {
-    Original, Destination
+    Origin, Destination
 }
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/ChainInteractor.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/ChainInteractor.kt
@@ -27,16 +27,16 @@ class ChainInteractor(
     ): Flow<List<ChainId>> {
         return flow {
             val chainIds = when (type) {
-                XcmChainType.Original -> {
-                    xcmEntitiesFetcher.getAvailableOriginalChains(
+                XcmChainType.Origin -> {
+                    xcmEntitiesFetcher.getAvailableOriginChains(
                         assetSymbol = null,
                         destinationChainId = null
                     )
                 }
                 XcmChainType.Destination -> {
                     xcmEntitiesFetcher.getAvailableDestinationChains(
                         assetSymbol = assetSymbol,
-                        originalChainId = originChainId
+                        originChainId = originChainId
                     )
                 }
             }
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/XcmInteractor.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/XcmInteractor.kt
@@ -51,16 +51,15 @@ class XcmInteractor(
                 cryptoType = metaAccount.substrateCryptoType
             )
         )
-        xcmService.addPreloadedMetadata(
-            fromChainMetadata = ChainIdWithMetadata(
-                chainId = originChainId,
-                metadata = runtimeFilesCache.getChainMetadata(originChainId)
-            ),
-            toChainMetadata = ChainIdWithMetadata(
-                chainId = destinationChainId,
-                metadata = runtimeFilesCache.getChainMetadata(destinationChainId)
-            )
+        val fromChainMetadata = ChainIdWithMetadata(
+            chainId = originChainId,
+            metadata = runtimeFilesCache.getChainMetadata(originChainId)
+        )
+        val toChainMetadata = ChainIdWithMetadata(
+            chainId = destinationChainId,
+            metadata = runtimeFilesCache.getChainMetadata(destinationChainId)
         )
+        xcmService.addPreloadedMetadata(fromChainMetadata, toChainMetadata)
     }
 
     fun getAvailableAssetsFlow(originChainId: ChainId?): Flow<List<AssetWithStatus>> {
@@ -76,7 +75,7 @@ class XcmInteractor(
     private fun getAvailableAssetSymbolsFlow(originChainId: ChainId?): Flow<List<String>> {
         return flow {
             val availableXcmAssetSymbols = xcmEntitiesFetcher.getAvailableAssets(
-                originalChainId = originChainId,
+                originChainId = originChainId,
                 destinationChainId = null
             ).map { it.uppercase() }
             emit(availableXcmAssetSymbols)
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/WalletRouter.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/WalletRouter.kt
@@ -14,6 +14,7 @@ import jp.co.soramitsu.wallet.api.domain.model.XcmChainType
 import jp.co.soramitsu.wallet.impl.domain.beacon.SignStatus
 import jp.co.soramitsu.wallet.impl.domain.model.PhishingType
 import jp.co.soramitsu.wallet.impl.presentation.balance.detail.frozen.FrozenAssetPayload
+import jp.co.soramitsu.wallet.impl.presentation.balance.walletselector.light.WalletSelectionMode
 import jp.co.soramitsu.wallet.impl.presentation.beacon.main.DAppMetadataModel
 import jp.co.soramitsu.wallet.impl.presentation.cross_chain.CrossChainTransferDraft
 import jp.co.soramitsu.wallet.impl.presentation.model.OperationParcelizeModel
@@ -51,7 +52,7 @@ interface WalletRouter : SecureRouter, WalletRouterApi {
     fun openSelectChainForXcm(
         selectedChainId: ChainId?,
         xcmChainType: XcmChainType,
-        selectedOriginalChainId: String? = null,
+        selectedOriginChainId: String? = null,
         xcmAssetSymbol: String? = null
     )
 
@@ -136,7 +137,10 @@ interface WalletRouter : SecureRouter, WalletRouterApi {
 
     fun openAddressHistory(chainId: ChainId)
 
-    fun openWalletSelectorForResult(): Flow<Long>
+    fun openWalletSelectorForResult(
+        selectedWalletId: Long?,
+        walletSelectionMode: WalletSelectionMode
+    ): Flow<Long>
 
     fun openAddressHistoryWithResult(chainId: ChainId): Flow<String>
 
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/chainselector/ChainSelectFragment.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/chainselector/ChainSelectFragment.kt
@@ -28,7 +28,7 @@ class ChainSelectFragment : BaseComposeBottomSheetDialogFragment<ChainSelectView
 
         // XCM
         const val KEY_XCM_CHAIN_TYPE = "KEY_XCM_CHAIN_TYPE"
-        const val KEY_XCM_SELECTED_ORIGINAL_CHAIN_ID = "KEY_XCM_SELECTED_ORIGINAL_CHAIN"
+        const val KEY_XCM_SELECTED_ORIGIN_CHAIN_ID = "KEY_XCM_SELECTED_ORIGIN_CHAIN"
         const val KEY_XCM_ASSET_SYMBOL = "KEY_XCM_ASSET_SYMBOL"
 
         fun getBundle(
@@ -63,12 +63,12 @@ class ChainSelectFragment : BaseComposeBottomSheetDialogFragment<ChainSelectView
         fun getBundleForXcmChains(
             selectedChainId: ChainId?,
             xcmChainType: XcmChainType,
-            xcmSelectedOriginalChainId: String? = null,
+            xcmSelectedOriginChainId: String? = null,
             xcmAssetSymbol: String? = null
         ) = bundleOf(
             KEY_SELECTED_CHAIN_ID to selectedChainId,
             KEY_XCM_CHAIN_TYPE to xcmChainType,
-            KEY_XCM_SELECTED_ORIGINAL_CHAIN_ID to xcmSelectedOriginalChainId,
+            KEY_XCM_SELECTED_ORIGIN_CHAIN_ID to xcmSelectedOriginChainId,
             KEY_XCM_ASSET_SYMBOL to xcmAssetSymbol,
             KEY_SELECT_ASSET to false,
             KEY_SHOW_ALL_CHAINS to false,
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/chainselector/ChainSelectViewModel.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/chainselector/ChainSelectViewModel.kt
@@ -47,8 +47,8 @@ class ChainSelectViewModel @Inject constructor(
     // XCM
     private val xcmChainType: XcmChainType? =
         savedStateHandle[ChainSelectFragment.KEY_XCM_CHAIN_TYPE]
-    private val xcmSelectedOriginalChainId: String? =
-        savedStateHandle[ChainSelectFragment.KEY_XCM_SELECTED_ORIGINAL_CHAIN_ID]
+    private val xcmSelectedOriginChainId: String? =
+        savedStateHandle[ChainSelectFragment.KEY_XCM_SELECTED_ORIGIN_CHAIN_ID]
     private val xcmAssetSymbol: String? =
         savedStateHandle[ChainSelectFragment.KEY_XCM_ASSET_SYMBOL]
 
@@ -61,7 +61,7 @@ class ChainSelectViewModel @Inject constructor(
             chainInteractor.getChainsFlow(),
             chainInteractor.getXcmChainIdsFlow(
                 type = xcmChainType,
-                originChainId = xcmSelectedOriginalChainId,
+                originChainId = xcmSelectedOriginChainId,
                 assetSymbol = xcmAssetSymbol
             )
         ) { chains, xsmChainIds ->
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/detail/BalanceDetailViewModel.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/detail/BalanceDetailViewModel.kt
@@ -49,7 +49,7 @@ import jp.co.soramitsu.wallet.impl.presentation.model.OperationModel
 import jp.co.soramitsu.wallet.impl.presentation.transaction.filter.HistoryFiltersProvider
 import jp.co.soramitsu.wallet.impl.presentation.transaction.history.mixin.TransactionHistoryProvider
 import jp.co.soramitsu.wallet.impl.presentation.transaction.history.mixin.TransactionHistoryUi
-import kotlinx.coroutines.Job
+import jp.co.soramitsu.xcm_impl.XcmService
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
@@ -76,7 +76,8 @@ class BalanceDetailViewModel @Inject constructor(
     private val resourceManager: ResourceManager,
     private val clipboardManager: ClipboardManager,
     addressDisplayUseCase: AddressDisplayUseCase,
-    private val currentAccountAddress: CurrentAccountAddressUseCase
+    private val currentAccountAddress: CurrentAccountAddressUseCase,
+    private val xcmService: XcmService
 ) : BaseViewModel(),
     BalanceDetailsScreenInterface,
     ExternalAccountActions by externalAccountActions,
@@ -97,8 +98,6 @@ class BalanceDetailViewModel @Inject constructor(
     private val selectedChainId = MutableStateFlow(assetPayloadInitial.chainId)
     private val assetPayload = MutableStateFlow(assetPayloadInitial)
 
-    private var walletTypeResultJob: Job? = null
-
     private val chainsFlow = chainInteractor.getChainsFlow().mapList { it.toChainItemState() }
     private val assetModelsFlow: Flow<List<AssetModel>> = interactor.assetsFlow()
         .mapList {
@@ -202,7 +201,7 @@ class BalanceDetailViewModel @Inject constructor(
             ActionBarViewState(
                 chainId = selectedChainId,
                 chainAssetId = balanceModel.token.configuration.id,
-                actionItems = getActionItems(selectedChainId),
+                actionItems = getActionItems(selectedChainId, balanceModel),
                 disabledItems = getDisabledItems()
             )
         )
@@ -302,12 +301,20 @@ class BalanceDetailViewModel @Inject constructor(
         }
     }
 
-    private fun getActionItems(selectedChainId: String): List<ActionItemType> {
+    private suspend fun getActionItems(
+        selectedChainId: String,
+        asset: Asset
+    ): List<ActionItemType> {
         val actionItems = mutableListOf(
             ActionItemType.SEND,
             ActionItemType.RECEIVE
         )
-        if (BuildConfig.DEBUG) {
+        val isXcmSupportAsset = xcmService.isXcmSupportAsset(
+            originChainId = selectedChainId,
+            assetSymbol = asset.token.configuration.symbol
+        )
+
+        if (BuildConfig.DEBUG && isXcmSupportAsset) {
             actionItems += ActionItemType.CROSS_CHAIN
         }
         if (isBuyEnabled()) {
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/walletselector/light/WalletSelectionMode.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/walletselector/light/WalletSelectionMode.kt
@@ -0,0 +1,6 @@
+package jp.co.soramitsu.wallet.impl.presentation.balance.walletselector.light
+
+enum class WalletSelectionMode {
+    CurrentWallet,
+    ExternalSelectedWallet
+}
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/walletselector/light/WalletSelectorFragment.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/walletselector/light/WalletSelectorFragment.kt
@@ -1,5 +1,6 @@
 package jp.co.soramitsu.wallet.impl.presentation.balance.walletselector.light
 
+import android.os.Bundle
 import android.widget.FrameLayout
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
@@ -17,8 +18,21 @@ class WalletSelectorFragment : BaseComposeBottomSheetDialogFragment<WalletSelect
 
     companion object {
         const val TAG_ARGUMENT_KEY = "tag"
+        const val SELECTED_WALLET_ID = "SELECTED_WALLET_ID"
+        const val WALLET_SELECTION_MODE = "WALLET_SELECTION_MODE"
         const val RESULT_ADDRESS = "RESULT_ADDRESS"
-        fun buildArguments(tag: String) = bundleOf(TAG_ARGUMENT_KEY to tag)
+
+        fun buildArguments(
+            tag: String,
+            selectedWalletId: Long? = null,
+            walletSelectionMode: WalletSelectionMode? = null
+        ): Bundle {
+            return bundleOf(
+                TAG_ARGUMENT_KEY to tag,
+                SELECTED_WALLET_ID to selectedWalletId,
+                WALLET_SELECTION_MODE to walletSelectionMode
+            )
+        }
     }
 
     override val viewModel: WalletSelectorViewModel by viewModels()
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/walletselector/light/WalletSelectorViewModel.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/walletselector/light/WalletSelectorViewModel.kt
@@ -18,10 +18,10 @@ import jp.co.soramitsu.common.utils.formatFiat
 import jp.co.soramitsu.common.utils.inBackground
 import jp.co.soramitsu.common.utils.mapList
 import jp.co.soramitsu.wallet.impl.presentation.WalletRouter
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -36,6 +36,8 @@ class WalletSelectorViewModel @Inject constructor(
 ) : BaseViewModel(), UpdatesProviderUi by updatesMixin {
 
     private val tag = savedStateHandle.get<String>(WalletSelectorFragment.TAG_ARGUMENT_KEY)!!
+    private val selectedWalletId = savedStateHandle.get<Long?>(WalletSelectorFragment.SELECTED_WALLET_ID)
+    private val walletSelectionMode = savedStateHandle[WalletSelectorFragment.WALLET_SELECTION_MODE] ?: WalletSelectionMode.CurrentWallet
 
     private val walletItemsFlow = accountListingMixin.accountsFlow(AddressIconGenerator.SIZE_BIG).mapList {
         val balanceModel = getTotalBalanceUseCase.invoke(it.id).first()
@@ -54,15 +56,26 @@ class WalletSelectorViewModel @Inject constructor(
     }
         .inBackground()
         .share()
-    private val selectedWalletItem = MutableStateFlow<WalletItemViewState?>(null)
+    private val selectedWalletItem = walletItemsFlow
+        .map { it.firstOrNull { it.id == selectedWalletId } }
+        .stateIn(viewModelScope, SharingStarted.Eagerly, null)
 
     val state = combine(
         walletItemsFlow,
         selectedWalletItem
     ) { walletItems, selectedWallet ->
         WalletSelectorViewState(
             wallets = walletItems,
-            selectedWallet = selectedWallet ?: walletItems.first { it.isSelected }
+            selectedWallet = when (walletSelectionMode) {
+                WalletSelectionMode.CurrentWallet -> {
+                    selectedWallet ?: walletItems.first { it.isSelected }
+                }
+                WalletSelectionMode.ExternalSelectedWallet -> {
+                    selectedWallet ?: selectedWalletId?.let {
+                        walletItems.firstOrNull { it.id == selectedWalletId }
+                    }
+                }
+            }
         )
     }.stateIn(
         viewModelScope,
@@ -75,7 +88,6 @@ class WalletSelectorViewModel @Inject constructor(
 
     fun onWalletSelected(item: WalletItemViewState) {
         viewModelScope.launch {
-            selectedWalletItem.value = item
             router.setWalletSelectorPayload(WalletSelectorPayload(tag, item.id))
             router.backWithResult(WalletSelectorFragment.RESULT_ADDRESS to item.id)
         }
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/cross_chain/setup/ChainAssetsManager.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/cross_chain/setup/ChainAssetsManager.kt
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/cross_chain/setup/ChainType.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/cross_chain/setup/ChainType.kt
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/cross_chain/setup/CrossChainSetupViewModel.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/cross_chain/setup/CrossChainSetupViewModel.kt
diff --git a/runtime/src/main/java/jp/co/soramitsu/runtime/multiNetwork/ChainRegistry.kt b/runtime/src/main/java/jp/co/soramitsu/runtime/multiNetwork/ChainRegistry.kt

Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,7 @@ fun AssetSelector(`
`103`	`103`	`fun Badge(text: String, modifier: Modifier = Modifier) {`
`104`	`104`	`Row(modifier = modifier.background(color = white16, shape = RoundedCornerShape(size = 3.dp))) {`
`105`	`105`	`MarginHorizontal(margin = 6.dp)`
`106`		`- Text(`
`107`		`- text = text.uppercase(),`
`108`		`- style = MaterialTheme.customTypography.capsTitle2`
`109`		`- )`
	`106`	`+ H6(text = text)`
`110`	`107`	`MarginHorizontal(margin = 6.dp)`
`111`	`108`	`}`
`112`	`109`	`}`
`@@ -132,7 +129,7 @@ fun Badge(`
`132`	`129`	`modifier = Modifier.size(16.dp)`
`133`	`130`	`)`
`134`	`131`	`MarginHorizontal(margin = 4.dp)`
`135`		`- CapsTitle(text = stringResource(id = labelResId))`
	`132`	`+ H6(text = stringResource(id = labelResId))`
`136`	`133`	`}`
`137`	`134`	`}`
`138`	`135`
`@@ -158,7 +155,7 @@ fun Badge(`
`158`	`155`	`)`
`159`	`156`	`}`
`160`	`157`	`MarginHorizontal(margin = 4.dp)`
`161`		`- CapsTitle(text = stringResource(id = labelResId))`
	`158`	`+ H6(text = stringResource(id = labelResId))`
`162`	`159`	`}`
`163`	`160`	`}`
`164`	`161`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ import kotlinx.parcelize.Parcelize`
`5`	`5`
`6`	`6`	`@Parcelize`
`7`	`7`	`enum class XcmChainType : Parcelable {`
`8`		`- Original, Destination`
	`8`	`+ Origin, Destination`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,16 +27,16 @@ class ChainInteractor(`
`27`	`27`	`): Flow<List<ChainId>> {`
`28`	`28`	`return flow {`
`29`	`29`	`val chainIds = when (type) {`
`30`		`- XcmChainType.Original -> {`
`31`		`- xcmEntitiesFetcher.getAvailableOriginalChains(`
	`30`	`+ XcmChainType.Origin -> {`
	`31`	`+ xcmEntitiesFetcher.getAvailableOriginChains(`
`32`	`32`	`assetSymbol = null,`
`33`	`33`	`destinationChainId = null`
`34`	`34`	`)`
`35`	`35`	`}`
`36`	`36`	`XcmChainType.Destination -> {`
`37`	`37`	`xcmEntitiesFetcher.getAvailableDestinationChains(`
`38`	`38`	`assetSymbol = assetSymbol,`
`39`		`- originalChainId = originChainId`
	`39`	`+ originChainId = originChainId`
`40`	`40`	`)`
`41`	`41`	`}`
`42`	`42`	`}`