fix/1689_1695_skeleton_issues

core-db/src/main/java/jp/co/soramitsu/core_db/dao/TokenDao.kt

@@ -19,6 +19,9 @@ abstract class TokenDao {
     @Query("select * from tokens where symbol = :symbol")
     abstract fun observeToken(symbol: String): Flow<TokenLocal>
 
+    @Query("delete from tokens")
+    abstract suspend fun clearTokens()
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract suspend fun insertToken(token: TokenLocal)
 

feature-wallet-api/src/main/java/jp/co/soramitsu/feature_wallet_api/data/cache/AssetCache.kt

@@ -64,6 +64,8 @@ class AssetCache(
         }
     }
 
+    suspend fun clearTokens() = tokenDao.clearTokens()
+
     suspend fun updateToken(
         symbol: String,
         builder: (local: TokenLocal) -> TokenLocal,

feature-wallet-api/src/main/java/jp/co/soramitsu/feature_wallet_api/domain/interfaces/WalletInteractor.kt

@@ -88,4 +88,6 @@ interface WalletInteractor {
     suspend fun enableCustomAssetSorting()
 
     suspend fun customAssetSortingEnabled(): Boolean
+
+    suspend fun clearTokens()
 }

feature-wallet-api/src/main/java/jp/co/soramitsu/feature_wallet_api/domain/interfaces/WalletRepository.kt

@@ -89,4 +89,6 @@ interface WalletRepository {
     suspend fun getAccountFreeBalance(chainId: ChainId, accountId: AccountId): BigInteger
 
     suspend fun updateAssets(newItems: List<AssetUpdateItem>)
+
+    suspend fun clearTokens()
 }

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt

@@ -336,6 +336,10 @@ class WalletRepositoryImpl(
         assetCache.updateAsset(newItems)
     }
 
+    override suspend fun clearTokens() {
+        assetCache.clearTokens()
+    }
+
     private fun createOperation(
         hash: String,
         transfer: Transfer,

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/domain/WalletInteractorImpl.kt

@@ -292,4 +292,8 @@ class WalletInteractorImpl(
         val metaId = accountRepository.getSelectedMetaAccount().id
         preferences.putBoolean("$CUSTOM_ASSET_SORTING_PREFS_KEY$metaId", true)
     }
+
+    override suspend fun clearTokens() {
+        walletRepository.clearTokens()
+    }
 }

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/balance/list/BalanceListAdapter.kt

@@ -43,6 +43,7 @@ import java.math.BigDecimal
 val fiatRateExtractor = { item: AssetWithStateModel -> item.asset.token.fiatRate }
 val recentChangeExtractor = { item: AssetWithStateModel -> item.asset.token.recentRateChange }
 val totalExtractor = { item: AssetWithStateModel -> item.asset.total }
+val stateExtractor = { item: AssetWithStateModel -> item.state }
 
 class BalanceListAdapter(
     private val imageLoader: ImageLoader,
@@ -70,6 +71,7 @@ class BalanceListAdapter(
 
         resolvePayload(holder, position, payloads) {
             when (it) {
+                stateExtractor -> holder.bindState(model)
                 fiatRateExtractor -> holder.bindFiatInfo(model)
                 recentChangeExtractor -> holder.bindRecentChange(model)
                 totalExtractor -> holder.bindTotal(model)
@@ -97,32 +99,20 @@ class AssetViewHolder(
 
     fun bind(model: AssetWithStateModel, itemHandler: BalanceListAdapter.ItemAssetHandler) {
         val asset = model.asset
-        val state = model.state
 
         content.itemAssetImage.load(asset.token.configuration.iconUrl, imageLoader)
         shimmer.itemAssetImage.load(asset.token.configuration.iconUrl, imageLoader)
-        content.itemAssetImage.setVisible(state.chainUpdate == false, View.INVISIBLE)
-        shimmer.itemAssetImage.setVisible(state.chainUpdate != false, View.INVISIBLE)
 
         content.itemAssetNetwork.text = asset.token.configuration.name
         shimmer.itemAssetNetwork.text = asset.token.configuration.name
-        content.itemAssetNetwork.setVisible(state.chainUpdate == false, View.INVISIBLE)
-        shimmer.itemAssetNetwork.setVisible(state.chainUpdate != false, View.INVISIBLE)
 
         content.itemAssetToken.text = asset.token.configuration.symbol
         shimmer.itemAssetToken.text = asset.token.configuration.symbol
-        content.itemAssetToken.setVisible(state.chainUpdate == false, View.INVISIBLE)
-        shimmer.itemAssetToken.setVisible(state.chainUpdate != false, View.INVISIBLE)
 
         content.networkBadge.setText(asset.token.configuration.chainName)
         content.networkBadge.setIcon(asset.token.configuration.chainIcon, imageLoader)
         shimmer.networkBadge.setText(asset.token.configuration.chainName)
         shimmer.networkBadge.setIcon(asset.token.configuration.chainIcon, imageLoader)
-        content.networkBadge.isVisible = !asset.token.configuration.isNative && state.chainUpdate == false
-        shimmer.networkBadge.isVisible = !asset.token.configuration.isNative && state.chainUpdate != false
-
-        content.testnetBadge.isVisible = asset.token.configuration.isTestNet == true && state.chainUpdate == false
-        shimmer.testnetBadge.isVisible = asset.token.configuration.isTestNet == true && state.chainUpdate != false
 
         content.setOnClickListener { itemHandler.assetClicked(asset) }
         shimmer.setOnClickListener { itemHandler.assetClicked(asset) }
@@ -131,6 +121,29 @@ class AssetViewHolder(
         content.chainAssetNameBadge.background = content.context.getCutLeftBottomCornerDrawableFromColors()
         shimmer.chainAssetNameBadge.text = asset.chainAccountName
         shimmer.chainAssetNameBadge.background = content.context.getCutLeftBottomCornerDrawableFromColors()
+
+        bindState(model)
+    }
+
+    fun bindState(model: AssetWithStateModel) {
+        val asset = model.asset
+        val state = model.state
+
+        content.itemAssetImage.setVisible(state.chainUpdate == false, View.INVISIBLE)
+        shimmer.itemAssetImage.setVisible(state.chainUpdate != false, View.INVISIBLE)
+
+        content.itemAssetNetwork.setVisible(state.chainUpdate == false, View.INVISIBLE)
+        shimmer.itemAssetNetwork.setVisible(state.chainUpdate != false, View.INVISIBLE)
+
+        content.itemAssetToken.setVisible(state.chainUpdate == false, View.INVISIBLE)
+        shimmer.itemAssetToken.setVisible(state.chainUpdate != false, View.INVISIBLE)
+
+        content.networkBadge.isVisible = !asset.token.configuration.isNative && state.chainUpdate == false
+        shimmer.networkBadge.isVisible = !asset.token.configuration.isNative && state.chainUpdate != false
+
+        content.testnetBadge.isVisible = asset.token.configuration.isTestNet == true && state.chainUpdate == false
+        shimmer.testnetBadge.isVisible = asset.token.configuration.isTestNet == true && state.chainUpdate != false
+
         content.chainAssetNameBadge.isVisible = !asset.chainAccountName.isNullOrEmpty() && state.chainUpdate == false
         shimmer.chainAssetNameBadge.isVisible = !asset.chainAccountName.isNullOrEmpty() && state.chainUpdate != false
 
@@ -195,12 +208,11 @@ private object AssetDiffCallback : DiffUtil.ItemCallback<AssetWithStateModel>()
         return oldItem == newItem
     }
 
-    // todo restore logic
-//    override fun getChangePayload(oldItem: AssetWithStateModel, newItem: AssetWithStateModel): Any? {
-//        return AssetPayloadGenerator.diff(oldItem, newItem)
-//    }
+    override fun getChangePayload(oldItem: AssetWithStateModel, newItem: AssetWithStateModel): Any? {
+        return AssetPayloadGenerator.diff(oldItem, newItem)
+    }
 }
 
 private object AssetPayloadGenerator : PayloadGenerator<AssetWithStateModel>(
-    fiatRateExtractor, recentChangeExtractor, totalExtractor
+    fiatRateExtractor, recentChangeExtractor, totalExtractor, stateExtractor
 )

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/balance/list/BalanceListFragment.kt

@@ -37,6 +37,8 @@ class BalanceListFragment : BaseFragment<BalanceListViewModel>(), BalanceListAda
 
     private lateinit var adapter: BalanceListAdapter
 
+    private var previousFiat: String? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -104,6 +106,13 @@ class BalanceListFragment : BaseFragment<BalanceListViewModel>(), BalanceListAda
             walletContainer.isRefreshing = false
         }
 
+        viewModel.fiatSymbolFlow.observe {
+            if (previousFiat != it) {
+                viewModel.clearTokens()
+                previousFiat = it
+            }
+        }
+
         viewModel.showFiatChooser.observeEvent(::showFiatChooser)
     }
 

feature-wallet-impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/balance/list/BalanceListViewModel.kt

@@ -54,10 +54,10 @@ class BalanceListViewModel(
 
     val currentAddressModelLiveData = currentAddressModelFlow().asLiveData()
 
-    private val fiatSymbolLiveData =
-        combine(selectedFiat.flow(), getAvailableFiatCurrencies.flow()) { selectedFiat: String, fiatCurrencies: FiatCurrencies ->
-            fiatCurrencies[selectedFiat]?.symbol
-        }.asLiveData()
+    val fiatSymbolFlow = combine(selectedFiat.flow(), getAvailableFiatCurrencies.flow()) { selectedFiat: String, fiatCurrencies: FiatCurrencies ->
+        fiatCurrencies[selectedFiat]?.symbol
+    }
+    private val fiatSymbolLiveData = fiatSymbolFlow.asLiveData()
     private val assetModelsLiveData = assetModelsFlow().asLiveData()
 
     val balanceLiveData = mediateWith(
@@ -139,4 +139,10 @@ class BalanceListViewModel(
             selectedFiat.set(item.id)
         }
     }
+
+    fun clearTokens() {
+        launch {
+            interactor.clearTokens()
+        }
+    }
 }