From 0eaa783a13f0ed2a6535a0f9bdb4acbac372543e Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 23 Jan 2025 17:37:53 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/tap/common/DialogManager.kt | 4 - .../com/tangem/tap/common/redux/AppDialog.kt | 4 - ...sianCardholdersWarningBottomSheetDialog.kt | 54 --------- .../features/onboarding/OnboardingHelper.kt | 15 +-- .../middlewares/TradeCryptoMiddleware.kt | 20 +-- .../dialog_russians_cardholders_warning.xml | 114 ------------------ core/res/src/main/res/values-de/strings.xml | 2 - core/res/src/main/res/values-es/strings.xml | 2 - core/res/src/main/res/values-fr/strings.xml | 2 - core/res/src/main/res/values-ja/strings.xml | 2 - core/res/src/main/res/values-ru/strings.xml | 2 - .../src/main/res/values-uk-rUA/strings.xml | 2 - .../src/main/res/values-zh-rTW/strings.xml | 1 - core/res/src/main/res/values/strings.xml | 2 - 14 files changed, 5 insertions(+), 221 deletions(-) delete mode 100644 app/src/main/java/com/tangem/tap/common/ui/RussianCardholdersWarningBottomSheetDialog.kt delete 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 b4df44bdff..da4a494936 100644 --- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt +++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt @@ -58,10 +58,6 @@ class DialogManager : StoreSubscriber { ) is AppDialog.AddressInfoDialog -> AddressInfoBottomSheetDialog(state.dialog, context) is AppDialog.TestActionsDialog -> TestActionsBottomSheetDialog(state.dialog, context) - is AppDialog.RussianCardholdersWarningDialog -> RussianCardholdersWarningBottomSheetDialog( - context, - state.dialog.data, - ) is OnboardingDialog.TwinningProcessNotCompleted -> TwinningProcessNotCompletedDialog.create(context) is OnboardingDialog.InterruptOnboarding -> InterruptOnboardingDialog.create(context, state.dialog) is OnboardingDialog.WalletActivationError -> WalletActivationErrorDialog.create(context, state.dialog) diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppDialog.kt b/app/src/main/java/com/tangem/tap/common/redux/AppDialog.kt index 4586881efc..1188cd7d03 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/AppDialog.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/AppDialog.kt @@ -27,10 +27,6 @@ sealed class AppDialog : StateDialog { val actionsList: List, ) : AppDialog() - data class RussianCardholdersWarningDialog(val data: Data?) : AppDialog() { - data class Data(val topUpUrl: String) - } - data class RemoveWalletDialog( val currencyTitle: String, val onOk: () -> Unit, diff --git a/app/src/main/java/com/tangem/tap/common/ui/RussianCardholdersWarningBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/common/ui/RussianCardholdersWarningBottomSheetDialog.kt deleted file mode 100644 index 5b0ac2e000..0000000000 --- a/app/src/main/java/com/tangem/tap/common/ui/RussianCardholdersWarningBottomSheetDialog.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.tangem.tap.common.ui - -import android.content.Context -import android.os.Bundle -import android.view.LayoutInflater -import com.google.android.material.bottomsheet.BottomSheetDialog -import com.tangem.core.analytics.Analytics -import com.tangem.tap.common.analytics.events.Token -import com.tangem.tap.common.extensions.dispatchDialogHide -import com.tangem.tap.common.extensions.dispatchOpenUrl -import com.tangem.tap.common.redux.AppDialog -import com.tangem.tap.store -import com.tangem.wallet.databinding.DialogRussiansCardholdersWarningBinding - -class RussianCardholdersWarningBottomSheetDialog( - context: Context, - private val dialogData: AppDialog.RussianCardholdersWarningDialog.Data?, -) : BottomSheetDialog(context) { - - private var binding: DialogRussiansCardholdersWarningBinding? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - Analytics.send(Token.Topup.P2PScreenOpened()) - binding = DialogRussiansCardholdersWarningBinding - .inflate(LayoutInflater.from(context)) - .also { setContentView(it.root) } - } - - override fun show() { - super.show() - setOnDismissListener { - binding = null - store.dispatchDialogHide() - } - - binding?.btnYes?.setOnClickListener { - if (dialogData != null) { - store.dispatchOpenUrl(dialogData.topUpUrl) - Analytics.send(Token.Topup.ScreenOpened()) - } - - dismiss() - } - binding?.btnNo?.setOnClickListener { - store.dispatchOpenUrl(INSTRUCTION_URL) - dismiss() - } - } - - companion object { - private const val INSTRUCTION_URL = "https://tangem.com/howtobuy.html" - } -} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt index 796b99ce27..7c1adf4a81 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt @@ -13,7 +13,6 @@ import com.tangem.domain.common.util.twinsIsTwinned import com.tangem.domain.models.scan.CardDTO import com.tangem.domain.models.scan.ProductType import com.tangem.domain.models.scan.ScanResponse -import com.tangem.domain.settings.usercountry.models.UserCountry import com.tangem.domain.wallets.builder.UserWalletBuilder import com.tangem.domain.wallets.builder.UserWalletIdBuilder import com.tangem.domain.wallets.models.UserWallet @@ -21,7 +20,6 @@ import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter import com.tangem.tap.common.analytics.events.AnalyticsParam import com.tangem.tap.common.analytics.events.Onboarding import com.tangem.tap.common.extensions.* -import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.features.demo.DemoHelper import com.tangem.tap.features.onboarding.products.wallet.redux.BackupStartedSource import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletAction @@ -235,18 +233,7 @@ object OnboardingHelper { val currencyType = AnalyticsParam.CurrencyType.Blockchain(blockchain) Analytics.send(Onboarding.Topup.ButtonBuyCrypto(currencyType)) - scope.launch { - val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase) - val isRussia = getUserCountryCodeUseCase.invokeSync().isRight { it is UserCountry.Russia } - - val onrampFeatureToggles = store.inject(DaggerGraphState::onrampFeatureToggles) - if (isRussia && !onrampFeatureToggles.isFeatureEnabled) { - val dialogData = AppDialog.RussianCardholdersWarningDialog.Data(topUpUrl) - store.dispatchDialogShow(AppDialog.RussianCardholdersWarningDialog(dialogData)) - } else { - store.dispatchOpenUrl(topUpUrl) - } - } + store.dispatchOpenUrl(topUpUrl) } private suspend fun proceedWithScanResponse( 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 6c9ed1d2e8..9bda54aa7d 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 @@ -6,15 +6,16 @@ import com.tangem.common.routing.AppRoute import com.tangem.common.routing.AppRouter import com.tangem.core.analytics.Analytics import com.tangem.domain.onramp.model.OnrampSource -import com.tangem.domain.settings.usercountry.models.UserCountry import com.tangem.domain.tokens.legacy.TradeCryptoAction import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.tokens.model.NetworkAddress import com.tangem.domain.wallets.models.UserWalletId import com.tangem.tap.common.analytics.events.Token import com.tangem.tap.common.apptheme.MutableAppThemeModeHolder -import com.tangem.tap.common.extensions.* -import com.tangem.tap.common.redux.AppDialog +import com.tangem.tap.common.extensions.dispatchDebugErrorNotification +import com.tangem.tap.common.extensions.dispatchNavigationAction +import com.tangem.tap.common.extensions.dispatchOpenUrl +import com.tangem.tap.common.extensions.inject import com.tangem.tap.common.redux.AppState import com.tangem.tap.features.demo.DemoHelper import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager @@ -89,19 +90,6 @@ object TradeCryptoMiddleware { ) scope.launch { - val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase) - val onrampFeatureToggles = store.inject(DaggerGraphState::onrampFeatureToggles) - - val isRussia = getUserCountryCodeUseCase.invokeSync().isRight { it is UserCountry.Russia } - - if (action.checkUserLocation && isRussia && !onrampFeatureToggles.isFeatureEnabled) { - val dialogData = topUrl?.let { - AppDialog.RussianCardholdersWarningDialog.Data(topUpUrl = it) - } - store.dispatchDialogShow(AppDialog.RussianCardholdersWarningDialog(data = dialogData)) - return@launch - } - if (currency is CryptoCurrency.Token && currency.network.isTestnet) { val walletManager = store.inject(DaggerGraphState::walletManagersFacade) .getOrCreateWalletManager( diff --git a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml b/app/src/main/res/layout/dialog_russians_cardholders_warning.xml deleted file mode 100644 index a666076b95..0000000000 --- a/app/src/main/res/layout/dialog_russians_cardholders_warning.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml index 6e3db49a06..2f5c61bad2 100644 --- a/core/res/src/main/res/values-de/strings.xml +++ b/core/res/src/main/res/values-de/strings.xml @@ -655,8 +655,6 @@ Beim Zurücksetzen auf die Werkseinstellungen wird die Wallet der ausgewählten Karte oder Ring vollständig gelöscht und aus der App entfernt. Es ist nicht möglich, die aktuelle Wallet wiederherzustellen. Ringbesitzer erhalten bis zum 15.11. 3 provisionsfreie Swaps auf Changelly! Jetzt mit 0 %% Gebühren tauschen! - Besitzt du eine Bankkarte aus einem anderen Land und eine Aufenthaltserlaubnis oder Registrierung außerhalb der Russischen Föderation? - Russische Bankkarten werden derzeit nicht akzeptiert Melde dich bei der App an und überprüfe dein Guthaben, ohne die Karte oder Ring zu scannen Zugriff auf die App Nutzung biometrischer Daten zulassen diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml index ad2f784c78..17a3e7c35f 100644 --- a/core/res/src/main/res/values-es/strings.xml +++ b/core/res/src/main/res/values-es/strings.xml @@ -653,8 +653,6 @@ El restablecimiento de fábrica eliminará completamente la billetera de la tarjeta seleccionada y lo eliminará de la app. No podrá restaurar la billetera actual. Si tienes un Anillo Tangem, ¡3 swaps sin comisión en Changelly hasta el 15/11! ¡Intercambia con 0%% de comisión! - ¿Tiene una tarjeta bancaria de otro país y un permiso de residencia o registro fuera de la Federación Rusa? - Las tarjetas bancarias rusas no se aceptan actualmente Inicie sesión en la app y comprueba su saldo sin escanear la tarjeta Acceder a la app Permitir el uso de biometría diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml index 2f0c658d65..86ef15600b 100644 --- a/core/res/src/main/res/values-fr/strings.xml +++ b/core/res/src/main/res/values-fr/strings.xml @@ -655,8 +655,6 @@ La réinitialisation aux paramètres d\'usine supprimera complètement le portefeuille de la carte sélectionnée et le supprimera de l\'application. Vous ne pourrez pas restaurer le portefeuille actuel. Les propriétaires du Tangem Ring ont droit à 3 swap gratis sur Changelly jusqu\'au 15/11 ! Échangez avec 0 %% de frais ! - Avez-vous une carte bancaire d\'un autre pays et un permis de séjour ou une inscription en dehors de la Fédération de Russie ? - Les cartes bancaires russes ne sont actuellement pas acceptées Connectez-vous à l\'application et vérifiez votre solde sans scanner la carte Accéder à l\'application Autoriser l\'utilisation de la biométrie diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml index 7d9a780c4d..a8301f66bd 100644 --- a/core/res/src/main/res/values-ja/strings.xml +++ b/core/res/src/main/res/values-ja/strings.xml @@ -645,8 +645,6 @@ 工場出荷時の状態にリセットすると、選択したカードやリングからウォレットが完全に削除され、アプリから削除されます。現在のウォレットを復元することはできません。 Tangem Ringユーザーは、11/15日までChangelly経由でスワップを3回手数料ゼロで行えます！ 今すぐ手数料0%%でスワップしましょう！ - 他の国の銀行カードと、ロシア連邦外での居住許可証または登録をお持ちですか? - ロシアの銀行カードは現在ご利用いただけません アプリにログインして、カードまたはリングをスキャンせずに残高を確認できます アプリにアクセスする 生体認証の使用を許可する diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 191593c0bb..7872200a96 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -673,8 +673,6 @@ Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты или кольца. Вы не сможете восстановить текущий кошелек. Владельцам колец — 3 обмена без комиссии на Changelly до 15.11! Обмен с 0%% комиссией! - У вас есть карта банка другой страны, а также вид на жительство или регистрация вне РФ? - Карты банков РФ в данный момент не принимаются Войдите в приложение и следите за своим балансом без сканирования карты или кольца Доступ в приложение Использовать биометрию diff --git a/core/res/src/main/res/values-uk-rUA/strings.xml b/core/res/src/main/res/values-uk-rUA/strings.xml index 5203d19d26..32c50d1bcf 100644 --- a/core/res/src/main/res/values-uk-rUA/strings.xml +++ b/core/res/src/main/res/values-uk-rUA/strings.xml @@ -673,8 +673,6 @@ Скидання до заводських налаштувань призведе до повного видалення гаманця з обраної картки або кільця. Ви не зможете відновити поточний гаманець. Власникам кілець - 3 обміни без комісії на Changelly до 15.11! Обмін з 0%% комісією! - У вас є банківська картка іншої країни та посвідка на проживання або реєстрація за межами Російської Федерації? - Російські банківські картки наразі не приймаються Увійдіть у додаток та слідкуйте за своїм балансом без сканування картки чи кільця Доступ до додатку Використовувати біометрію diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml index f144efa47f..1e2134aa6e 100644 --- a/core/res/src/main/res/values-zh-rTW/strings.xml +++ b/core/res/src/main/res/values-zh-rTW/strings.xml @@ -237,7 +237,6 @@ 我了解執行此操作後，我將無法再訪問當前錢包 恢復原廠設置將從所選卡中完全刪除錢包。您將無法恢復當前錢包或使用卡恢復訪問密碼 恢復原廠設置將從所選卡中完全刪除錢包並將其從應用程序中刪除。您將無法恢復當前錢包 - 目前不接受俄羅斯銀行卡 登錄應用程序並在不掃描卡片的情況下檢查您的資產 訪問應用程序 允許使用生物辨識 diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 7f19088018..1255b3a06e 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -655,8 +655,6 @@ Factory Reset will completely delete the wallet from the selected card or ring and remove it from the app. You will not be able to restore the current wallet. Ring owners get 3 commission-free swaps on Changelly until 15.11! Swap With 0%% Fees Now! - Do you have a bank card from another country and a residence permit or registration outside the Russian Federation? - Russian bank cards are not currently accepted Log into the app and check your balance without scanning the card or ring Access the app Allow to use biometrics