From ee1cf2a65408ba518026bb68fd7e4bf9bfd7edd3 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 8 Jul 2022 11:45:37 +0300 Subject: [PATCH 01/15] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- .../wallet/ui/images/CurrencyIconRequest.kt | 136 +++++++++++++----- 2 files changed, 98 insertions(+), 40 deletions(-) diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 7f058ec409..f50133547b 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 7f058ec409b4eaaf8688ecd4bf944ef8d58d3564 +Subproject commit f50133547b5e19fb7ad32e64370573d60f6791fd diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt index 99051bc72d..fb75bc6474 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt @@ -1,12 +1,9 @@ package com.tangem.tap.features.wallet.ui.images -import android.graphics.PorterDuff -import android.graphics.PorterDuffColorFilter import android.widget.ImageView import android.widget.TextView import androidx.constraintlayout.utils.widget.ImageFilterView import coil.imageLoader -import coil.load import coil.request.ImageRequest import coil.transform.RoundedCornersTransformation import com.tangem.blockchain.common.Blockchain @@ -29,57 +26,112 @@ fun loadCurrencyIcon( token: Token?, blockchain: Blockchain, ) { - when { - token == null -> currencyImageView.loadIcon( - iconUrl = getIconUrl(blockchain.toNetworkId()), - placeholderRes = blockchain.getRoundIconRes(), + CurrencyIconLoader( + currencyImageView = currencyImageView, + currencyTextView = currencyTextView, + token = token, + blockchain = blockchain + ) + .load() +} + +private class CurrencyIconLoader( + private val currencyImageView: ImageFilterView, + private val currencyTextView: TextView, + private val token: Token?, + private val blockchain: Blockchain, +) { + fun load() { + when { + token == null && blockchain.isTestnet() -> loadTestnetBlockchainIcon() + token == null -> loadBlockchainIcon() + blockchain.isTestnet() -> loadTestnetTokenIcon() + else -> loadTokenIcon() + } + } + + private fun loadBlockchainIcon() { + loadBlockchainIconBase( onStart = { - if (blockchain.isTestnet()) { - currencyImageView.saturation = 0f - } else { - currencyImageView.colorFilter = null - } + currencyImageView.colorFilter = null } ) - token.symbol == QCX -> currencyImageView.load(R.drawable.ic_qcx) - token.symbol == VOYR -> currencyImageView.load(R.drawable.ic_voyr) - else -> currencyImageView.loadIcon( - iconUrl = getTokenIconUrl(token, blockchain), + } + + private fun loadTestnetBlockchainIcon() { + loadBlockchainIconBase( + onStart = { + currencyImageView.saturation = 0f + } + ) + } + + private fun loadTokenIcon() { + loadTokenIconBase( + onStart = { + currencyImageView.setColorFilter(it.getColor()) + }, + onSuccess = { + currencyImageView.colorFilter = null + } + ) + } + + private fun loadTestnetTokenIcon() { + loadTokenIconBase( + onStart = { + currencyImageView.saturation = 0f + } + ) + } + + private inline fun loadBlockchainIconBase( + crossinline onStart: (Blockchain) -> Unit = {}, + crossinline onSuccess: (Blockchain) -> Unit = {}, + crossinline onError: (Blockchain) -> Unit = {}, + ) { + currencyImageView.loadIcon( + data = getIconUrl(blockchain.toNetworkId()), + placeholderRes = blockchain.getRoundIconRes(), + onStart = { onStart(blockchain) }, + onSuccess = { onSuccess(blockchain) }, + onError = { onError(blockchain) }, + ) + } + + private inline fun loadTokenIconBase( + crossinline onStart: (Token) -> Unit = {}, + crossinline onSuccess: (Token) -> Unit = {}, + crossinline onError: (Token) -> Unit = {}, + ) { + if (token == null) return + + currencyImageView.loadIcon( + data = getTokenIcon(token, blockchain), placeholderRes = R.drawable.shape_circle, onStart = { currencyTextView.text = token.symbol.take(1) currencyTextView.setTextColor(token.getTextColor()) - - if (blockchain.isTestnet()) { - currencyImageView.saturation = 0f - } - }, - onError = { - currencyImageView.colorFilter = PorterDuffColorFilter( - /* color = */ - token.getColor(), - /* mode = */ - PorterDuff.Mode.SRC_ATOP, - ) + onStart(token) }, onSuccess = { - if (!blockchain.isTestnet()) { - currencyImageView.colorFilter = null - } - } + currencyTextView.text = null + onSuccess(token) + }, + onError = { onError(token) }, ) } } private inline fun ImageView.loadIcon( - iconUrl: String?, + data: Any?, placeholderRes: Int, crossinline onStart: () -> Unit = {}, crossinline onSuccess: () -> Unit = {}, crossinline onError: () -> Unit = {}, ) { ImageRequest.Builder(context) - .data(iconUrl) + .data(data) .placeholder(placeholderRes) .error(placeholderRes) .fallback(placeholderRes) @@ -101,9 +153,15 @@ private inline fun ImageView.loadIcon( .also(context.imageLoader::enqueue) } -private fun getTokenIconUrl(token: Token, blockchain: Blockchain): String? { - return token.id?.let(::getIconUrl) - ?: token.getCustomIconUrl() - ?: IconsUtil.getTokenIconUri(blockchain, token) - ?.toString() +private fun getTokenIcon(token: Token, blockchain: Blockchain): Any? { + return when (token.symbol) { + QCX -> R.drawable.ic_qcx + VOYR -> R.drawable.ic_voyr + else -> { + token.id?.let(::getIconUrl) + ?: token.getCustomIconUrl() + ?: IconsUtil.getTokenIconUri(blockchain, token) + ?.toString() + } + } } \ No newline at end of file From 17066df7412040e1eacfbfd0785a7ea398c978ca Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 8 Jul 2022 12:57:20 +0300 Subject: [PATCH 02/15] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- .../tap/common/extensions/WalletManager.kt | 4 +- .../tap/common/redux/global/GlobalAction.kt | 11 +- .../common/redux/global/GlobalMidlleware.kt | 180 ++++++++++-------- .../tap/common/redux/global/GlobalReducer.kt | 4 +- .../tap/common/redux/global/GlobalState.kt | 2 +- .../configurable/config/ConfigManager.kt | 6 +- .../domain/configurable/config/JsonModels.kt | 2 +- .../extensions/CurrencyExchangeManager.kt | 57 ------ .../tap/features/home/redux/HomeMiddleware.kt | 2 +- .../features/onboarding/OnboardingManager.kt | 2 +- .../note/redux/OnboardingNoteState.kt | 5 +- .../products/twins/redux/TwinCardsState.kt | 5 +- .../tap/features/wallet/redux/WalletState.kt | 15 +- .../middlewares/TradeCryptoMiddleware.kt | 10 +- .../redux/reducers/OnWalletLoadedReducer.kt | 4 +- .../wallet/redux/reducers/WalletReducer.kt | 23 +-- .../wallet/ui/WalletDetailsFragment.kt | 26 +-- .../wallet/ui/wallet/SingleWalletView.kt | 20 +- .../CurrencyExchangeManager.kt | 69 ++----- .../exchangeServices/ExchangeService.kt | 29 +++ .../exchangeServices/mercuryo/MercuryoApi.kt | 57 ++++++ .../mercuryo/MercuryoService.kt | 127 ++++++++++++ .../moonpay/MoonPayService.kt | 52 ++--- .../exchangeServices/onramper/OnnramperApi.kt | 83 -------- .../onramper/OnramperService.kt | 116 ----------- 26 files changed, 407 insertions(+), 506 deletions(-) delete mode 100644 app/src/main/java/com/tangem/tap/domain/extensions/CurrencyExchangeManager.kt create mode 100644 app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt create mode 100644 app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoApi.kt create mode 100644 app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt delete mode 100644 app/src/main/java/com/tangem/tap/network/exchangeServices/onramper/OnnramperApi.kt delete mode 100644 app/src/main/java/com/tangem/tap/network/exchangeServices/onramper/OnramperService.kt diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 7f058ec409..feec295055 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 7f058ec409b4eaaf8688ecd4bf944ef8d58d3564 +Subproject commit feec2950551a1dbabbb018b446b25e17442db21f diff --git a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt index d671b60a29..40acdd1b7d 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt @@ -49,11 +49,11 @@ suspend fun WalletManager.safeUpdate(): Result = try { fun WalletManager?.getToUpUrl(): String? { val globalState = store.state.globalState - val currencyExchangeManager = globalState.currencyExchangeManager ?: return null + val exchangeManager = globalState.exchangeManager ?: return null val wallet = this?.wallet ?: return null val defaultAddress = wallet.address - return currencyExchangeManager.getUrl( + return exchangeManager.getUrl( action = CurrencyExchangeManager.Action.Buy, blockchain = wallet.blockchain, cryptoCurrencyName = wallet.blockchain.currency, diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt index b871b7853f..540209a39c 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt @@ -15,7 +15,6 @@ import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager import com.tangem.tap.features.details.redux.SecurityOption import com.tangem.tap.features.feedback.EmailData import com.tangem.tap.features.feedback.FeedbackManager -import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager import org.rekotlin.Action sealed class GlobalAction : Action { @@ -77,7 +76,13 @@ sealed class GlobalAction : Action { data class SendFeedback(val emailData: EmailData) : GlobalAction() data class UpdateFeedbackInfo(val walletManagers: List) : GlobalAction() - object InitCurrencyExchangeManager : GlobalAction() { - data class Success(val exchangeManager: CurrencyExchangeManager) : GlobalAction() + object ExchangeManager : GlobalAction() { + object Init : GlobalAction() { + data class Success( + val exchangeManager: com.tangem.tap.network.exchangeServices.CurrencyExchangeManager, + ) : GlobalAction() + } + + object Update : GlobalAction() } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt index 1e104b5dd4..9777538858 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt @@ -2,9 +2,11 @@ package com.tangem.tap.common.redux.global import com.tangem.common.CompletionResult import com.tangem.common.core.TangemSdkError +import com.tangem.common.extensions.guard import com.tangem.common.extensions.ifNotNull import com.tangem.domain.common.extensions.withMainContext import com.tangem.tap.* +import com.tangem.tap.common.extensions.dispatchDebugErrorNotification import com.tangem.tap.common.extensions.dispatchDialogShow import com.tangem.tap.common.extensions.dispatchOnMain import com.tangem.tap.common.redux.AppDialog @@ -13,9 +15,12 @@ import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager import com.tangem.tap.features.send.redux.SendAction import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager +import com.tangem.tap.network.exchangeServices.mercuryo.MercuryoApi +import com.tangem.tap.network.exchangeServices.mercuryo.MercuryoService import com.tangem.tap.network.exchangeServices.moonpay.MoonPayService -import com.tangem.tap.network.exchangeServices.onramper.OnramperService import kotlinx.coroutines.launch +import org.rekotlin.Action +import org.rekotlin.DispatchFunction import org.rekotlin.Middleware class GlobalMiddleware { @@ -24,94 +29,105 @@ class GlobalMiddleware { } } -private val globalMiddlewareHandler: Middleware = { _, appState -> +private val globalMiddlewareHandler: Middleware = { dispatch, appState -> { nextDispatch -> { action -> - when (action) { - is GlobalAction.ScanFailsCounter.ChooseBehavior -> { - when (action.result) { - is CompletionResult.Success -> store.dispatch(GlobalAction.ScanFailsCounter.Reset) + handleAction(action, appState, dispatch) + nextDispatch(action) + } + } +} + +private fun handleAction(action: Action, appState: () -> AppState?, dispatch: DispatchFunction) { + when (action) { + is GlobalAction.ScanFailsCounter.ChooseBehavior -> { + when (action.result) { + is CompletionResult.Success -> store.dispatch(GlobalAction.ScanFailsCounter.Reset) + is CompletionResult.Failure -> { + if (action.result.error is TangemSdkError.UserCancelled) { + store.dispatch(GlobalAction.ScanFailsCounter.Increment) + if (store.state.globalState.scanCardFailsCounter >= 2) { + store.dispatchDialogShow(AppDialog.ScanFailsDialog) + } + } else { + store.dispatch(GlobalAction.ScanFailsCounter.Reset) + } + } + } + } + is GlobalAction.RestoreAppCurrency -> { + store.dispatch(GlobalAction.RestoreAppCurrency.Success( + preferencesStorage.fiatCurrenciesPrefStorage.getAppCurrency() + )) + } + is GlobalAction.HideWarningMessage -> { + store.state.globalState.warningManager?.let { + if (it.hideWarning(action.warning)) { + if (WarningMessagesManager.isAlreadySignedHashesWarning(action.warning)) { + //TODO: No appropriate warningMessage identification. Make it better later + store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId) + } + + store.dispatch(WalletAction.Warnings.Update) + store.dispatch(SendAction.Warnings.Update) + } + } + } + is GlobalAction.SendFeedback -> { + store.state.globalState.feedbackManager?.send(action.emailData) + } + is GlobalAction.UpdateWalletSignedHashes -> { + store.dispatch(WalletAction.Warnings.CheckRemainingSignatures(action.remainingSignatures)) + } + is GlobalAction.UpdateFeedbackInfo -> { + store.state.globalState.feedbackManager?.infoHolder + ?.setWalletsInfo(action.walletManagers) + } + is GlobalAction.ExchangeManager.Init -> { + val config = appState()?.globalState?.configManager?.config + ifNotNull( + config?.mercuryoWidgetId, + config?.moonPayApiKey, + config?.moonPayApiSecretKey, + ) { mercuryoWidgetId, moonPayKey, moonPaySecretKey -> + scope.launch { + val buyService = MercuryoService(MercuryoApi.API_VERSION, mercuryoWidgetId) + val sellService = MoonPayService(moonPayKey, moonPaySecretKey) + val exchangeManager = CurrencyExchangeManager(buyService, sellService) + store.dispatchOnMain(GlobalAction.ExchangeManager.Init.Success(exchangeManager)) + store.dispatchOnMain(GlobalAction.ExchangeManager.Update) + } + } + } + is GlobalAction.ExchangeManager.Init.Success -> {} + is GlobalAction.ExchangeManager.Update -> { + val exchangeManager = appState()?.globalState?.exchangeManager.guard { + store.dispatchDebugErrorNotification("exchangeManager is not initialized") + return + } + scope.launch { exchangeManager.update() } + } + is GlobalAction.ScanCard -> { + scope.launch { + val result = tangemSdkManager.scanProduct( + store.state.globalState.analyticsHandlers, + currenciesRepository, + action.additionalBlockchainsToDerive, + action.messageResId + ) + withMainContext { + store.dispatch(GlobalAction.ScanFailsCounter.ChooseBehavior(result)) + when (result) { + is CompletionResult.Success -> { + tangemSdkManager.changeDisplayedCardIdNumbersCount(result.data) + action.onSuccess?.invoke(result.data) + } is CompletionResult.Failure -> { - if (action.result.error is TangemSdkError.UserCancelled) { - store.dispatch(GlobalAction.ScanFailsCounter.Increment) - if (store.state.globalState.scanCardFailsCounter >= 2) { - store.dispatchDialogShow(AppDialog.ScanFailsDialog) - } - } else { - store.dispatch(GlobalAction.ScanFailsCounter.Reset) - } - } - } - } - is GlobalAction.RestoreAppCurrency -> { - store.dispatch(GlobalAction.RestoreAppCurrency.Success( - preferencesStorage.fiatCurrenciesPrefStorage.getAppCurrency() - )) - } - is GlobalAction.HideWarningMessage -> { - store.state.globalState.warningManager?.let { - if (it.hideWarning(action.warning)) { - if (WarningMessagesManager.isAlreadySignedHashesWarning(action.warning)) { - //TODO: No appropriate warningMessage identification. Make it better later - store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId) - } - - store.dispatch(WalletAction.Warnings.Update) - store.dispatch(SendAction.Warnings.Update) - } - } - } - - is GlobalAction.SendFeedback -> { - store.state.globalState.feedbackManager?.send(action.emailData) - } - is GlobalAction.UpdateWalletSignedHashes -> { - store.dispatch(WalletAction.Warnings.CheckRemainingSignatures(action.remainingSignatures)) - } - is GlobalAction.UpdateFeedbackInfo -> { - store.state.globalState.feedbackManager?.infoHolder - ?.setWalletsInfo(action.walletManagers) - } - is GlobalAction.InitCurrencyExchangeManager -> { - val config = appState()?.globalState?.configManager?.config - ifNotNull( - config?.onramperApiKey, - config?.moonPayApiKey, - config?.moonPayApiSecretKey, - ) { onramperKey, moonPayKey, moonPaySecretKey -> - scope.launch { - val onramper = OnramperService(onramperKey) - val moonPay = MoonPayService(moonPayKey, moonPaySecretKey) - val exchangeManager = CurrencyExchangeManager(onramper, moonPay) - exchangeManager.getStatus() - store.dispatchOnMain(GlobalAction.InitCurrencyExchangeManager.Success(exchangeManager)) - } - } - } - is GlobalAction.ScanCard -> { - scope.launch { - val result = tangemSdkManager.scanProduct( - store.state.globalState.analyticsHandlers, - currenciesRepository, - action.additionalBlockchainsToDerive, - action.messageResId - ) - withMainContext { - store.dispatch(GlobalAction.ScanFailsCounter.ChooseBehavior(result)) - when (result) { - is CompletionResult.Success -> { - tangemSdkManager.changeDisplayedCardIdNumbersCount(result.data) - action.onSuccess?.invoke(result.data) - } - is CompletionResult.Failure -> { - action.onFailure?.invoke(result.error) - } - } + action.onFailure?.invoke(result.error) } } } } - nextDispatch(action) } } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt index 67e54a6042..681d1f758a 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt @@ -70,8 +70,8 @@ fun globalReducer(action: Action, state: AppState): GlobalState { is GlobalAction.HideDialog -> { globalState.copy(dialog = null) } - is GlobalAction.InitCurrencyExchangeManager.Success -> { - globalState.copy(currencyExchangeManager = action.exchangeManager) + is GlobalAction.ExchangeManager.Init.Success -> { + globalState.copy(exchangeManager = action.exchangeManager) } is GlobalAction.SetIfCardVerifiedOnline -> globalState.copy(cardVerifiedOnline = action.verified) diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt index 75504f3ef2..48591606c1 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt @@ -25,7 +25,7 @@ data class GlobalState( val appCurrency: FiatCurrency = FiatCurrency.Default, val scanCardFailsCounter: Int = 0, val dialog: StateDialog? = null, - val currencyExchangeManager: CurrencyExchangeManager? = null, + val exchangeManager: CurrencyExchangeManager? = null, val resources: AndroidResources = AndroidResources(), val analyticsHandlers: AnalyticsHandler? = null, ) : StateType 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 cb587f277b..7cddf2598a 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 @@ -11,8 +11,8 @@ import com.tangem.tap.domain.configurable.Loader data class Config( val coinMarketCapKey: String = "f6622117-c043-47a0-8975-9d673ce484de", val moonPayApiKey: String = "pk_test_kc90oYTANy7UQdBavDKGfL4K9l6VEPE", - val onramperApiKey: String = "pk_test_Ix2aCF3ej_5tcDKkBR7MChIvf5Nb0oPORPQ3Oal5G8I0", val moonPayApiSecretKey: String = "sk_test_V8w4M19LbDjjYOt170s0tGuvXAgyEb1C", + val mercuryoWidgetId: String = "", val appsFlyerDevKey: String = "", val blockchainSdkConfig: BlockchainSdkConfig = BlockchainSdkConfig(), val isSendingToPayIdEnabled: Boolean = true, @@ -82,8 +82,8 @@ class ConfigManager( config = config.copy( coinMarketCapKey = values.coinMarketCapKey, moonPayApiKey = values.moonPayApiKey, - onramperApiKey = values.onramperApiKey, moonPayApiSecretKey = values.moonPayApiSecretKey, + mercuryoWidgetId = values.mercuryoWidgetId, blockchainSdkConfig = BlockchainSdkConfig( blockchairApiKey = values.blockchairApiKey, blockchairAuthorizationToken = values.blockchairAuthorizationToken, @@ -96,8 +96,8 @@ class ConfigManager( defaultConfig = defaultConfig.copy( coinMarketCapKey = values.coinMarketCapKey, moonPayApiKey = values.moonPayApiKey, - onramperApiKey = values.onramperApiKey, moonPayApiSecretKey = values.moonPayApiSecretKey, + mercuryoWidgetId = values.mercuryoWidgetId, blockchainSdkConfig = BlockchainSdkConfig( blockchairApiKey = values.blockchairApiKey, blockchairAuthorizationToken = values.blockchairAuthorizationToken, diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt index 41d1ea2022..d7be703460 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt @@ -15,8 +15,8 @@ class FeatureModel( class ConfigValueModel( val coinMarketCapKey: String, + val mercuryoWidgetId: String, val moonPayApiKey: String, - val onramperApiKey: String, val moonPayApiSecretKey: String, val blockchairApiKey: String?, val blockchairAuthorizationToken: String?, diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/CurrencyExchangeManager.kt b/app/src/main/java/com/tangem/tap/domain/extensions/CurrencyExchangeManager.kt deleted file mode 100644 index 23be9f4aaf..0000000000 --- a/app/src/main/java/com/tangem/tap/domain/extensions/CurrencyExchangeManager.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.tangem.tap.domain.extensions - -import com.tangem.blockchain.common.Blockchain -import com.tangem.blockchain.common.Blockchain.Arbitrum -import com.tangem.tap.features.wallet.redux.Currency -import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager -import com.tangem.tap.network.exchangeServices.CurrencyExchangeStatus -import com.tangem.tap.store - -/** -[REDACTED_AUTHOR] - */ -fun CurrencyExchangeManager.buyIsAllowed(currency: Currency): Boolean { - return this.status?.buyIsAllowed(currency) ?: false -} - -fun CurrencyExchangeManager.sellIsAllowed(currency: Currency): Boolean { - return this.status?.sellIsAllowed(currency) ?: false -} - -fun CurrencyExchangeStatus.buyIsAllowed(currency: Currency): Boolean { - if (store.state.globalState.configManager?.config?.isTopUpEnabled == false) return false - if (currency.blockchain == Arbitrum) return false - if (!isBuyAllowed) return false - - //TODO: temporary, for the 3.32 release, unlock all buy button - return true - - return when (currency) { - is Currency.Blockchain -> { - val blockchain = currency.blockchain - when { - blockchain.isTestnet() -> blockchain.getTestnetTopUpUrl() != null - blockchain == Blockchain.Unknown -> false - else -> availableToBuy.contains(currency.currencySymbol) - } - } - is Currency.Token -> false - } -} - -fun CurrencyExchangeStatus.sellIsAllowed(currency: Currency): Boolean { - if (store.state.globalState.configManager?.config?.isTopUpEnabled == false) return false - if (!isSellAllowed) return false - - return when (currency) { - is Currency.Blockchain -> { - val blockchain = currency.blockchain - when { - blockchain.isTestnet() -> false - blockchain == Blockchain.Unknown || currency.blockchain == Blockchain.BSC -> false - else -> availableToSell.contains(currency.currencySymbol) - } - } - is Currency.Token -> false - } -} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt index e4472de543..8a3878556d 100644 --- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt @@ -41,7 +41,7 @@ private val homeMiddleware: Middleware = { dispatch, state -> when (action) { is HomeAction.Init -> { store.dispatch(GlobalAction.RestoreAppCurrency) - store.dispatch(GlobalAction.InitCurrencyExchangeManager) + store.dispatch(GlobalAction.ExchangeManager.Init) store.dispatch(HomeAction.SetTermsOfUseState(preferencesStorage.wasDisclaimerAccepted())) } is HomeAction.ShouldScanCardOnResume -> { diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt index f0873595ff..a539cefefd 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt @@ -83,7 +83,7 @@ class OnboardingManager( data class OnboardingWalletBalance( val value: BigDecimal = BigDecimal.ZERO, - val currency: Currency.Blockchain = Currency.Blockchain(Blockchain.Unknown, null), + val currency: Currency = Currency.Blockchain(Blockchain.Unknown, null), val hasIncomingTransaction: Boolean = false, val state: ProgressState, val error: TapError? = null, diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteState.kt index 77b12445f7..a9ebb0e757 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteState.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteState.kt @@ -2,7 +2,6 @@ package com.tangem.tap.features.onboarding.products.note.redux import com.tangem.blockchain.common.WalletManager import com.tangem.tap.domain.TapError -import com.tangem.tap.domain.extensions.buyIsAllowed import com.tangem.tap.features.onboarding.OnboardingWalletBalance import com.tangem.tap.store import org.rekotlin.StateType @@ -26,8 +25,8 @@ data class OnboardingNoteState( val progress: Int get() = steps.indexOf(currentStep) - val isBuyAllowed: Boolean by ReadOnlyProperty { thisRef, property -> - store.state.globalState.currencyExchangeManager?.buyIsAllowed(walletBalance.currency) ?: false + val isBuyAllowed: Boolean by ReadOnlyProperty { _, _ -> + store.state.globalState.exchangeManager?.availableForBuy(walletBalance.currency) ?: false } } diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt index fc24dbd461..19cc8ad307 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt @@ -3,7 +3,6 @@ package com.tangem.tap.features.onboarding.products.twins.redux import com.tangem.blockchain.common.WalletManager import com.tangem.domain.common.TwinCardNumber import com.tangem.tap.domain.TapError -import com.tangem.tap.domain.extensions.buyIsAllowed import com.tangem.tap.domain.twins.TwinCardsManager import com.tangem.tap.features.onboarding.OnboardingWalletBalance import com.tangem.tap.store @@ -56,8 +55,8 @@ data class TwinCardsState( val showAlert: Boolean get() = currentStep == TwinCardsStep.CreateSecondWallet || currentStep == TwinCardsStep.CreateThirdWallet - val isBuyAllowed: Boolean by ReadOnlyProperty { thisRef, property -> - store.state.globalState.currencyExchangeManager?.buyIsAllowed(walletBalance.currency) ?: false + val isBuyAllowed: Boolean by ReadOnlyProperty { _, _ -> + store.state.globalState.exchangeManager?.availableForBuy(walletBalance.currency) ?: false } } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt index b4502b9267..26224eb41e 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt @@ -14,8 +14,6 @@ import com.tangem.tap.common.redux.StateDialog import com.tangem.tap.common.redux.global.CryptoCurrencyName import com.tangem.tap.common.toggleWidget.WidgetState import com.tangem.tap.domain.configurable.warningMessage.WarningMessage -import com.tangem.tap.domain.extensions.buyIsAllowed -import com.tangem.tap.domain.extensions.sellIsAllowed import com.tangem.tap.domain.tokens.models.BlockchainNetwork import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState import com.tangem.tap.features.tokens.redux.TokenWithBlockchain @@ -62,7 +60,7 @@ data class WalletState( val shouldShowDetails: Boolean = primaryWallet?.currencyData?.status != BalanceStatus.EmptyCard && - primaryWallet?.currencyData?.status != BalanceStatus.UnknownBlockchain + primaryWallet?.currencyData?.status != BalanceStatus.UnknownBlockchain val blockchains: List get() = wallets.mapNotNull { it.walletManager?.wallet?.blockchain } @@ -363,18 +361,21 @@ data class Artwork( } data class TradeCryptoState( - val sellingAllowed: Boolean = false, - val buyingAllowed: Boolean = false, + val isAvailableToSell: () -> Boolean = { false }, + val isAvailableToBuy: () -> Boolean = { false }, ) { companion object { fun from( exchangeManager: CurrencyExchangeManager?, walletData: WalletData ): TradeCryptoState { - val status = exchangeManager ?: return walletData.tradeCryptoState + val exchanger = exchangeManager ?: return walletData.tradeCryptoState val currency = walletData.currency - return TradeCryptoState(status.sellIsAllowed(currency), status.buyIsAllowed(currency)) + return TradeCryptoState( + isAvailableToSell = { exchanger.availableForSell(currency) }, + isAvailableToBuy = { exchanger.availableForBuy(currency) }, + ) } } } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt index 3e4210fe42..3ff2589348 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt @@ -13,7 +13,7 @@ import com.tangem.tap.features.send.redux.SendAction import com.tangem.tap.features.wallet.redux.Currency import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager -import com.tangem.tap.network.exchangeServices.buyErc20Tokens +import com.tangem.tap.network.exchangeServices.buyErc20TestnetTokens import com.tangem.tap.scope import com.tangem.tap.store import kotlinx.coroutines.launch @@ -33,7 +33,7 @@ class TradeCryptoMiddleware { private fun startExchange(action: WalletAction.TradeCryptoAction) { val selectedWalletData = store.state.walletState.getSelectedWalletData() - val exchangeManager = store.state.globalState.currencyExchangeManager ?: return + val exchangeManager = store.state.globalState.exchangeManager ?: return val addresses = selectedWalletData?.walletAddresses ?: return if (addresses.list.isEmpty()) return val appCurrency = store.state.globalState.appCurrency @@ -53,11 +53,11 @@ class TradeCryptoMiddleware { ) { val walletManager = store.state.walletState.getWalletManager(currency) if (walletManager !is EthereumWalletManager) { - store.dispatchDebugErrorNotification("Testnet tokens available only for the ETH") + store.dispatchDebugErrorNotification("Testnet tokens available only for the Ethereum") return } - scope.launch { exchangeManager.buyErc20Tokens(walletManager, currency.token) } + scope.launch { exchangeManager.buyErc20TestnetTokens(walletManager, currency.token) } return } @@ -89,7 +89,7 @@ class TradeCryptoMiddleware { } private fun openReceiptUrl(transactionId: String) { - val exchangeManager = store.state.globalState.currencyExchangeManager ?: return + val exchangeManager = store.state.globalState.exchangeManager ?: return store.dispatchOnMain(NavigationAction.PopBackTo()) exchangeManager.getSellCryptoReceiptUrl(CurrencyExchangeManager.Action.Sell, transactionId)?.let { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt index 2e03a3f88d..50f4a1cec0 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt @@ -37,7 +37,7 @@ class OnWalletLoadedReducer { val walletData = walletState.getWalletData(blockchainNetwork) ?: return walletState val fiatCurrency = store.state.globalState.appCurrency - val exchangeManager = store.state.globalState.currencyExchangeManager + val exchangeManager = store.state.globalState.exchangeManager val coinAmountValue = wallet.amounts[AmountType.Coin]?.value val formattedAmount = coinAmountValue?.toFormattedCurrencyString( @@ -117,7 +117,7 @@ class OnWalletLoadedReducer { if (wallet.blockchain != walletState.primaryBlockchain) return walletState val fiatCurrencyName = store.state.globalState.appCurrency.code - val exchangeManager = store.state.globalState.currencyExchangeManager + val exchangeManager = store.state.globalState.exchangeManager val token = wallet.getFirstToken() val tokenData = if (token != null) { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt index 04fec99524..3e39e7ed42 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt @@ -6,34 +6,19 @@ import com.tangem.blockchain.common.Wallet import com.tangem.common.extensions.mapNotNullValues import com.tangem.domain.common.TwinCardNumber import com.tangem.tap.common.entities.FiatCurrency -import com.tangem.tap.common.extensions.toFiatRateString -import com.tangem.tap.common.extensions.toFiatString -import com.tangem.tap.common.extensions.toFiatValue -import com.tangem.tap.common.extensions.toFormattedCurrencyString -import com.tangem.tap.common.extensions.toFormattedFiatValue +import com.tangem.tap.common.extensions.* import com.tangem.tap.common.redux.AppState import com.tangem.tap.domain.TapError import com.tangem.tap.domain.extensions.getArtworkUrl import com.tangem.tap.domain.getFirstToken import com.tangem.tap.domain.tokens.models.BlockchainNetwork import com.tangem.tap.features.wallet.models.WalletRent -import com.tangem.tap.features.wallet.redux.AddressData -import com.tangem.tap.features.wallet.redux.Artwork -import com.tangem.tap.features.wallet.redux.Currency -import com.tangem.tap.features.wallet.redux.ErrorType -import com.tangem.tap.features.wallet.redux.ProgressState -import com.tangem.tap.features.wallet.redux.TradeCryptoState -import com.tangem.tap.features.wallet.redux.WalletAction -import com.tangem.tap.features.wallet.redux.WalletAddresses -import com.tangem.tap.features.wallet.redux.WalletData -import com.tangem.tap.features.wallet.redux.WalletMainButton -import com.tangem.tap.features.wallet.redux.WalletState -import com.tangem.tap.features.wallet.redux.WalletStore +import com.tangem.tap.features.wallet.redux.* import com.tangem.tap.features.wallet.ui.BalanceStatus import com.tangem.tap.features.wallet.ui.BalanceWidgetData import com.tangem.tap.store -import java.math.BigDecimal import org.rekotlin.Action +import java.math.BigDecimal class WalletReducer { companion object { @@ -49,7 +34,7 @@ private fun internalReduce(action: Action, state: AppState): WalletState { if (action !is WalletAction) return state.walletState - val exchangeManager = store.state.globalState.currencyExchangeManager + val exchangeManager = store.state.globalState.exchangeManager var newState = state.walletState when (action) { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt index 997c042f15..d5bd095cbc 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt @@ -1,11 +1,7 @@ package com.tangem.tap.features.wallet.ui import android.os.Bundle -import android.view.Menu -import android.view.MenuInflater -import android.view.MenuItem -import android.view.View -import android.view.ViewGroup +import android.view.* import android.widget.TextView import androidx.activity.OnBackPressedCallback import androidx.annotation.ColorRes @@ -18,25 +14,13 @@ import by.kirich1409.viewbindingdelegate.viewBinding import com.tangem.tangem_sdk_new.extensions.dpToPx import com.tangem.tap.common.SnackbarHandler import com.tangem.tap.common.TestActions -import com.tangem.tap.common.extensions.appendIfNotNull -import com.tangem.tap.common.extensions.beginDelayedTransition -import com.tangem.tap.common.extensions.fitChipsByGroupWidth -import com.tangem.tap.common.extensions.getColor -import com.tangem.tap.common.extensions.getString -import com.tangem.tap.common.extensions.hide -import com.tangem.tap.common.extensions.show -import com.tangem.tap.common.extensions.toQrCode +import com.tangem.tap.common.extensions.* import com.tangem.tap.common.recyclerView.SpaceItemDecoration import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.domain.tokens.models.BlockchainNetwork import com.tangem.tap.features.onboarding.getQRReceiveMessage import com.tangem.tap.features.wallet.models.PendingTransaction -import com.tangem.tap.features.wallet.redux.Currency -import com.tangem.tap.features.wallet.redux.ErrorType -import com.tangem.tap.features.wallet.redux.ProgressState -import com.tangem.tap.features.wallet.redux.WalletAction -import com.tangem.tap.features.wallet.redux.WalletData -import com.tangem.tap.features.wallet.redux.WalletState +import com.tangem.tap.features.wallet.redux.* import com.tangem.tap.features.wallet.redux.WalletState.Companion.UNKNOWN_AMOUNT_SIGN import com.tangem.tap.features.wallet.ui.adapters.PendingTransactionsAdapter import com.tangem.tap.features.wallet.ui.adapters.WalletDetailWarningMessagesAdapter @@ -200,8 +184,8 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), } rowButtons.updateButtonsVisibility( - buyAllowed = selectedWallet.tradeCryptoState.buyingAllowed, - sellAllowed = selectedWallet.tradeCryptoState.sellingAllowed, + buyAllowed = selectedWallet.tradeCryptoState.isAvailableToBuy(), + sellAllowed = selectedWallet.tradeCryptoState.isAvailableToSell(), sendAllowed = selectedWallet.mainButton.enabled, ) } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt index b7e0a307a5..19815ccfe7 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt @@ -11,12 +11,7 @@ import com.tangem.tap.common.extensions.hide import com.tangem.tap.common.extensions.show import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState import com.tangem.tap.features.wallet.models.PendingTransaction -import com.tangem.tap.features.wallet.redux.Currency -import com.tangem.tap.features.wallet.redux.TradeCryptoState -import com.tangem.tap.features.wallet.redux.WalletAction -import com.tangem.tap.features.wallet.redux.WalletData -import com.tangem.tap.features.wallet.redux.WalletMainButton -import com.tangem.tap.features.wallet.redux.WalletState +import com.tangem.tap.features.wallet.redux.* import com.tangem.tap.features.wallet.ui.BalanceWidget import com.tangem.tap.features.wallet.ui.MultipleAddressUiHelper import com.tangem.tap.features.wallet.ui.WalletFragment @@ -122,9 +117,8 @@ class SingleWalletView : WalletView { setupButtonsType(state, binding) - val btnConfirm = if (state.tradeCryptoState.sellingAllowed || - state.tradeCryptoState.buyingAllowed - ) { + val tradeState = state.tradeCryptoState + val btnConfirm = if (tradeState.isAvailableToSell() || tradeState.isAvailableToBuy()) { lButtonsShort.btnConfirm } else { lButtonsLong.btnConfirmLong @@ -152,8 +146,8 @@ class SingleWalletView : WalletView { } private fun setupTradeButton(binding: FragmentWalletBinding, tradeCryptoState: TradeCryptoState) { - val allowedToBuy = tradeCryptoState.buyingAllowed - val allowedToSell = tradeCryptoState.sellingAllowed + val allowedToBuy = tradeCryptoState.isAvailableToBuy() + val allowedToSell = tradeCryptoState.isAvailableToSell() val action = when { allowedToBuy && !allowedToSell -> WalletAction.TradeCryptoAction.Buy !allowedToBuy && allowedToSell -> WalletAction.TradeCryptoAction.Sell @@ -180,9 +174,7 @@ class SingleWalletView : WalletView { } private fun setupButtonsType(state: WalletData, binding: FragmentWalletBinding) = with(binding) { - if (state.tradeCryptoState.sellingAllowed || - state.tradeCryptoState.buyingAllowed - ) { + if (state.tradeCryptoState.isAvailableToSell() || state.tradeCryptoState.isAvailableToBuy()) { lButtonsLong.root.hide() lButtonsShort.root.show() } else { diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt index 7a89edc4b0..745ee01053 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt @@ -11,6 +11,7 @@ import com.tangem.tap.common.extensions.safeUpdate import com.tangem.tap.common.redux.global.CryptoCurrencyName import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.domain.TangemSigner +import com.tangem.tap.features.wallet.redux.Currency import com.tangem.tap.store import com.tangem.tap.tangemSdk import java.math.BigDecimal @@ -18,57 +19,20 @@ import java.math.BigDecimal /** [REDACTED_AUTHOR] */ -interface ExchangeService { - suspend fun isBuyAllowed(): Boolean - suspend fun availableToBuy(): List - suspend fun isSellAllowed(): Boolean - suspend fun availableToSell(): List -} - -interface ExchangeUrlBuilder { - fun getUrl( - action: CurrencyExchangeManager.Action, - blockchain: Blockchain, - cryptoCurrencyName: CryptoCurrencyName, - fiatCurrencyName: String, - walletAddress: String, - ): String? - - fun getSellCryptoReceiptUrl(action: CurrencyExchangeManager.Action, transactionId: String): String? - - companion object { - const val SCHEME = "https" - const val URL_SELL = "sell.moonpay.com" - const val SUCCESS_URL = "tangem://success.tangem.com" - } -} - class CurrencyExchangeManager( - private val onramperService: ExchangeService, - private val moonPayService: ExchangeService, + private val buyService: ExchangeService, + private val sellService: ExchangeService, ) : ExchangeService, ExchangeUrlBuilder { - var status: CurrencyExchangeStatus? = null - private set - - suspend fun getStatus(): CurrencyExchangeStatus { - val isBuyAllowed = isBuyAllowed() - val isSellAllowed = isSellAllowed() - val availableToBuy = availableToBuy() - val availableToSell = availableToSell() - status = CurrencyExchangeStatus( - isBuyAllowed, - isSellAllowed, - availableToBuy, - availableToSell, - ) - return status!! + override suspend fun update() { + buyService.update() + sellService.update() } - override suspend fun isBuyAllowed(): Boolean = onramperService.isBuyAllowed() - override suspend fun availableToBuy(): List = onramperService.availableToBuy() - override suspend fun isSellAllowed(): Boolean = moonPayService.isSellAllowed() - override suspend fun availableToSell(): List = moonPayService.availableToSell() + override fun isBuyAllowed(): Boolean = buyService.isBuyAllowed() + override fun isSellAllowed(): Boolean = sellService.isSellAllowed() + override fun availableForBuy(currency: Currency): Boolean = buyService.availableForBuy(currency) + override fun availableForSell(currency: Currency): Boolean = sellService.availableForSell(currency) override fun getUrl( action: Action, @@ -96,22 +60,15 @@ class CurrencyExchangeManager( private fun getExchangeUrlBuilder(action: Action): ExchangeUrlBuilder { return when (action) { - Action.Buy -> onramperService - Action.Sell -> moonPayService + Action.Buy -> buyService + Action.Sell -> sellService } as ExchangeUrlBuilder } enum class Action { Buy, Sell } } -data class CurrencyExchangeStatus( - val isBuyAllowed: Boolean, - val isSellAllowed: Boolean, - val availableToBuy: List, - val availableToSell: List, -) - -suspend fun CurrencyExchangeManager.buyErc20Tokens(walletManager: EthereumWalletManager, token: Token) { +suspend fun CurrencyExchangeManager.buyErc20TestnetTokens(walletManager: EthereumWalletManager, token: Token) { walletManager.safeUpdate() val amountToSend = Amount(walletManager.wallet.blockchain) diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt new file mode 100644 index 0000000000..e08e007029 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt @@ -0,0 +1,29 @@ +package com.tangem.tap.network.exchangeServices + +import com.tangem.blockchain.common.Blockchain +import com.tangem.tap.features.wallet.redux.Currency + +interface ExchangeService { + suspend fun update() + fun isBuyAllowed(): Boolean + fun isSellAllowed(): Boolean + fun availableForBuy(currency: Currency):Boolean + fun availableForSell(currency: Currency):Boolean +} + +interface ExchangeUrlBuilder { + fun getUrl( + action: CurrencyExchangeManager.Action, + blockchain: Blockchain, + cryptoCurrencyName: String, + fiatCurrencyName: String, + walletAddress: String, + ): String? + + fun getSellCryptoReceiptUrl(action: CurrencyExchangeManager.Action, transactionId: String): String? + + companion object { + const val SCHEME = "https" + const val SUCCESS_URL = "tangem://success.tangem.com" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoApi.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoApi.kt new file mode 100644 index 0000000000..45494e0114 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoApi.kt @@ -0,0 +1,57 @@ +package com.tangem.tap.network.exchangeServices.mercuryo + +import com.squareup.moshi.Json +import retrofit2.http.GET +import retrofit2.http.Path + +/** +[REDACTED_AUTHOR] + */ + + + +private val CurrenciesUrl = "https://api.mercuryo.io/v1.6/lib/currencies" + + + +interface MercuryoApi { + + @GET("{apiVersion}/lib/currencies") + suspend fun currencies( + @Path("apiVersion") apiVersion: String, + ): MercuryoCurrenciesResponse + + companion object { + const val BASE_URL = "https://api.mercuryo.io/" + const val API_VERSION = "v1.6" + } +} + +data class MercuryoCurrenciesResponse( + val status: Int, + val data: Data, +) { + data class Data( + val fiat: List, + val crypto: List, + val config: Config + ) + + data class Config( + val base: Map, + @Json(name = "has_withdrawal_fee") + val hasWithdrawalFee: Map, + @Json(name = "display_options") + val displayOptions: Map, + val icons: Map, + ) + + data class DisplayOption( + @Json(name = "fullname") + val fullName: String, + @Json(name = "total_digits") + val totalDigits: Int, + @Json(name = "display_digits") + val displayDigits: Int, + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt new file mode 100644 index 0000000000..9760849ed6 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt @@ -0,0 +1,127 @@ +package com.tangem.tap.network.exchangeServices.mercuryo + +import android.net.Uri +import com.tangem.blockchain.common.Blockchain +import com.tangem.common.services.Result +import com.tangem.common.services.performRequest +import com.tangem.network.common.createRetrofitInstance +import com.tangem.tap.common.extensions.urlEncode +import com.tangem.tap.common.redux.global.CryptoCurrencyName +import com.tangem.tap.features.wallet.redux.Currency +import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager +import com.tangem.tap.network.exchangeServices.ExchangeService +import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder + +/** +[REDACTED_AUTHOR] + */ +class MercuryoService( + private val apiVersion: String, + private val mercuryoWidgetId: String, +) : ExchangeService, ExchangeUrlBuilder { + + private val api: MercuryoApi = createRetrofitInstance(MercuryoApi.BASE_URL) + .create(MercuryoApi::class.java) + + private val blockchainsAvailableToBuy = mutableListOf() + private val tokensAvailableToBy = mutableMapOf>() + + override suspend fun update() { + when (val result = performRequest { api.currencies(apiVersion) }) { + is Result.Success -> { + val response = result.data + if (response.status == 200) { + // all currencies which can be bought + val currenciesAvailableToBy = response.data.crypto + // tokens which can be bought only from specific blockchain network + val supportedTokensWithNetwork = response.data.config.base + + currenciesAvailableToBy.forEach { currencyName -> + val blockchain = blockchainFromCurrencyName(currencyName) + if (blockchain == null) { + // suppose its a token + supportedTokensWithNetwork[currencyName]?.let { + blockchainFromCurrencyName(it) + }?.let { blockchainNetwork -> + val supportedInBlockchainsNetwork = tokensAvailableToBy[currencyName] + ?: mutableListOf() + supportedInBlockchainsNetwork.add(blockchainNetwork) + tokensAvailableToBy[currencyName] = supportedInBlockchainsNetwork + } + } else { + blockchainsAvailableToBuy.add(blockchain) + } + } + } + } + is Result.Failure -> { + blockchainsAvailableToBuy.clear() + tokensAvailableToBy.clear() + } + } + } + + override fun isBuyAllowed(): Boolean = true + + override fun isSellAllowed(): Boolean = false + + override fun availableForBuy(currency: Currency): Boolean { + if (!isBuyAllowed()) return false + + // blockchains which cant be defined by mercuryo service + val unsupportedBlockchains = listOf(Blockchain.Unknown, Blockchain.Binance, Blockchain.Arbitrum) + val blockchain = currency.blockchain + + return when (currency) { + is Currency.Blockchain -> { + when { + blockchain.isTestnet() -> blockchain.getTestnetTopUpUrl() != null + unsupportedBlockchains.contains(blockchain) -> false + else -> { + blockchainsAvailableToBuy.contains(currency.blockchain) + } + } + } + is Currency.Token -> { + val supportedInBlockchains = tokensAvailableToBy[currency.currencySymbol] ?: return false + supportedInBlockchains.contains(currency.blockchain) + } + } + } + + override fun availableForSell(currency: Currency): Boolean = false + + override fun getUrl( + action: CurrencyExchangeManager.Action, + blockchain: Blockchain, + cryptoCurrencyName: CryptoCurrencyName, + fiatCurrencyName: String, + walletAddress: String + ): String? { + if (action == CurrencyExchangeManager.Action.Sell) throw UnsupportedOperationException() + + val builder = Uri.Builder() + .scheme(ExchangeUrlBuilder.SCHEME) + .authority("exchange.mercuryo.io") + .appendQueryParameter("widget_id", mercuryoWidgetId) + .appendQueryParameter("type", action.name.lowercase()) + .appendQueryParameter("currency", cryptoCurrencyName) + .appendQueryParameter("address", walletAddress.urlEncode()) + .appendQueryParameter("fix_currency", "true") + .appendQueryParameter("return_url", ExchangeUrlBuilder.SUCCESS_URL) + + val url = builder.build().toString() + return url + } + + override fun getSellCryptoReceiptUrl( + action: CurrencyExchangeManager.Action, + transactionId: String + ): String? = null + + private fun blockchainFromCurrencyName(currencyName: String): Blockchain? = when (currencyName) { + "BNB" -> Blockchain.BSC + "ETH" -> Blockchain.Ethereum + else -> Blockchain.values().find { it.currency.lowercase() == currencyName.lowercase() } + } +} diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt index 54fd9c558e..161cfc568a 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt @@ -5,15 +5,15 @@ import android.util.Base64 import com.tangem.blockchain.common.Blockchain import com.tangem.common.services.Result import com.tangem.common.services.performRequest +import com.tangem.domain.common.extensions.withIOContext import com.tangem.network.common.createRetrofitInstance import com.tangem.tap.common.extensions.urlEncode import com.tangem.tap.common.redux.global.CryptoCurrencyName +import com.tangem.tap.features.wallet.redux.Currency import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager import com.tangem.tap.network.exchangeServices.ExchangeService import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder.Companion.SCHEME -import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder.Companion.URL_SELL -import kotlinx.coroutines.coroutineScope import javax.crypto.Mac import javax.crypto.spec.SecretKeySpec @@ -29,14 +29,14 @@ class MoonPayService( private var status: MoonPayStatus? = null - private suspend fun updateStatus() { - try { - coroutineScope { + override suspend fun update() { + withIOContext { + performRequest { val userStatusResult = performRequest { api.getUserStatus(apiKey) } - if (userStatusResult is Result.Failure) return@coroutineScope userStatusResult + if (userStatusResult is Result.Failure) return@performRequest val currenciesResult = performRequest { api.getCurrencies(apiKey) } - if (currenciesResult is Result.Failure) return@coroutineScope currenciesResult + if (currenciesResult is Result.Failure) return@performRequest val userStatus = (userStatusResult as Result.Success).data val currencies = (currenciesResult as Result.Success).data @@ -65,29 +65,31 @@ class MoonPayService( status = MoonPayStatus(currenciesToSell, userStatus, currencies) } - } catch (error: Error) { - status = null - Result.Failure(error) } } - override suspend fun isBuyAllowed(): Boolean = false + override fun isBuyAllowed(): Boolean = false - override suspend fun availableToBuy(): List = listOf() - - override suspend fun isSellAllowed(): Boolean { - refreshStatus() + override fun isSellAllowed(): Boolean { return status?.responseUserStatus?.isSellAllowed ?: false } - override suspend fun availableToSell(): List { - refreshStatus() - return status?.availableToSell ?: emptyList() - } + override fun availableForBuy(currency: Currency): Boolean = false - private suspend fun refreshStatus() { - if (status == null) { - updateStatus() + override fun availableForSell(currency: Currency): Boolean { + val availableForSell = status?.availableForSell ?: return false + if (!isSellAllowed()) return false + + return when (currency) { + is Currency.Blockchain -> { + val blockchain = currency.blockchain + when { + blockchain.isTestnet() -> false + blockchain == Blockchain.Unknown || currency.blockchain == Blockchain.BSC -> false + else -> availableForSell.contains(currency.currencySymbol) + } + } + is Currency.Token -> false } } @@ -133,10 +135,14 @@ class MoonPayService( val sha256encoded = sha256Hmac.doFinal(data.toByteArray()) return Base64.encodeToString(sha256encoded, Base64.NO_WRAP) } + + companion object { + const val URL_SELL = "sell.moonpay.com" + } } private data class MoonPayStatus( - val availableToSell: List, + val availableForSell: List, val responseUserStatus: MoonPayUserStatus, val responseCurrencies: List ) \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/onramper/OnnramperApi.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/onramper/OnnramperApi.kt deleted file mode 100644 index 30a65ed706..0000000000 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/onramper/OnnramperApi.kt +++ /dev/null @@ -1,83 +0,0 @@ -package com.tangem.tap.network.exchangeServices.onramper - -import com.squareup.moshi.JsonClass -import retrofit2.http.GET -import retrofit2.http.Path - -interface OnramperApi { - @GET("gateways") - suspend fun gateways(): GatewaysResponse - - @GET("rate/{fromCurrency}/{toCurrency}/{paymentMethod}/{amount}") - suspend fun rate( - @Path("fromCurrency") fromCurrency: String, - @Path("toCurrency") toCurrency: String, - @Path("paymentMethod") paymentMethod: String, - @Path("amount") amount: Int, - ): RateResponse - - companion object { - val BASE_URL = "https://onramper.tech/" - } -} - -@JsonClass(generateAdapter = true) -data class GatewaysResponse( - val gateways: List -) - -@JsonClass(generateAdapter = true) -data class OnramperGateway( - val identifier: String, - val paymentMethods: List, - val fiatCurrencies: List, - val cryptoCurrencies: List -) - -@JsonClass(generateAdapter = true) -data class OnramperCurrency( - val id: String, - val code: String, - val precision: Int -) - -@JsonClass(generateAdapter = true) -data class RateResponse( - val identifier: String, - val duration: OnramperDuration, - val available: Boolean, - val error: OnramperError? = null, - val rate: Double? = null, - val fees: Double? = null, - val requiredKYC: List? = null, - val receivedCrypto: Double? = null, - val nextStep: OnramperNextStep? = null, -) - -@JsonClass(generateAdapter = true) -data class OnramperNextStep( - val type: String, - val url: String, - val message: String, - val extraData: List -) - -@JsonClass(generateAdapter = true) -data class OnramperExtraData( - val type: String, - val name: String, - val humanName: String, -) - -@JsonClass(generateAdapter = true) -data class OnramperDuration( - val seconds: Long, - val message: String -) - -@JsonClass(generateAdapter = true) -data class OnramperError( - val type: String, - val message: String, - val limit: Double -) \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/onramper/OnramperService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/onramper/OnramperService.kt deleted file mode 100644 index 94bdae395e..0000000000 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/onramper/OnramperService.kt +++ /dev/null @@ -1,116 +0,0 @@ -package com.tangem.tap.network.exchangeServices.onramper - -import android.net.Uri -import com.tangem.blockchain.common.Blockchain -import com.tangem.common.services.Result -import com.tangem.common.services.performRequest -import com.tangem.network.common.AddHeaderInterceptor -import com.tangem.network.common.createRetrofitInstance -import com.tangem.tap.common.extensions.urlEncode -import com.tangem.tap.common.redux.global.CryptoCurrencyName -import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager -import com.tangem.tap.network.exchangeServices.ExchangeService -import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder -import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder.Companion.SCHEME -import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder.Companion.SUCCESS_URL -import kotlinx.coroutines.coroutineScope -import java.util.* - -/** -[REDACTED_AUTHOR] - */ -class OnramperService( - val apiKey: String -) : ExchangeService, ExchangeUrlBuilder { - - private val api: OnramperApi by lazy { - createRetrofitInstance( - baseUrl = OnramperApi.BASE_URL, - interceptors = listOf( - AddHeaderInterceptor(mapOf("Authorization" to "Basic $apiKey")), - ) - ).create(OnramperApi::class.java) - } - - private var status: OnramperStatus? = null - - private suspend fun updateStatus() { - try { - coroutineScope { - val result = performRequest { api.gateways() } - if (result is Result.Failure) return@coroutineScope result - - val response = (result as Result.Success).data - val currenciesToBuy = extractCurrenciesToBuy(response).sorted() - val status = OnramperStatus(currenciesToBuy, response) - this@OnramperService.status = status - } - } catch (error: Error) { - status = null - Result.Failure(error) - } - } - - private fun extractCurrenciesToBuy(response: GatewaysResponse): List { - return response.gateways.map { gateway -> - gateway.cryptoCurrencies.map { currency -> currency.code } - }.flatten().toMutableSet().toList() - } - - override suspend fun isBuyAllowed(): Boolean { - refreshStatus() - return status != null - } - - override suspend fun availableToBuy(): List { - refreshStatus() - return status?.availableToBuy ?: emptyList() - } - - private suspend fun refreshStatus() { - if (status == null) { - updateStatus() - } - } - - override suspend fun isSellAllowed(): Boolean = false - - override suspend fun availableToSell(): List = listOf() - - override fun getUrl( - action: CurrencyExchangeManager.Action, - blockchain: Blockchain, - cryptoCurrencyName: CryptoCurrencyName, - fiatCurrency: String, - walletAddress: String, - ): String? { - var languageCode = Locale.getDefault().language - if (languageCode.isEmpty()) languageCode = "en" - - val builder = Uri.Builder() - .scheme(SCHEME) - .authority("widget.onramper.com") - .appendQueryParameter("apiKey", this.apiKey.urlEncode()) - .appendQueryParameter("defaultCrypto", cryptoCurrencyName) - .appendQueryParameter("wallets", "${blockchain.currency}:$walletAddress".urlEncode()) - .appendQueryParameter("redirectURL", SUCCESS_URL) - .appendQueryParameter("defaultFiat", fiatCurrency) - .appendQueryParameter("language", languageCode) - - status?.apply { - val gateways = responseGateways.gateways.joinToString(",") { it.identifier }.urlEncode() - builder.appendQueryParameter("onlyGateways", gateways) - - } - - val url = builder.build().toString() - return url - } - - override fun getSellCryptoReceiptUrl(action: CurrencyExchangeManager.Action, transactionId: String): String? = null -} - -private data class OnramperStatus( - val availableToBuy: List, - val responseGateways: GatewaysResponse -) \ No newline at end of file From c4241a2ee402994b51b80fae87eab9b7eaa11d16 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 8 Jul 2022 21:04:03 +0300 Subject: [PATCH 03/15] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- .../tangem/tap/common/redux/global/GlobalMidlleware.kt | 2 +- .../tap/domain/configurable/config/ConfigManager.kt | 2 ++ .../tangem/tap/domain/configurable/config/JsonModels.kt | 1 + .../network/exchangeServices/mercuryo/MercuryoService.kt | 9 +++++++++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index feec295055..59ee0bff06 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit feec2950551a1dbabbb018b446b25e17442db21f +Subproject commit 59ee0bff06ee54f3202421c28f7fb6e3d421dad8 diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt index 9777538858..2a12c999bf 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt @@ -91,7 +91,7 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di config?.moonPayApiSecretKey, ) { mercuryoWidgetId, moonPayKey, moonPaySecretKey -> scope.launch { - val buyService = MercuryoService(MercuryoApi.API_VERSION, mercuryoWidgetId) + val buyService = MercuryoService(MercuryoApi.API_VERSION, mercuryoWidgetId, "") val sellService = MoonPayService(moonPayKey, moonPaySecretKey) val exchangeManager = CurrencyExchangeManager(buyService, sellService) store.dispatchOnMain(GlobalAction.ExchangeManager.Init.Success(exchangeManager)) 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 7cddf2598a..d0e7bb9584 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 @@ -13,6 +13,7 @@ data class Config( val moonPayApiKey: String = "pk_test_kc90oYTANy7UQdBavDKGfL4K9l6VEPE", val moonPayApiSecretKey: String = "sk_test_V8w4M19LbDjjYOt170s0tGuvXAgyEb1C", val mercuryoWidgetId: String = "", + val mercuryoSecret: String = "", val appsFlyerDevKey: String = "", val blockchainSdkConfig: BlockchainSdkConfig = BlockchainSdkConfig(), val isSendingToPayIdEnabled: Boolean = true, @@ -98,6 +99,7 @@ class ConfigManager( moonPayApiKey = values.moonPayApiKey, moonPayApiSecretKey = values.moonPayApiSecretKey, mercuryoWidgetId = values.mercuryoWidgetId, + mercuryoSecret = values.mercuryoSecret, blockchainSdkConfig = BlockchainSdkConfig( blockchairApiKey = values.blockchairApiKey, blockchairAuthorizationToken = values.blockchairAuthorizationToken, diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt b/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt index d7be703460..f9e053ee98 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/config/JsonModels.kt @@ -16,6 +16,7 @@ class FeatureModel( class ConfigValueModel( val coinMarketCapKey: String, val mercuryoWidgetId: String, + val mercuryoSecret: String, val moonPayApiKey: String, val moonPayApiSecretKey: String, val blockchairApiKey: String?, diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt index 9760849ed6..a0068b9ce1 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt @@ -2,6 +2,8 @@ package com.tangem.tap.network.exchangeServices.mercuryo import android.net.Uri import com.tangem.blockchain.common.Blockchain +import com.tangem.common.extensions.calculateSha512 +import com.tangem.common.extensions.toHexString import com.tangem.common.services.Result import com.tangem.common.services.performRequest import com.tangem.network.common.createRetrofitInstance @@ -18,6 +20,7 @@ import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder class MercuryoService( private val apiVersion: String, private val mercuryoWidgetId: String, + private val secret: String, ) : ExchangeService, ExchangeUrlBuilder { private val api: MercuryoApi = createRetrofitInstance(MercuryoApi.BASE_URL) @@ -107,6 +110,7 @@ class MercuryoService( .appendQueryParameter("type", action.name.lowercase()) .appendQueryParameter("currency", cryptoCurrencyName) .appendQueryParameter("address", walletAddress.urlEncode()) + .appendQueryParameter("signature", signature(walletAddress).urlEncode()) .appendQueryParameter("fix_currency", "true") .appendQueryParameter("return_url", ExchangeUrlBuilder.SUCCESS_URL) @@ -114,6 +118,11 @@ class MercuryoService( return url } + private fun signature(address: String): String { + return (address + secret).calculateSha512().toHexString().lowercase() + } + + override fun getSellCryptoReceiptUrl( action: CurrencyExchangeManager.Action, transactionId: String From bf31658f026d9d7048094371fcc9383a357aa42c Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 8 Jul 2022 21:15:20 +0300 Subject: [PATCH 04/15] Updated on 2026-08-14 --- .../tangem/tap/common/redux/global/GlobalMidlleware.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt index 2a12c999bf..ea77ce5ed9 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt @@ -87,11 +87,16 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di val config = appState()?.globalState?.configManager?.config ifNotNull( config?.mercuryoWidgetId, + config?.mercuryoSecret, config?.moonPayApiKey, config?.moonPayApiSecretKey, - ) { mercuryoWidgetId, moonPayKey, moonPaySecretKey -> + ) { mercuryoWidgetId, mercuryoSecret, moonPayKey, moonPaySecretKey -> scope.launch { - val buyService = MercuryoService(MercuryoApi.API_VERSION, mercuryoWidgetId, "") + val buyService = MercuryoService( + apiVersion = MercuryoApi.API_VERSION, + mercuryoWidgetId = mercuryoWidgetId, + secret = mercuryoSecret, + ) val sellService = MoonPayService(moonPayKey, moonPaySecretKey) val exchangeManager = CurrencyExchangeManager(buyService, sellService) store.dispatchOnMain(GlobalAction.ExchangeManager.Init.Success(exchangeManager)) From 712f53991be8d8aa117d38372fb7c7506752a89f Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 5 Jul 2022 11:26:36 +0300 Subject: [PATCH 05/15] Updated on 2026-08-14 --- .../com/tangem/tap/common/DialogManager.kt | 3 + .../tap/common/redux/global/GlobalState.kt | 1 + .../tap/features/wallet/redux/WalletAction.kt | 5 +- .../tap/features/wallet/redux/WalletState.kt | 18 ++- .../middlewares/TradeCryptoMiddleware.kt | 65 ++++++---- .../middlewares/WalletDialogsMiddleware.kt | 5 +- .../wallet/ui/WalletDetailsFragment.kt | 2 +- .../ChooseTradeActionBottomSheetDialog.kt | 2 +- ...sianCardholdersWarningBottomSheetDialog.kt | 39 ++++++ .../wallet/ui/wallet/SingleWalletView.kt | 2 +- .../main/res/drawable/ic_cross_rounded_24.xml | 9 ++ app/src/main/res/drawable/img_flag_ru_24.xml | 18 +++ .../dialog_russians_cardholders_warning.xml | 114 ++++++++++++++++++ app/src/main/res/values-ru/strings_final.xml | 18 +++ app/src/main/res/values/strings_final.xml | 19 +++ 15 files changed, 289 insertions(+), 31 deletions(-) create mode 100644 app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt create mode 100644 app/src/main/res/drawable/ic_cross_rounded_24.xml create mode 100644 app/src/main/res/drawable/img_flag_ru_24.xml create mode 100644 app/src/main/res/layout/dialog_russians_cardholders_warning.xml diff --git a/app/src/main/java/com/tangem/tap/common/DialogManager.kt b/app/src/main/java/com/tangem/tap/common/DialogManager.kt index 8af2818c0a..9af6c88b29 100644 --- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt +++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt @@ -22,6 +22,7 @@ import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.UnfinishedB import com.tangem.tap.features.wallet.redux.WalletDialog import com.tangem.tap.features.wallet.ui.dialogs.AmountToSendBottomSheetDialog import com.tangem.tap.features.wallet.ui.dialogs.ChooseTradeActionBottomSheetDialog +import com.tangem.tap.features.wallet.ui.dialogs.RussianCardholdersWarningBottomSheetDialog import com.tangem.tap.features.wallet.ui.dialogs.ScanFailsDialog import com.tangem.tap.features.wallet.ui.dialogs.SignedHashesWarningDialog import com.tangem.tap.features.wallet.ui.dialogs.SimpleOkDialog @@ -115,6 +116,8 @@ class DialogManager : StoreSubscriber { AmountToSendBottomSheetDialog(context, state.dialog) is WalletDialog.SignedHashesMultiWalletDialog -> SignedHashesWarningDialog.create(context) + is WalletDialog.RussianCardholdersWarningDialog -> + RussianCardholdersWarningBottomSheetDialog(context) else -> null } dialog?.show() diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt index 48591606c1..54142bb9af 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt @@ -28,6 +28,7 @@ data class GlobalState( val exchangeManager: CurrencyExchangeManager? = null, val resources: AndroidResources = AndroidResources(), val analyticsHandlers: AnalyticsHandler? = null, + val userCountry: String? = null, ) : StateType diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt index 769d28a8cd..c90af2af53 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt @@ -145,6 +145,7 @@ sealed class WalletAction : Action { object SignedHashesMultiWalletDialog : DialogAction() object ChooseTradeActionDialog : DialogAction() data class ChooseCurrency(val amounts: List?) : DialogAction() + object RussianCardholdersWarningDialog : DialogAction() object Hide : DialogAction() } @@ -155,8 +156,10 @@ sealed class WalletAction : Action { object EmptyWallet : WalletAction() sealed class TradeCryptoAction : WalletAction() { - object Buy : TradeCryptoAction() object Sell : TradeCryptoAction() + data class Buy( + val checkUserLocation: Boolean = true, + ) : TradeCryptoAction() data class FinishSelling(val transactionId: String) : TradeCryptoAction() data class SendCrypto( val currencyId: String, diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt index 26224eb41e..1bbf3366a6 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt @@ -1,7 +1,12 @@ package com.tangem.tap.features.wallet.redux import android.graphics.Bitmap -import com.tangem.blockchain.common.* +import com.tangem.blockchain.common.Amount +import com.tangem.blockchain.common.Blockchain +import com.tangem.blockchain.common.DerivationStyle +import com.tangem.blockchain.common.Token +import com.tangem.blockchain.common.Wallet +import com.tangem.blockchain.common.WalletManager import com.tangem.blockchain.common.address.AddressType import com.tangem.common.extensions.isZero import com.tangem.domain.common.extensions.canHandleToken @@ -17,15 +22,21 @@ import com.tangem.tap.domain.configurable.warningMessage.WarningMessage import com.tangem.tap.domain.tokens.models.BlockchainNetwork import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState import com.tangem.tap.features.tokens.redux.TokenWithBlockchain -import com.tangem.tap.features.wallet.models.* +import com.tangem.tap.features.wallet.models.PendingTransaction +import com.tangem.tap.features.wallet.models.TotalBalance +import com.tangem.tap.features.wallet.models.WalletRent +import com.tangem.tap.features.wallet.models.WalletWarning +import com.tangem.tap.features.wallet.models.hasPendingTransactions +import com.tangem.tap.features.wallet.models.hasSendableAmounts +import com.tangem.tap.features.wallet.models.isSendableAmount import com.tangem.tap.features.wallet.redux.reducers.calculateTotalFiatAmount import com.tangem.tap.features.wallet.redux.reducers.findProgressState import com.tangem.tap.features.wallet.ui.BalanceStatus import com.tangem.tap.features.wallet.ui.BalanceWidgetData import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager import com.tangem.tap.store -import org.rekotlin.StateType import java.math.BigDecimal +import org.rekotlin.StateType import kotlin.properties.ReadOnlyProperty data class WalletState( @@ -317,6 +328,7 @@ sealed interface WalletDialog : StateDialog { val currenciesList: List, val currentAppCurrency: FiatCurrency, ) : WalletDialog + object RussianCardholdersWarningDialog : WalletDialog } enum class ProgressState : WidgetState { Loading, Refreshing, Done, Error } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt index 3ff2589348..636baf5aaf 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt @@ -24,33 +24,34 @@ class TradeCryptoMiddleware { if (DemoHelper.tryHandle(state, action)) return when (action) { - is WalletAction.TradeCryptoAction.Buy -> startExchange(action) - is WalletAction.TradeCryptoAction.Sell -> startExchange(action) + is WalletAction.TradeCryptoAction.Buy -> proceedBuyAction(state, action) + is WalletAction.TradeCryptoAction.Sell -> proceedSellAction() is WalletAction.TradeCryptoAction.SendCrypto -> preconfigureAndOpenSendScreen(action) is WalletAction.TradeCryptoAction.FinishSelling -> openReceiptUrl(action.transactionId) } } - private fun startExchange(action: WalletAction.TradeCryptoAction) { - val selectedWalletData = store.state.walletState.getSelectedWalletData() - val exchangeManager = store.state.globalState.exchangeManager ?: return - val addresses = selectedWalletData?.walletAddresses ?: return - if (addresses.list.isEmpty()) return - val appCurrency = store.state.globalState.appCurrency - - val defaultAddress = addresses.list[0].address - val currency = selectedWalletData.currency - val currencySymbol = selectedWalletData.currency.currencySymbol - - val exchangeAction = if (action is WalletAction.TradeCryptoAction.Buy) { - CurrencyExchangeManager.Action.Buy - } else { - CurrencyExchangeManager.Action.Sell + private fun proceedBuyAction( + state: () -> AppState?, + action: WalletAction.TradeCryptoAction.Buy, + ) { + if (action.checkUserLocation && state()?.globalState?.userCountry == "RU") { + store.dispatchOnMain( + WalletAction.DialogAction.RussianCardholdersWarningDialog + ) + return } - if (exchangeAction == CurrencyExchangeManager.Action.Buy && - currency is Currency.Token && currency.blockchain.isTestnet() - ) { + val selectedWalletData = store.state.walletState.getSelectedWalletData() ?: return + val exchangeManager = store.state.globalState.exchangeManager ?: return + val appCurrency = store.state.globalState.appCurrency + + val addresses = selectedWalletData.walletAddresses?.list.orEmpty() + if (addresses.isEmpty()) return + + val currency = selectedWalletData.currency + + if (currency is Currency.Token && currency.blockchain.isTestnet()) { val walletManager = store.state.walletState.getWalletManager(currency) if (walletManager !is EthereumWalletManager) { store.dispatchDebugErrorNotification("Testnet tokens available only for the Ethereum") @@ -62,13 +63,31 @@ class TradeCryptoMiddleware { } exchangeManager.getUrl( - action = exchangeAction, + action = CurrencyExchangeManager.Action.Buy, blockchain = currency.blockchain, - cryptoCurrencyName = currencySymbol, + cryptoCurrencyName = currency.currencySymbol, fiatCurrencyName = appCurrency.code, - walletAddress = defaultAddress + walletAddress = addresses[0].address )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) } + } + private fun proceedSellAction() { + val selectedWalletData = store.state.walletState.getSelectedWalletData() ?: return + val exchangeManager = store.state.globalState.exchangeManager ?: return + val appCurrency = store.state.globalState.appCurrency + + val addresses = selectedWalletData.walletAddresses?.list.orEmpty() + if (addresses.isEmpty()) return + + val currency = selectedWalletData.currency + + exchangeManager.getUrl( + action = CurrencyExchangeManager.Action.Sell, + blockchain = currency.blockchain, + cryptoCurrencyName = currency.currencySymbol, + fiatCurrencyName = appCurrency.code, + walletAddress = addresses[0].address + )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) } } private fun preconfigureAndOpenSendScreen(action: WalletAction.TradeCryptoAction.SendCrypto) { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt index e495c55c94..e760c446f2 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt @@ -27,10 +27,13 @@ class WalletDialogsMiddleware { is WalletAction.DialogAction.ChooseCurrency -> { store.dispatchDialogShow( WalletDialog.SelectAmountToSendDialog( - amounts = action.amounts + amounts = action.amounts ) ) } + is WalletAction.DialogAction.RussianCardholdersWarningDialog -> { + store.dispatchDialogShow(WalletDialog.RussianCardholdersWarningDialog) + } is WalletAction.DialogAction.Hide -> { store.dispatchDialogHide() } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt index d5bd095cbc..1cf3a038b2 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt @@ -91,7 +91,7 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), private fun setupButtons() = with(binding) { rowButtons.onBuyClick = { - store.dispatch(WalletAction.TradeCryptoAction.Buy) + store.dispatch(WalletAction.TradeCryptoAction.Buy()) } rowButtons.onSellClick = { store.dispatch(WalletAction.TradeCryptoAction.Sell) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt index 1c65315d3a..397231a58c 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt @@ -27,7 +27,7 @@ class ChooseTradeActionBottomSheetDialog(context: Context) : BottomSheetDialog(c } binding!!.dialogBtnBuy.setOnClickListener { - store.dispatch(WalletAction.TradeCryptoAction.Buy) + store.dispatch(WalletAction.TradeCryptoAction.Buy()) dismiss() } binding!!.dialogBtnSell.setOnClickListener { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt new file mode 100644 index 0000000000..a3b84e3a48 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt @@ -0,0 +1,39 @@ +package com.tangem.tap.features.wallet.ui.dialogs + +import android.content.Context +import android.os.Bundle +import android.view.LayoutInflater +import com.google.android.material.bottomsheet.BottomSheetDialog +import com.tangem.tap.common.extensions.dispatchDialogHide +import com.tangem.tap.features.wallet.redux.WalletAction +import com.tangem.tap.store +import com.tangem.wallet.databinding.DialogRussiansCardholdersWarningBinding + +class RussianCardholdersWarningBottomSheetDialog(context: Context) : BottomSheetDialog(context) { + + private var binding: DialogRussiansCardholdersWarningBinding? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = DialogRussiansCardholdersWarningBinding + .inflate(LayoutInflater.from(context)) + .also { setContentView(it.root) } + } + + override fun show() { + super.show() + setOnDismissListener { + binding = null + store.dispatchDialogHide() + } + + binding?.btnYes?.setOnClickListener { + // TODO: Open instruction WebView + dismiss() + } + binding?.btnNo?.setOnClickListener { + store.dispatch(WalletAction.TradeCryptoAction.Buy(checkUserLocation = false)) + dismiss() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt index 19815ccfe7..7c431c33b7 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt @@ -149,7 +149,7 @@ class SingleWalletView : WalletView { val allowedToBuy = tradeCryptoState.isAvailableToBuy() val allowedToSell = tradeCryptoState.isAvailableToSell() val action = when { - allowedToBuy && !allowedToSell -> WalletAction.TradeCryptoAction.Buy + allowedToBuy && !allowedToSell -> WalletAction.TradeCryptoAction.Buy() !allowedToBuy && allowedToSell -> WalletAction.TradeCryptoAction.Sell allowedToBuy && allowedToSell -> WalletAction.DialogAction.ChooseTradeActionDialog else -> null diff --git a/app/src/main/res/drawable/ic_cross_rounded_24.xml b/app/src/main/res/drawable/ic_cross_rounded_24.xml new file mode 100644 index 0000000000..ad1cab5a84 --- /dev/null +++ b/app/src/main/res/drawable/ic_cross_rounded_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/img_flag_ru_24.xml b/app/src/main/res/drawable/img_flag_ru_24.xml new file mode 100644 index 0000000000..deff0dc4bb --- /dev/null +++ b/app/src/main/res/drawable/img_flag_ru_24.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml new file mode 100644 index 0000000000..8f2196c2d5 --- /dev/null +++ b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-ru/strings_final.xml b/app/src/main/res/values-ru/strings_final.xml index 201a1684ae..7b022e0aa3 100644 --- a/app/src/main/res/values-ru/strings_final.xml +++ b/app/src/main/res/values-ru/strings_final.xml @@ -50,4 +50,22 @@ В сумме учтены не все монеты Управление токенами Нет цены + + Скрыть токен + Скрыть %s + Скрыть + Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно. + Невозможно скрыть %s + Токен %s является основной валютой в сети %s и не может быть скрыт, до тех пор пока у вас в списке есть другие токены этой сети. + + Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново. + Сеть %s + + Бэкап кошелька не был произведен + Чтобы защитить свои активы, мы советуем вам выполнить эту процедуру + + Карты банков РФ в данный момент не принимаются + У вас есть карта банка другой страны или платежной системы UnionPay? + Да + Нет diff --git a/app/src/main/res/values/strings_final.xml b/app/src/main/res/values/strings_final.xml index d59d31ff0e..3a16ec6ea0 100644 --- a/app/src/main/res/values/strings_final.xml +++ b/app/src/main/res/values/strings_final.xml @@ -50,4 +50,23 @@ The amount does not include some of your funds Manage tokens No rate + + Hide token + Hide %s + Hide + You are about to hide this token from the main screen. You can add it back anytime. + Unable to hide %s + The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list. + + %s network not found. Please, add it first and try again. + %s network + + Your wallet has not been backed up + To protect your assets, we advise you to carry out this procedure + Remove token + + Russian bank cards are not accepted at the moment + Do you have a bank card of another country or a UnionPay card? + Yes + No From 787c3362658ad56ecd80d7f20772209503f93497 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 5 Jul 2022 22:14:44 +0300 Subject: [PATCH 06/15] Updated on 2026-08-14 --- .../RussianCardholdersWarningBottomSheetDialog.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt index a3b84e3a48..a41dce9228 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.view.LayoutInflater import com.google.android.material.bottomsheet.BottomSheetDialog import com.tangem.tap.common.extensions.dispatchDialogHide +import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.store import com.tangem.wallet.databinding.DialogRussiansCardholdersWarningBinding @@ -28,12 +29,16 @@ class RussianCardholdersWarningBottomSheetDialog(context: Context) : BottomSheet } binding?.btnYes?.setOnClickListener { - // TODO: Open instruction WebView - dismiss() - } - binding?.btnNo?.setOnClickListener { store.dispatch(WalletAction.TradeCryptoAction.Buy(checkUserLocation = false)) dismiss() } + binding?.btnNo?.setOnClickListener { + store.dispatch(NavigationAction.OpenUrl(INSTRUCTION_URL)) + dismiss() + } + } + + companion object { + private const val INSTRUCTION_URL = "https://tangem.com/howtobuy.html" } } \ No newline at end of file From 50c3fe85b66f1d753543b2fc9f599488ccc46b04 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 6 Jul 2022 15:10:06 +0300 Subject: [PATCH 07/15] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- .../tap/common/redux/global/GlobalAction.kt | 4 +++ .../common/redux/global/GlobalMidlleware.kt | 29 ++++++++++++++++++- .../tap/common/redux/global/GlobalReducer.kt | 4 ++- .../tap/common/redux/global/GlobalState.kt | 2 +- .../tap/features/home/RegionProvider.kt | 6 ++-- .../tap/features/home/redux/HomeMiddleware.kt | 8 +++-- .../middlewares/TradeCryptoMiddleware.kt | 3 +- .../network/api/tangemTech/Responses.kt | 6 +++- .../network/api/tangemTech/TangemTechApi.kt | 2 ++ .../api/tangemTech/TangemTechService.kt | 4 +++ 11 files changed, 59 insertions(+), 11 deletions(-) diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 59ee0bff06..f50133547b 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 59ee0bff06ee54f3202421c28f7fb6e3d421dad8 +Subproject commit f50133547b5e19fb7ad32e64370573d60f6791fd diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt index 540209a39c..a82d5ba94b 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt @@ -85,4 +85,8 @@ sealed class GlobalAction : Action { object Update : GlobalAction() } + + object FetchUserCountry : GlobalAction() { + data class Success(val countryCode: String) : GlobalAction() + } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt index ea77ce5ed9..7f61d63022 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt @@ -4,13 +4,14 @@ import com.tangem.common.CompletionResult import com.tangem.common.core.TangemSdkError import com.tangem.common.extensions.guard import com.tangem.common.extensions.ifNotNull +import com.tangem.common.services.Result import com.tangem.domain.common.extensions.withMainContext -import com.tangem.tap.* import com.tangem.tap.common.extensions.dispatchDebugErrorNotification import com.tangem.tap.common.extensions.dispatchDialogShow import com.tangem.tap.common.extensions.dispatchOnMain import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.common.redux.AppState +import com.tangem.tap.currenciesRepository import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager import com.tangem.tap.features.send.redux.SendAction import com.tangem.tap.features.wallet.redux.WalletAction @@ -18,6 +19,11 @@ import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager import com.tangem.tap.network.exchangeServices.mercuryo.MercuryoApi import com.tangem.tap.network.exchangeServices.mercuryo.MercuryoService import com.tangem.tap.network.exchangeServices.moonpay.MoonPayService +import com.tangem.tap.preferencesStorage +import com.tangem.tap.scope +import com.tangem.tap.store +import com.tangem.tap.tangemSdkManager +import java.util.Locale import kotlinx.coroutines.launch import org.rekotlin.Action import org.rekotlin.DispatchFunction @@ -134,5 +140,26 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di } } } + is GlobalAction.FetchUserCountry -> { + scope.launch { + val techService = store.state.domainNetworks.tangemTechService + when (val result = techService.userCountry()) { + is Result.Success -> { + store.dispatch( + GlobalAction.FetchUserCountry.Success( + countryCode = result.data.code.lowercase() + ) + ) + } + is Result.Failure -> { + store.dispatch( + GlobalAction.FetchUserCountry.Success( + countryCode = Locale.getDefault().country.lowercase() + ) + ) + } + } + } + } } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt index 681d1f758a..449d47ae10 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt @@ -75,7 +75,9 @@ fun globalReducer(action: Action, state: AppState): GlobalState { } is GlobalAction.SetIfCardVerifiedOnline -> globalState.copy(cardVerifiedOnline = action.verified) - + is GlobalAction.FetchUserCountry.Success -> globalState.copy( + userCountryCode = action.countryCode + ) else -> globalState } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt index 54142bb9af..8588256411 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt @@ -28,7 +28,7 @@ data class GlobalState( val exchangeManager: CurrencyExchangeManager? = null, val resources: AndroidResources = AndroidResources(), val analyticsHandlers: AnalyticsHandler? = null, - val userCountry: String? = null, + val userCountryCode: String? = null, ) : StateType diff --git a/app/src/main/java/com/tangem/tap/features/home/RegionProvider.kt b/app/src/main/java/com/tangem/tap/features/home/RegionProvider.kt index 17a5076984..22cac042e5 100644 --- a/app/src/main/java/com/tangem/tap/features/home/RegionProvider.kt +++ b/app/src/main/java/com/tangem/tap/features/home/RegionProvider.kt @@ -44,5 +44,7 @@ class TelephonyManagerRegionProvider(context: Context) : RegionProvider { } class LocaleRegionProvider : RegionProvider { - override fun getRegion(): String? = Locale.current.region -} \ No newline at end of file + override fun getRegion(): String = Locale.current.region +} + +const val RUSSIA_COUNTRY_CODE = "ru" \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt index 8a3878556d..0edb0a435b 100644 --- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt @@ -15,6 +15,7 @@ import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.FragmentShareTransition import com.tangem.tap.common.redux.navigation.NavigationAction +import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE import com.tangem.tap.features.home.redux.HomeMiddleware.Companion.BUY_WALLET_URL import com.tangem.tap.features.onboarding.OnboardingHelper import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction @@ -35,7 +36,7 @@ class HomeMiddleware { } } -private val homeMiddleware: Middleware = { dispatch, state -> +private val homeMiddleware: Middleware = { _, _ -> { next -> { action -> when (action) { @@ -43,6 +44,7 @@ private val homeMiddleware: Middleware = { dispatch, state -> store.dispatch(GlobalAction.RestoreAppCurrency) store.dispatch(GlobalAction.ExchangeManager.Init) store.dispatch(HomeAction.SetTermsOfUseState(preferencesStorage.wasDisclaimerAccepted())) + store.dispatch(GlobalAction.FetchUserCountry) } is HomeAction.ShouldScanCardOnResume -> { if (action.shouldScanCard) { @@ -55,8 +57,8 @@ private val homeMiddleware: Middleware = { dispatch, state -> // store.dispatch(NavigationAction.NavigateTo(AppScreen.AddCustomTokens)) } is HomeAction.GoToShop -> { - when (action.regionProvider.getRegion()?.toLowerCase()) { - "ru" -> store.dispatchOpenUrl(BUY_WALLET_URL) + when (action.regionProvider.getRegion()?.lowercase()) { + RUSSIA_COUNTRY_CODE -> store.dispatchOpenUrl(BUY_WALLET_URL) else -> store.dispatch(NavigationAction.NavigateTo(AppScreen.Shop)) } store.state.globalState.analyticsHandlers?.triggerEvent( diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt index 636baf5aaf..ebbaae8538 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt @@ -8,6 +8,7 @@ import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.features.demo.DemoHelper +import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE import com.tangem.tap.features.send.redux.PrepareSendScreen import com.tangem.tap.features.send.redux.SendAction import com.tangem.tap.features.wallet.redux.Currency @@ -35,7 +36,7 @@ class TradeCryptoMiddleware { state: () -> AppState?, action: WalletAction.TradeCryptoAction.Buy, ) { - if (action.checkUserLocation && state()?.globalState?.userCountry == "RU") { + if (action.checkUserLocation && state()?.globalState?.userCountryCode == RUSSIA_COUNTRY_CODE) { store.dispatchOnMain( WalletAction.DialogAction.RussianCardholdersWarningDialog ) diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt b/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt index c21fb92726..9a4b2cd8b1 100644 --- a/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt +++ b/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt @@ -43,4 +43,8 @@ data class CurrenciesResponse(val currencies: List) { val unit: String, // $, €, ₽ val type: String, ) : TangemTechResponse -} \ No newline at end of file +} + +data class GeoResponse( + val code: String +) : TangemTechResponse \ No newline at end of file diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt b/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt index 0081f4ee24..80558732dd 100644 --- a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt +++ b/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt @@ -27,4 +27,6 @@ interface TangemTechApi { @GET("currencies") suspend fun currencies(): CurrenciesResponse + @GET("geo") + suspend fun geo(): GeoResponse } \ No newline at end of file diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt b/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt index 5790bdac3a..3bf3bd232e 100644 --- a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt +++ b/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt @@ -47,6 +47,10 @@ class TangemTechService { } } + suspend fun userCountry(): Result = withContext(Dispatchers.IO) { + performRequest { api.geo() } + } + suspend fun currencies(): Result = withContext(Dispatchers.IO) { performRequest { api.currencies() } } From 752e022d1478bac49bcc0a62eec33b9356333364 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 11 Jul 2022 11:09:27 +0300 Subject: [PATCH 08/15] Updated on 2026-08-14 --- app/src/main/res/values-de/strings.xml | 3 +-- app/src/main/res/values-fr/strings.xml | 3 +-- app/src/main/res/values-it/strings.xml | 3 +-- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-ru/strings_final.xml | 1 - app/src/main/res/values/strings.xml | 1 - 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 97c8b2d0af..3e7c059c3a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,5 @@ - Nein Änderungen speichern Warnung Erneut versuchen @@ -196,4 +195,4 @@ RECHTLICHER HAFTUNGSAUSSCHLUSS Um %s XTZ reduzieren Nein, alles senden - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9e6777a914..069163f054 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,7 +1,6 @@ - Non Sauvegarder les modifications Alerte Réessayer @@ -188,4 +187,4 @@ Avertissement Réduire de% s XTZ Non, envoyer toute la somme - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a7011d4bcc..7ad1cddc70 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,7 +1,6 @@ - No Mantieni le modifiche Avviso Riprova @@ -195,4 +194,4 @@ Questa nota legale è stata modificata l\'ultima volta 01.10.2020. Riduci di %s XTZ No, invia l\'intero importo - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3712df8712..1e7e892972 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,7 +1,6 @@ Tangem - Нет Сохранить изменения Предупреждение Повторить попытку @@ -382,4 +381,5 @@ Привет, команда поддержки, Пожалуйста, расскажите нам больше о Вашей проблеме. Каждая деталь может быть полезной. Информация ниже не является обязательной. Вы можете стереть её, если хотите. + Нет diff --git a/app/src/main/res/values-ru/strings_final.xml b/app/src/main/res/values-ru/strings_final.xml index 7b022e0aa3..cd706ff8af 100644 --- a/app/src/main/res/values-ru/strings_final.xml +++ b/app/src/main/res/values-ru/strings_final.xml @@ -67,5 +67,4 @@ Карты банков РФ в данный момент не принимаются У вас есть карта банка другой страны или платежной системы UnionPay? Да - Нет diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 520b7bc183..5a05ac5fae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,6 @@ Tangem - No Save changes Warning Retry From b336d9afb24501e8b73cb5d3939820eafdeecafb Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 8 Jul 2022 22:21:20 +0400 Subject: [PATCH 09/15] Updated on 2026-08-14 --- .../java/com/tangem/tap/features/home/HomeFragment.kt | 4 +++- .../java/com/tangem/tap/features/home/RegionProvider.kt | 3 ++- .../com/tangem/tap/features/home/redux/HomeAction.kt | 3 +-- .../com/tangem/tap/features/home/redux/HomeMiddleware.kt | 9 +++++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 2b26faeeba..c453cdadc4 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -38,7 +38,9 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber = { _, _ -> // store.dispatch(NavigationAction.NavigateTo(AppScreen.AddCustomTokens)) } is HomeAction.GoToShop -> { - when (action.regionProvider.getRegion()?.lowercase()) { - RUSSIA_COUNTRY_CODE -> store.dispatchOpenUrl(BUY_WALLET_URL) + when (action.userCountryCode) { + RUSSIA_COUNTRY_CODE, BELARUS_COUNTRY_CODE -> + store.dispatchOpenUrl(BUY_WALLET_URL) else -> store.dispatch(NavigationAction.NavigateTo(AppScreen.Shop)) } store.state.globalState.analyticsHandlers?.triggerEvent( From c2aaadd3141c4b20fe774900a006e09bbb4b0ae2 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 11 Jul 2022 18:31:56 +0400 Subject: [PATCH 10/15] Updated on 2026-08-14 --- .../com/tangem/tap/domain/configurable/config/ConfigManager.kt | 1 + 1 file changed, 1 insertion(+) 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 d0e7bb9584..52037f828c 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 @@ -85,6 +85,7 @@ class ConfigManager( moonPayApiKey = values.moonPayApiKey, moonPayApiSecretKey = values.moonPayApiSecretKey, mercuryoWidgetId = values.mercuryoWidgetId, + mercuryoSecret = values.mercuryoSecret, blockchainSdkConfig = BlockchainSdkConfig( blockchairApiKey = values.blockchairApiKey, blockchairAuthorizationToken = values.blockchairAuthorizationToken, From 5dff0e709cd7edba22091db123f9fb58ec3662d8 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 11 Jul 2022 18:52:03 +0400 Subject: [PATCH 11/15] Updated on 2026-08-14 --- .../network/exchangeServices/mercuryo/MercuryoService.kt | 6 ++++-- .../com/tangem/domain/common/extensions/Blockchain.kt | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt index a0068b9ce1..428b1bb0b3 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt @@ -6,6 +6,7 @@ import com.tangem.common.extensions.calculateSha512 import com.tangem.common.extensions.toHexString import com.tangem.common.services.Result import com.tangem.common.services.performRequest +import com.tangem.domain.common.extensions.removePrefixFromAddress import com.tangem.network.common.createRetrofitInstance import com.tangem.tap.common.extensions.urlEncode import com.tangem.tap.common.redux.global.CryptoCurrencyName @@ -103,14 +104,15 @@ class MercuryoService( ): String? { if (action == CurrencyExchangeManager.Action.Sell) throw UnsupportedOperationException() + val walletAddressCorrected = blockchain.removePrefixFromAddress(walletAddress) val builder = Uri.Builder() .scheme(ExchangeUrlBuilder.SCHEME) .authority("exchange.mercuryo.io") .appendQueryParameter("widget_id", mercuryoWidgetId) .appendQueryParameter("type", action.name.lowercase()) .appendQueryParameter("currency", cryptoCurrencyName) - .appendQueryParameter("address", walletAddress.urlEncode()) - .appendQueryParameter("signature", signature(walletAddress).urlEncode()) + .appendQueryParameter("address", walletAddressCorrected.urlEncode()) + .appendQueryParameter("signature", signature(walletAddressCorrected).urlEncode()) .appendQueryParameter("fix_currency", "true") .appendQueryParameter("return_url", ExchangeUrlBuilder.SUCCESS_URL) diff --git a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index b69ffb1c49..ec8fcce10c 100644 --- a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -1,5 +1,6 @@ package com.tangem.domain.common.extensions +import com.tangem.blockchain.blockchains.bitcoincash.cashaddr.CashAddr import com.tangem.blockchain.common.Blockchain fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { @@ -104,4 +105,12 @@ fun Blockchain.toCoinId(): String { Blockchain.Tron, Blockchain.TronTestnet -> "tron" else -> "unknown" } +} + +fun Blockchain.removePrefixFromAddress(address: String): String { + return when (this) { + Blockchain.BitcoinCash -> address + .removePrefix(CashAddr.MAIN_NET_PREFIX).removePrefix(":") + else -> address + } } \ No newline at end of file From b4633c6072887dc5a77f9c607a8edf689e70f236 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 11 Jul 2022 19:01:26 +0300 Subject: [PATCH 12/15] Updated on 2026-08-14 --- .../wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt index 397231a58c..3fc5905990 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt @@ -27,12 +27,12 @@ class ChooseTradeActionBottomSheetDialog(context: Context) : BottomSheetDialog(c } binding!!.dialogBtnBuy.setOnClickListener { - store.dispatch(WalletAction.TradeCryptoAction.Buy()) dismiss() + store.dispatch(WalletAction.TradeCryptoAction.Buy()) } binding!!.dialogBtnSell.setOnClickListener { - store.dispatch(WalletAction.TradeCryptoAction.Sell) dismiss() + store.dispatch(WalletAction.TradeCryptoAction.Sell) } } } \ No newline at end of file From f274e2c5ddb93ee2d7473241118bb359ea467592 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 11 Jul 2022 21:45:47 +0400 Subject: [PATCH 13/15] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index f50133547b..59ee0bff06 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit f50133547b5e19fb7ad32e64370573d60f6791fd +Subproject commit 59ee0bff06ee54f3202421c28f7fb6e3d421dad8 From 699f261589c7b29e485c92562ad09954833ed72d Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 12 Jul 2022 11:08:13 +0400 Subject: [PATCH 14/15] Updated on 2026-08-14 --- .../network/exchangeServices/mercuryo/MercuryoService.kt | 9 +++------ .../com/tangem/domain/common/extensions/Blockchain.kt | 9 --------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt index 428b1bb0b3..2d446490ec 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt @@ -6,9 +6,7 @@ import com.tangem.common.extensions.calculateSha512 import com.tangem.common.extensions.toHexString import com.tangem.common.services.Result import com.tangem.common.services.performRequest -import com.tangem.domain.common.extensions.removePrefixFromAddress import com.tangem.network.common.createRetrofitInstance -import com.tangem.tap.common.extensions.urlEncode import com.tangem.tap.common.redux.global.CryptoCurrencyName import com.tangem.tap.features.wallet.redux.Currency import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager @@ -101,18 +99,17 @@ class MercuryoService( cryptoCurrencyName: CryptoCurrencyName, fiatCurrencyName: String, walletAddress: String - ): String? { + ): String { if (action == CurrencyExchangeManager.Action.Sell) throw UnsupportedOperationException() - val walletAddressCorrected = blockchain.removePrefixFromAddress(walletAddress) val builder = Uri.Builder() .scheme(ExchangeUrlBuilder.SCHEME) .authority("exchange.mercuryo.io") .appendQueryParameter("widget_id", mercuryoWidgetId) .appendQueryParameter("type", action.name.lowercase()) .appendQueryParameter("currency", cryptoCurrencyName) - .appendQueryParameter("address", walletAddressCorrected.urlEncode()) - .appendQueryParameter("signature", signature(walletAddressCorrected).urlEncode()) + .appendQueryParameter("address", walletAddress) + .appendQueryParameter("signature", signature(walletAddress)) .appendQueryParameter("fix_currency", "true") .appendQueryParameter("return_url", ExchangeUrlBuilder.SUCCESS_URL) diff --git a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index ec8fcce10c..b69ffb1c49 100644 --- a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -1,6 +1,5 @@ package com.tangem.domain.common.extensions -import com.tangem.blockchain.blockchains.bitcoincash.cashaddr.CashAddr import com.tangem.blockchain.common.Blockchain fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { @@ -105,12 +104,4 @@ fun Blockchain.toCoinId(): String { Blockchain.Tron, Blockchain.TronTestnet -> "tron" else -> "unknown" } -} - -fun Blockchain.removePrefixFromAddress(address: String): String { - return when (this) { - Blockchain.BitcoinCash -> address - .removePrefix(CashAddr.MAIN_NET_PREFIX).removePrefix(":") - else -> address - } } \ No newline at end of file From 8a94c2cc5844ef1535d419c56ede85c418680d55 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 12 Jul 2022 14:48:28 +0400 Subject: [PATCH 15/15] Updated on 2026-08-14 --- .../com/tangem/tap/common/DialogManager.kt | 7 ---- .../tap/features/wallet/redux/WalletState.kt | 40 +------------------ .../wallet/redux/models/WalletDialog.kt | 2 + .../CurrencyExchangeManager.kt | 2 +- .../exchangeServices/ExchangeService.kt | 2 +- .../mercuryo/MercuryoService.kt | 2 +- .../moonpay/MoonPayService.kt | 2 +- 7 files changed, 8 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/common/DialogManager.kt b/app/src/main/java/com/tangem/tap/common/DialogManager.kt index 7b67bb6555..70f4ae2d61 100644 --- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt +++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt @@ -18,13 +18,6 @@ import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.ConfirmDisc import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.UnfinishedBackupFoundDialog import com.tangem.tap.features.wallet.redux.models.WalletDialog import com.tangem.tap.features.wallet.ui.dialogs.* -import com.tangem.tap.features.wallet.redux.WalletDialog -import com.tangem.tap.features.wallet.ui.dialogs.AmountToSendBottomSheetDialog -import com.tangem.tap.features.wallet.ui.dialogs.ChooseTradeActionBottomSheetDialog -import com.tangem.tap.features.wallet.ui.dialogs.RussianCardholdersWarningBottomSheetDialog -import com.tangem.tap.features.wallet.ui.dialogs.ScanFailsDialog -import com.tangem.tap.features.wallet.ui.dialogs.SignedHashesWarningDialog -import com.tangem.tap.features.wallet.ui.dialogs.SimpleOkDialog import com.tangem.tap.features.wallet.ui.wallet.CurrencySelectionDialog import com.tangem.tap.store import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt index a1e0220339..ba70c84e05 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt @@ -1,55 +1,30 @@ package com.tangem.tap.features.wallet.redux import android.graphics.Bitmap -import com.tangem.blockchain.common.Amount import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.Token import com.tangem.blockchain.common.Wallet import com.tangem.blockchain.common.WalletManager -import com.tangem.blockchain.common.Amount -import com.tangem.blockchain.common.Blockchain -import com.tangem.blockchain.common.DerivationStyle -import com.tangem.blockchain.common.Token -import com.tangem.blockchain.common.Wallet -import com.tangem.blockchain.common.WalletManager import com.tangem.blockchain.common.address.AddressType import com.tangem.common.extensions.isZero import com.tangem.domain.common.extensions.canHandleToken import com.tangem.tap.common.entities.Button -import com.tangem.tap.common.entities.FiatCurrency import com.tangem.tap.common.extensions.toQrCode -import com.tangem.tap.common.redux.StateDialog import com.tangem.tap.common.redux.global.CryptoCurrencyName import com.tangem.tap.common.toggleWidget.WidgetState import com.tangem.tap.domain.configurable.warningMessage.WarningMessage import com.tangem.tap.domain.tokens.models.BlockchainNetwork import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState -import com.tangem.tap.features.wallet.models.Currency -import com.tangem.tap.features.wallet.models.PendingTransaction -import com.tangem.tap.features.wallet.models.TotalBalance -import com.tangem.tap.features.wallet.models.WalletRent -import com.tangem.tap.features.wallet.models.WalletWarning -import com.tangem.tap.features.wallet.models.hasPendingTransactions -import com.tangem.tap.features.wallet.models.hasSendableAmounts -import com.tangem.tap.features.wallet.models.isSendableAmount -import com.tangem.tap.features.tokens.redux.TokenWithBlockchain -import com.tangem.tap.features.wallet.models.PendingTransaction -import com.tangem.tap.features.wallet.models.TotalBalance -import com.tangem.tap.features.wallet.models.WalletRent -import com.tangem.tap.features.wallet.models.WalletWarning -import com.tangem.tap.features.wallet.models.hasPendingTransactions -import com.tangem.tap.features.wallet.models.hasSendableAmounts -import com.tangem.tap.features.wallet.models.isSendableAmount +import com.tangem.tap.features.wallet.models.* import com.tangem.tap.features.wallet.redux.reducers.calculateTotalFiatAmount import com.tangem.tap.features.wallet.redux.reducers.findProgressState import com.tangem.tap.features.wallet.ui.BalanceStatus import com.tangem.tap.features.wallet.ui.BalanceWidgetData import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager import com.tangem.tap.store +import org.rekotlin.StateType import java.math.BigDecimal -import org.rekotlin.StateType import kotlin.properties.ReadOnlyProperty -import org.rekotlin.StateType data class WalletState( val state: ProgressState = ProgressState.Done, @@ -333,17 +308,6 @@ data class WalletState( } } -sealed interface WalletDialog : StateDialog { - data class SelectAmountToSendDialog(val amounts: List?) : WalletDialog - object SignedHashesMultiWalletDialog : WalletDialog - object ChooseTradeActionDialog : WalletDialog - data class CurrencySelectionDialog( - val currenciesList: List, - val currentAppCurrency: FiatCurrency, - ) : WalletDialog - object RussianCardholdersWarningDialog : WalletDialog -} - enum class ProgressState : WidgetState { Loading, Refreshing, Done, Error } enum class ErrorType { NoInternetConnection } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt index a5a54c93f6..68718acd45 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt @@ -30,4 +30,6 @@ sealed interface WalletDialog : StateDialog { val messageRes: Int = R.string.token_details_unable_hide_alert_message val titleRes: Int = R.string.token_details_unable_hide_alert_title } + + object RussianCardholdersWarningDialog : WalletDialog } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt index 745ee01053..811c9c0545 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt @@ -11,7 +11,7 @@ import com.tangem.tap.common.extensions.safeUpdate import com.tangem.tap.common.redux.global.CryptoCurrencyName import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.domain.TangemSigner -import com.tangem.tap.features.wallet.redux.Currency +import com.tangem.tap.features.wallet.models.Currency import com.tangem.tap.store import com.tangem.tap.tangemSdk import java.math.BigDecimal diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt index e08e007029..712fd2d5e0 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt @@ -1,7 +1,7 @@ package com.tangem.tap.network.exchangeServices import com.tangem.blockchain.common.Blockchain -import com.tangem.tap.features.wallet.redux.Currency +import com.tangem.tap.features.wallet.models.Currency interface ExchangeService { suspend fun update() diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt index 2d446490ec..97190aa9fd 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt @@ -8,7 +8,7 @@ import com.tangem.common.services.Result import com.tangem.common.services.performRequest import com.tangem.network.common.createRetrofitInstance import com.tangem.tap.common.redux.global.CryptoCurrencyName -import com.tangem.tap.features.wallet.redux.Currency +import com.tangem.tap.features.wallet.models.Currency import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager import com.tangem.tap.network.exchangeServices.ExchangeService import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt index 161cfc568a..fa96286e84 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt @@ -9,7 +9,7 @@ import com.tangem.domain.common.extensions.withIOContext import com.tangem.network.common.createRetrofitInstance import com.tangem.tap.common.extensions.urlEncode import com.tangem.tap.common.redux.global.CryptoCurrencyName -import com.tangem.tap.features.wallet.redux.Currency +import com.tangem.tap.features.wallet.models.Currency import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager import com.tangem.tap.network.exchangeServices.ExchangeService import com.tangem.tap.network.exchangeServices.ExchangeUrlBuilder