Merge pull request #805 from soramitsu/merge/staging-to-master

merge/staging-to-master

Author: PankraSerg

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext {
         // App version
         versionName = '2.1.0'
-        versionCode = 81
+        versionCode = 82
 
         // SDK and tools
         compileSdkVersion = 33

common/src/main/java/jp/co/soramitsu/common/compose/viewstate/AssetListItemViewState.kt

@@ -18,5 +18,5 @@ data class AssetListItemViewState(
     val priceId: String?,
     val hasNetworkIssue: Boolean
 ) {
-    val key = listOf(chainAssetId, chainId).joinToString()
+    val key = listOf(chainAssetId, chainId, isHidden).joinToString()
 }

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

@@ -87,10 +87,6 @@ interface WalletInteractor {
 
     suspend fun updateAssets(newItems: List<AssetUpdateItem>)
 
-    suspend fun enableCustomAssetSorting()
-
-    suspend fun customAssetSortingEnabled(): Boolean
-
     suspend fun markAssetAsHidden(chainId: ChainId, chainAssetId: String)
 
     suspend fun markAssetAsShown(chainId: ChainId, chainAssetId: String)

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/data/buyToken/RampProvider.kt

@@ -5,11 +5,12 @@ import android.content.Context
 import android.net.Uri
 import jp.co.soramitsu.common.utils.showBrowser
 import jp.co.soramitsu.feature_wallet_impl.R
-import jp.co.soramitsu.wallet.impl.domain.model.BuyTokenRegistry
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.Chain
+import jp.co.soramitsu.wallet.impl.domain.model.BuyTokenRegistry
 
 private const val RAMP_APP_NAME = "Fearless Wallet"
-private const val RAMP_APP_LOGO = "https://raw.githubusercontent.com/sora-xor/sora-branding/master/Fearless-Wallet-brand/fearless-wallet-logo-ramp.png"
+private const val RAMP_APP_LOGO =
+    "https://raw.githubusercontent.com/soramitsu/fearless-Android/dff3ebbed4a125621732ee039f2bc74c74f5b58f/common/src/main/res/drawable-xxxhdpi/ic_wallet.png"
 
 class RampProvider(
     private val host: String,
@@ -44,7 +45,7 @@ class RampProvider(
             return Uri.Builder()
                 .scheme("https")
                 .authority(host)
-                .appendQueryParameter("swapAsset", chainAsset.symbol)
+                .appendQueryParameter("swapAsset", chainAsset.symbol.uppercase())
                 .appendQueryParameter("userAddress", address)
                 .appendQueryParameter("hostApiKey", apiToken)
                 .appendQueryParameter("hostAppName", RAMP_APP_NAME)

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

@@ -36,6 +36,7 @@ import jp.co.soramitsu.wallet.impl.domain.model.TransferValidityStatus
 import jp.co.soramitsu.wallet.impl.domain.model.WalletAccount
 import jp.co.soramitsu.wallet.impl.domain.model.toPhishingModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
@@ -45,7 +46,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.withIndex
 import kotlinx.coroutines.withContext
 
-private const val CUSTOM_ASSET_SORTING_PREFS_KEY = "customAssetSorting-"
 private const val QR_PREFIX_SUBSTRATE = "substrate"
 private const val PREFS_WALLET_SELECTED_CHAIN_ID = "wallet_selected_chain_id"
 
@@ -60,6 +60,7 @@ class WalletInteractorImpl(
     private val updatesMixin: UpdatesMixin
 ) : WalletInteractor, UpdatesProviderUi by updatesMixin {
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     override fun assetsFlow(): Flow<List<AssetWithStatus>> {
         return updatesMixin.tokenRatesUpdate.map {
             it.isNotEmpty()
@@ -72,10 +73,7 @@ class WalletInteractorImpl(
                     }
                     .filter { it.isNotEmpty() }
                     .map { assets ->
-                        when {
-                            customAssetSortingEnabled() -> assets.sortedBy { it.asset.sortIndex }
-                            else -> assets.sortedWith(defaultAssetListSort())
-                        }
+                        assets.sortedWith(defaultAssetListSort())
                     }
             }
     }
@@ -267,16 +265,6 @@ class WalletInteractorImpl(
 
     override suspend fun getChainAddressForSelectedMetaAccount(chainId: ChainId) = getSelectedMetaAccount().address(getChain(chainId))
 
-    override suspend fun customAssetSortingEnabled(): Boolean {
-        val metaId = accountRepository.getSelectedMetaAccount().id
-        return preferences.getBoolean("$CUSTOM_ASSET_SORTING_PREFS_KEY$metaId", false)
-    }
-
-    override suspend fun enableCustomAssetSorting() {
-        val metaId = accountRepository.getSelectedMetaAccount().id
-        preferences.putBoolean("$CUSTOM_ASSET_SORTING_PREFS_KEY$metaId", true)
-    }
-
     override suspend fun markAssetAsHidden(chainId: ChainId, chainAssetId: String) {
         manageAssetHidden(chainId, chainAssetId, true)
     }