Merge pull request #915 from soramitsu/fixes/FLW-3223-3323-3251

PankraSerg · web-flow · commit 92e26b72264d · 2023-05-24T09:33:13.000+03:00
fixes/FLW-3223-3323-3251
diff --git a/common/src/main/java/jp/co/soramitsu/common/compose/component/AssetListItem.kt b/common/src/main/java/jp/co/soramitsu/common/compose/component/AssetListItem.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.material.Card
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
@@ -26,16 +27,19 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.valentinilk.shimmer.shimmer
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.compose.theme.FearlessTheme
 import jp.co.soramitsu.common.compose.theme.alertYellow
+import jp.co.soramitsu.common.compose.theme.bold
 import jp.co.soramitsu.common.compose.theme.customColors
 import jp.co.soramitsu.common.compose.theme.customTypography
 import jp.co.soramitsu.common.compose.theme.white16
+import jp.co.soramitsu.common.compose.theme.white64
 import jp.co.soramitsu.common.compose.viewstate.AssetListItemShimmerViewState
 import jp.co.soramitsu.common.compose.viewstate.AssetListItemViewState
 
@@ -88,13 +92,19 @@ fun AssetListItem(
                     .padding(vertical = 8.dp)
                     .align(CenterVertically)
             ) {
-                Text(
-                    text = state.assetName.uppercase(),
-                    style = MaterialTheme.customTypography.capsTitle2,
-                    modifier = Modifier
-                        .alpha(0.64f)
-                        .testTag("AssetListItem_${state.assetSymbol}_chain_name")
-                )
+                Row {
+                    Text(
+                        text = state.assetName.uppercase(),
+                        style = MaterialTheme.customTypography.capsTitle2,
+                        modifier = Modifier
+                            .alpha(0.64f)
+                            .testTag("AssetListItem_${state.assetSymbol}_chain_name")
+                    )
+                    if (state.isTestnet) {
+                        MarginHorizontal(margin = 4.dp)
+                        TestnetBadge()
+                    }
+                }
                 Text(
                     text = state.displayName.uppercase(),
                     style = MaterialTheme.customTypography.header3,
@@ -184,6 +194,31 @@ fun AssetListItem(
     }
 }
 
+@Composable
+fun TestnetBadge() {
+    Card(backgroundColor = white16) {
+        Row(
+            modifier = Modifier
+                .padding(bottom = 2.dp, start = 2.dp, end = 4.dp),
+            verticalAlignment = CenterVertically
+        ) {
+            Icon(
+                modifier = Modifier
+                    .width(16.dp)
+                    .padding(top = 1.dp),
+                painter = painterResource(R.drawable.ic_token_testnet),
+                tint = white64,
+                contentDescription = null
+            )
+            MarginHorizontal(margin = 4.dp)
+            Text(
+                text = stringResource(id = R.string.label_testnet).uppercase(),
+                style = MaterialTheme.customTypography.body3.bold().copy(color = white64)
+            )
+        }
+    }
+}
+
 @Composable
 fun AssetListItemShimmer(
     state: AssetListItemShimmerViewState,
@@ -324,13 +359,14 @@ private fun PreviewAssetListItem() {
         hasAccount = true,
         priceId = null,
         hasNetworkIssue = false,
-        ecosystem = "Polkadot"
+        ecosystem = "Polkadot",
+        isTestnet = false
     )
     FearlessTheme {
         Box(modifier = Modifier.background(Color.Black)) {
             Column {
                 AssetListItem(state) {}
-                AssetListItem(state.copy(hasAccount = false)) {}
+                AssetListItem(state.copy(hasAccount = false, isTestnet = true)) {}
                 AssetListItemShimmer(
                     state = AssetListItemShimmerViewState(assetIconUrl, assetChainUrlsMap.values.toList())
                 )
diff --git a/common/src/main/java/jp/co/soramitsu/common/compose/component/SwipeBox.kt b/common/src/main/java/jp/co/soramitsu/common/compose/component/SwipeBox.kt
@@ -186,7 +186,8 @@ private fun AssetItemSwipeBoxPreview() {
         hasAccount = true,
         priceId = null,
         hasNetworkIssue = false,
-        ecosystem = "Polkadot"
+        ecosystem = "Polkadot",
+        isTestnet = false
     )
 
     Column(modifier = Modifier.padding(horizontal = 16.dp)) {
diff --git a/common/src/main/java/jp/co/soramitsu/common/compose/viewstate/AssetListItemViewState.kt b/common/src/main/java/jp/co/soramitsu/common/compose/viewstate/AssetListItemViewState.kt
@@ -18,7 +18,8 @@ data class AssetListItemViewState(
     val hasAccount: Boolean,
     val priceId: String?,
     val hasNetworkIssue: Boolean,
-    val ecosystem: String?
+    val ecosystem: String?,
+    val isTestnet: Boolean
 ) {
     val key = listOf(ecosystem, chainAssetId, chainId, isHidden).joinToString()
 }
diff --git a/common/src/main/res/drawable/ic_token_testnet.xml b/common/src/main/res/drawable/ic_token_testnet.xml
@@ -4,17 +4,14 @@
     android:viewportWidth="16"
     android:viewportHeight="11">
     <path
-        android:fillAlpha="0.64"
         android:fillColor="#ffffff"
         android:fillType="evenOdd"
         android:pathData="M13.0009,5.4985L10.5314,3.0289L11.592,1.9683L15.1221,5.4985L11.592,9.0286L10.5314,7.968L13.0009,5.4985Z" />
     <path
-        android:fillAlpha="0.64"
         android:fillColor="#ffffff"
         android:fillType="evenOdd"
         android:pathData="M3.0037,5.4984L5.4733,7.968L4.4127,9.0286L0.8825,5.4984L4.4127,1.9683L5.4733,3.0289L3.0037,5.4984Z" />
     <path
-        android:fillAlpha="0.64"
         android:fillColor="#ffffff"
         android:pathData="M9.0266,0.24l1.5662,0.57l-3.6221,9.9517l-1.5662,-0.57z" />
 </vector>
diff --git a/feature-staking-impl/src/main/java/jp/co/soramitsu/staking/impl/presentation/confirm/ConfirmStakingFragment.kt b/feature-staking-impl/src/main/java/jp/co/soramitsu/staking/impl/presentation/confirm/ConfirmStakingFragment.kt
@@ -5,20 +5,21 @@ import androidx.fragment.app.viewModels
 import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.insetter.applyInsetter
-import javax.inject.Inject
+import jp.co.soramitsu.account.api.presentation.actions.setupExternalActions
 import jp.co.soramitsu.common.base.BaseFragment
 import jp.co.soramitsu.common.mixin.impl.observeRetries
 import jp.co.soramitsu.common.mixin.impl.observeValidations
+import jp.co.soramitsu.common.utils.formatCrypto
 import jp.co.soramitsu.common.utils.makeGone
 import jp.co.soramitsu.common.utils.makeVisible
 import jp.co.soramitsu.common.utils.setVisible
 import jp.co.soramitsu.common.view.setProgress
 import jp.co.soramitsu.common.view.viewBinding
 import jp.co.soramitsu.feature_staking_impl.R
 import jp.co.soramitsu.feature_staking_impl.databinding.FragmentConfirmStakeBinding
-import jp.co.soramitsu.account.api.presentation.actions.setupExternalActions
 import jp.co.soramitsu.wallet.api.presentation.mixin.fee.FeeViews
 import jp.co.soramitsu.wallet.api.presentation.mixin.fee.displayFeeStatus
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class ConfirmStakingFragment : BaseFragment<ConfirmStakingViewModel>(R.layout.fragment_confirm_stake) {
@@ -101,7 +102,7 @@ class ConfirmStakingFragment : BaseFragment<ConfirmStakingViewModel>(R.layout.fr
         viewModel.displayAmountLiveData.observe { bondedAmount ->
             binding.confirmStakeAmount.setVisible(bondedAmount != null)
 
-            bondedAmount?.let { binding.confirmStakeAmount.amountInput.setText(it.toString()) }
+            bondedAmount?.let { binding.confirmStakeAmount.amountInput.setText(it.formatCrypto()) }
         }
 
         viewModel.unstakingTime.observe {
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/WalletInteractorImpl.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/WalletInteractorImpl.kt
@@ -16,7 +16,9 @@ import jp.co.soramitsu.common.utils.orZero
 import jp.co.soramitsu.core.models.ChainId
 import jp.co.soramitsu.core.models.isValidAddress
 import jp.co.soramitsu.coredb.model.AssetUpdateItem
+import jp.co.soramitsu.runtime.ext.ecosystem
 import jp.co.soramitsu.runtime.multiNetwork.ChainRegistry
+import jp.co.soramitsu.runtime.multiNetwork.chain.ChainEcosystem
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.Chain
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.isPolkadotOrKusama
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.polkadotChainId
@@ -307,16 +309,23 @@ class WalletInteractorImpl(
         val accountId = metaAccount.accountId(chain)
         val chainAsset = chain.assetsById[chainAssetId] ?: return
 
-        val tokenChains = chainRegistry.currentChains.first().filter {
-            it.assets.any { it.symbolToShow == chainAsset.symbolToShow }
+        val chainsWithAsset = chainRegistry.currentChains.first().filter { chainItem ->
+            val isChainItemFromSameEcosystem = if (chain.ecosystem() == ChainEcosystem.STANDALONE) {
+                chainItem.id == chainId
+            } else {
+                chainItem.ecosystem() == chain.ecosystem()
+            }
+            isChainItemFromSameEcosystem && chainItem.assets.any {
+                it.symbolToShow == chainAsset.symbolToShow
+            }
         }
 
-        val tokenChainAssets = tokenChains.map {
+        val assetsToManage = chainsWithAsset.map {
             it.assets.filter { it.symbolToShow == chainAsset.symbolToShow }
         }.flatten()
 
         accountId?.let {
-            tokenChainAssets.forEach {
+            assetsToManage.forEach {
                 walletRepository.updateAssetHidden(
                     chainAsset = it,
                     metaId = metaAccount.id,
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/list/BalanceListViewModel.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/list/BalanceListViewModel.kt
@@ -344,7 +344,8 @@ class BalanceListViewModel @Inject constructor(
                     hasAccount = true,
                     priceId = chainAsset.priceId,
                     hasNetworkIssue = false,
-                    ecosystem = ChainEcosystem.POLKADOT.name
+                    ecosystem = ChainEcosystem.POLKADOT.name,
+                    isTestnet = chain.isTestNet
                 )
             }.filter { selectedChainId.value == null || selectedChainId.value == it.chainId }
         }
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/list/WalletScreen.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/list/WalletScreen.kt
@@ -138,7 +138,8 @@ private fun PreviewWalletScreen() {
             hasAccount = true,
             priceId = null,
             hasNetworkIssue = false,
-            ecosystem = "Polkadot"
+            ecosystem = "Polkadot",
+            isTestnet = false
         )
     )
 
diff --git a/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/list/model/BalanceListItemModel.kt b/feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/balance/list/model/BalanceListItemModel.kt
@@ -43,5 +43,6 @@ fun BalanceListItemModel.toAssetState() = AssetListItemViewState(
     hasAccount = !hasChainWithoutAccount,
     priceId = asset.priceId,
     hasNetworkIssue = hasNetworkIssue,
-    ecosystem = ecosystem.name
+    ecosystem = ecosystem.name,
+    isTestnet = chain?.isTestNet == true
 )

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,8 @@ private fun AssetItemSwipeBoxPreview() {`
`186`	`186`	`hasAccount = true,`
`187`	`187`	`priceId = null,`
`188`	`188`	`hasNetworkIssue = false,`
`189`		`- ecosystem = "Polkadot"`
	`189`	`+ ecosystem = "Polkadot",`
	`190`	`+ isTestnet = false`
`190`	`191`	`)`
`191`	`192`
`192`	`193`	`Column(modifier = Modifier.padding(horizontal = 16.dp)) {`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,8 @@ class BalanceListViewModel @Inject constructor(`
`344`	`344`	`hasAccount = true,`
`345`	`345`	`priceId = chainAsset.priceId,`
`346`	`346`	`hasNetworkIssue = false,`
`347`		`- ecosystem = ChainEcosystem.POLKADOT.name`
	`347`	`+ ecosystem = ChainEcosystem.POLKADOT.name,`
	`348`	`+ isTestnet = chain.isTestNet`
`348`	`349`	`)`
`349`	`350`	`}.filter { selectedChainId.value == null \|\| selectedChainId.value == it.chainId }`
`350`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,8 @@ private fun PreviewWalletScreen() {`
`138`	`138`	`hasAccount = true,`
`139`	`139`	`priceId = null,`
`140`	`140`	`hasNetworkIssue = false,`
`141`		`- ecosystem = "Polkadot"`
	`141`	`+ ecosystem = "Polkadot",`
	`142`	`+ isTestnet = false`
`142`	`143`	`)`
`143`	`144`	`)`
`144`	`145`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,6 @@ fun BalanceListItemModel.toAssetState() = AssetListItemViewState(`
`43`	`43`	`hasAccount = !hasChainWithoutAccount,`
`44`	`44`	`priceId = asset.priceId,`
`45`	`45`	`hasNetworkIssue = hasNetworkIssue,`
`46`		`- ecosystem = ecosystem.name`
	`46`	`+ ecosystem = ecosystem.name,`
	`47`	`+ isTestnet = chain?.isTestNet == true`
`47`	`48`	`)`