From 580855d82c35701d0c22b95f95194e06ac54720f Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 16 Jan 2023 22:05:39 +0300 Subject: [PATCH 1/4] Updated on 2026-08-14 --- .../onboarding/products/twins/redux/TwinCardsMiddleware.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt index e9cb977dc5..f378c7080f 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt @@ -26,6 +26,7 @@ import com.tangem.tap.domain.TapError import com.tangem.tap.domain.extensions.makePrimaryWalletManager import com.tangem.tap.domain.model.builders.UserWalletIdBuilder import com.tangem.tap.domain.twins.TwinCardsManager +import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE import com.tangem.tap.features.onboarding.OnboardingHelper import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE import com.tangem.tap.features.wallet.models.Currency @@ -331,6 +332,6 @@ private fun handle(action: Action, dispatch: DispatchFunction) { scanResponse = action.scanResponse, ) } - else -> {} + else -> Unit } } \ No newline at end of file From 4bb41656f836bc192240ff7b05f3984b793690b7 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 17 Jan 2023 20:38:29 +0300 Subject: [PATCH 2/4] Updated on 2026-08-14 --- .../configurable/config/ConfigManager.kt | 82 +++++++------------ 1 file changed, 29 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt index d6d05ac254..a79f3452b0 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/config/ConfigManager.kt @@ -39,7 +39,7 @@ class ConfigManager { fun load(configLoader: Loader, onComplete: ((config: Config) -> Unit)? = null) { configLoader.load { configModel -> setupFeature(configModel.features) - setupKey(configModel.configValues) + setupConfigValues(configModel.configValues) onComplete?.invoke(config) } } @@ -77,67 +77,43 @@ class ConfigManager { ) } - @Suppress("LongMethod") - private fun setupKey(configValues: ConfigValueModel?) { + private fun setupConfigValues(configValues: ConfigValueModel?) { val values = configValues ?: return - config = config.copy( - coinMarketCapKey = values.coinMarketCapKey, - moonPayApiKey = values.moonPayApiKey, - moonPayApiSecretKey = values.moonPayApiSecretKey, - mercuryoWidgetId = values.mercuryoWidgetId, - mercuryoSecret = values.mercuryoSecret, + + config = createConfig(config, values) + defaultConfig = config.copy() + } + + private fun createConfig(config: Config, configValues: ConfigValueModel): Config { + return config.copy( + coinMarketCapKey = configValues.coinMarketCapKey, + moonPayApiKey = configValues.moonPayApiKey, + moonPayApiSecretKey = configValues.moonPayApiSecretKey, + mercuryoWidgetId = configValues.mercuryoWidgetId, + mercuryoSecret = configValues.mercuryoSecret, blockchainSdkConfig = BlockchainSdkConfig( blockchairCredentials = BlockchairCredentials( - apiKey = values.blockchairApiKeys, - authToken = values.blockchairAuthorizationToken, + apiKey = configValues.blockchairApiKeys, + authToken = configValues.blockchairAuthorizationToken, ), - blockcypherTokens = values.blockcypherTokens, + blockcypherTokens = configValues.blockcypherTokens, quickNodeCredentials = QuickNodeCredentials( - apiKey = values.quiknodeApiKey, - subdomain = values.quiknodeSubdomain, + apiKey = configValues.quiknodeApiKey, + subdomain = configValues.quiknodeSubdomain, ), bscQuickNodeCredentials = QuickNodeCredentials( - apiKey = values.bscQuiknodeApiKey, - subdomain = values.bscQuiknodeSubdomain, + apiKey = configValues.bscQuiknodeApiKey, + subdomain = configValues.bscQuiknodeSubdomain, ), - infuraProjectId = values.infuraProjectId, - tronGridApiKey = values.tronGridApiKey, - saltPayAuthToken = values.saltPay.credentials.token, + infuraProjectId = configValues.infuraProjectId, + tronGridApiKey = configValues.tronGridApiKey, + saltPayAuthToken = configValues.saltPay.credentials.token, ), - appsFlyerDevKey = values.appsFlyer.appsFlyerDevKey, - amplitudeApiKey = values.amplitudeApiKey, - shopify = values.shopifyShop, - zendesk = values.zendesk, - saltPayConfig = values.saltPay, - ) - defaultConfig = defaultConfig.copy( - coinMarketCapKey = values.coinMarketCapKey, - moonPayApiKey = values.moonPayApiKey, - moonPayApiSecretKey = values.moonPayApiSecretKey, - mercuryoWidgetId = values.mercuryoWidgetId, - mercuryoSecret = values.mercuryoSecret, - blockchainSdkConfig = BlockchainSdkConfig( - blockchairCredentials = BlockchairCredentials( - apiKey = values.blockchairApiKeys, - authToken = values.blockchairAuthorizationToken, - ), - blockcypherTokens = values.blockcypherTokens, - quickNodeCredentials = QuickNodeCredentials( - apiKey = values.quiknodeApiKey, - subdomain = values.quiknodeSubdomain, - ), - bscQuickNodeCredentials = QuickNodeCredentials( - apiKey = values.bscQuiknodeApiKey, - subdomain = values.bscQuiknodeSubdomain, - ), - infuraProjectId = values.infuraProjectId, - saltPayAuthToken = values.saltPay.credentials.token, - ), - appsFlyerDevKey = values.appsFlyer.appsFlyerDevKey, - amplitudeApiKey = values.amplitudeApiKey, - shopify = values.shopifyShop, - zendesk = values.zendesk, - saltPayConfig = values.saltPay, + appsFlyerDevKey = configValues.appsFlyer.appsFlyerDevKey, + amplitudeApiKey = configValues.amplitudeApiKey, + shopify = configValues.shopifyShop, + zendesk = configValues.zendesk, + saltPayConfig = configValues.saltPay, ) } From fd9f02d3d70b16203a091e3d01598f557e3d02f0 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 19 Jan 2023 18:11:39 +0800 Subject: [PATCH 3/4] Updated on 2026-08-14 --- .../tokens/ui/compose/currencyItem/CurrencyItemHeader.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt index cc8562ac62..506d6a0793 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt @@ -34,6 +34,8 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.core.ui.extensions.getActiveIconRes import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.tap.common.extensions.getGreyedOutIconRes +import com.tangem.tap.common.extensions.getRoundIconRes +import com.tangem.tap.domain.tokens.Contract import com.tangem.tap.domain.tokens.Currency import com.tangem.tap.features.tokens.redux.TokenWithBlockchain import com.tangem.tap.features.tokens.ui.compose.CurrencyPlaceholderIcon @@ -141,7 +143,7 @@ private fun NetworksRow( addedBlockchains = addedBlockchains, ) } else { - val isAdded = addedTokens.map { it.token.contractAddress }.contains(contract.address) + val isAdded = addedTokens.any(contract::isInclude) val iconResId = if (isAdded) { getActiveIconRes(contract.blockchain.id) } else { @@ -206,4 +208,7 @@ private fun BlockchainNetworkItem( } Spacer(modifier = Modifier.size(5.dp)) } -} \ No newline at end of file +} + +private fun Contract.isInclude(addedToken: TokenWithBlockchain): Boolean = + address == addedToken.token.contractAddress && blockchain == addedToken.blockchain \ No newline at end of file From 52b22ac95d27cbe1d0d3faf84338daf8467021fa Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 1 Feb 2023 08:57:22 +0300 Subject: [PATCH 4/4] Updated on 2026-08-14 --- .../tokens/ui/compose/currencyItem/CurrencyItemHeader.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt index 506d6a0793..bcc681addb 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyItemHeader.kt @@ -34,7 +34,6 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.core.ui.extensions.getActiveIconRes import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.tap.common.extensions.getGreyedOutIconRes -import com.tangem.tap.common.extensions.getRoundIconRes import com.tangem.tap.domain.tokens.Contract import com.tangem.tap.domain.tokens.Currency import com.tangem.tap.features.tokens.redux.TokenWithBlockchain