From 476bb30175e75f5713678adf436c910008fa43c4 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 6 Dec 2024 16:31:11 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../main/assets/configs/feature_toggles_config.json | 2 +- .../state/transformers/InitializeWalletsTransformer.kt | 10 ++++++---- .../wallet/state/utils/WalletLoadingStateFactory.kt | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json index f7af0b38fc..c4feab6dbf 100644 --- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json @@ -17,7 +17,7 @@ }, { "name": "ONRAMP_ENABLED", - "version": "undefined" + "version": "5.19.0" }, { "name": "MAIN_ACTION_BUTTONS_ENABLED", diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt index 7ff1da092b..bfa6f1caa6 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt @@ -1,5 +1,6 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers +import com.tangem.domain.common.util.cardTypesResolver import com.tangem.domain.wallets.models.UserWallet import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver @@ -58,7 +59,7 @@ internal class InitializeWalletsTransformer( multiCurrencyCreator = { WalletState.MultiCurrency.Locked( walletCardState = userWallet.toLockedWalletCardState(), - buttons = createMultiWalletEnabledButtons(), + buttons = createMultiWalletEnabledButtons(userWallet), bottomSheetConfig = null, onUnlockNotificationClick = clickIntents::onOpenUnlockWalletsBottomSheetClick, ) @@ -75,7 +76,7 @@ internal class InitializeWalletsTransformer( visaWalletCreator = { WalletState.Visa.Locked( walletCardState = userWallet.toLockedWalletCardState(), - buttons = createMultiWalletEnabledButtons(), + buttons = createMultiWalletEnabledButtons(userWallet), bottomSheetConfig = null, onUnlockNotificationClick = clickIntents::onOpenUnlockWalletsBottomSheetClick, onExploreClick = clickIntents::onExploreClick, @@ -95,8 +96,9 @@ internal class InitializeWalletsTransformer( ) } - private fun createMultiWalletEnabledButtons(): PersistentList { - if (!walletFeatureToggles.isMainActionButtonsEnabled) return persistentListOf() + private fun createMultiWalletEnabledButtons(userWallet: UserWallet): PersistentList { + val isSingleWalletWithToken = userWallet.scanResponse.cardTypesResolver.isSingleWalletWithToken() + if (!walletFeatureToggles.isMainActionButtonsEnabled || isSingleWalletWithToken) return persistentListOf() return persistentListOf( WalletManageButton.Buy(enabled = false, dimContent = false, onClick = {}), diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt index b9aa9f82fd..aa619fe1e2 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt @@ -94,7 +94,8 @@ internal class WalletLoadingStateFactory( } private fun createMultiWalletActions(userWallet: UserWallet): PersistentList { - if (!walletFeatureToggles.isMainActionButtonsEnabled) return persistentListOf() + val isSingleWalletWithToken = userWallet.scanResponse.cardTypesResolver.isSingleWalletWithToken() + if (!walletFeatureToggles.isMainActionButtonsEnabled || isSingleWalletWithToken) return persistentListOf() return persistentListOf( WalletManageButton.Buy(