From 3d33a141d3eda1a42b38505b382c8ff0b87a5796 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 25 Jul 2023 18:28:09 +0300 Subject: [PATCH] Updated on 2026-08-14 --- core/res/src/main/res/values-ru/strings.xml | 2 +- core/res/src/main/res/values/strings.xml | 2 +- .../learn2earn/analytics/Learn2earnEvents.kt | 7 ++++-- .../presentation/Learn2earnViewModel.kt | 22 +++++++++++++++---- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 00f29ea502..7076371f81 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -173,7 +173,7 @@ Бэкап кошелька не был произведен Баланс В сумме учтены не все монеты - 1INCH токены будут зачислены на адрес вашего кошелька в сети %s в течение 24 часов + 1INCH токены будут зачислены на адрес вашего кошелька в сети %s в течение 48 часов По вашему промокоду не было покупки кошелька, а значит вы не можете получить бонус. Купите кошелек Tangem, отсканируйте его в приложении и получите бонус. Чтобы получить доступ ко всем сетям, вам необходимо отсканировать карту Отсканируйте карту diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 2be8d9db1b..e207afb74d 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -170,7 +170,7 @@ Your wallet has not been backed up Total balance The amount does not include some of your funds - 1INCH tokens will be credited to your %s wallet address within 24 hours + 1INCH tokens will be credited to your %s wallet address within 48 hours There was no purchase of a wallet using your promo code, which means you cannot receive a bonus. Buy Tangem wallet, scan it in the app, and get the bonus. To access all the networks you need to scan the card Scan your card diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/analytics/Learn2earnEvents.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/analytics/Learn2earnEvents.kt index 164fa4e793..b5c1d46121 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/analytics/Learn2earnEvents.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/analytics/Learn2earnEvents.kt @@ -38,7 +38,10 @@ internal sealed class Learn2earnEvents( params = mapOf(AnalyticsParam.CLIENT_TYPE to clientType.value), ) - class NoticeClaimSuccess : MainScreen("Notice - Claim Successed") + class NoticeClaimSuccess(clientType: AnalyticsParam.ClientType) : MainScreen( + event = "Notice - Successful Claim", + params = mapOf(AnalyticsParam.CLIENT_TYPE to clientType.value), + ) } sealed class PromoScreen( @@ -65,6 +68,6 @@ internal sealed class AnalyticsParam { } companion object Key { - const val CLIENT_TYPE = "Client type" + const val CLIENT_TYPE = "Client Type" } } \ No newline at end of file diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt index a8f50708b3..875d16a031 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/Learn2earnViewModel.kt @@ -141,11 +141,11 @@ class Learn2earnViewModel @Inject constructor( } private fun onButtonMainClick() { - if (interactor.isUserHadPromoCode() || interactor.isUserRegisteredInPromotion()) { - analytics.send(Learn2earnEvents.MainScreen.NoticeLear2earn(AnalyticsParam.ClientType.Old())) + val isUserHasPromo = interactor.isUserHadPromoCode() + analytics.send(Learn2earnEvents.MainScreen.NoticeLear2earn(getAnalyticsClientType(isUserHasPromo))) + if (isUserHasPromo || interactor.isUserRegisteredInPromotion()) { requestAward() } else { - analytics.send(Learn2earnEvents.MainScreen.NoticeLear2earn(AnalyticsParam.ClientType.New())) subscribeToWebViewResultEvents() router.openWebView(interactor.buildUriForOldUser(), interactor.getBasicAuthHeaders()) } @@ -159,7 +159,13 @@ class Learn2earnViewModel @Inject constructor( .onSuccess { requestAwardResult -> requestAwardResult.fold( onSuccess = { - analytics.send(Learn2earnEvents.MainScreen.NoticeClaimSuccess()) + analytics.send( + Learn2earnEvents.MainScreen.NoticeClaimSuccess( + clientType = getAnalyticsClientType( + isUserHasPromo = interactor.isUserHadPromoCode(), + ), + ), + ) val onHideDialog = { uiState = uiState.updateViewsVisibility(isVisible = false) .hideDialog() @@ -203,6 +209,14 @@ class Learn2earnViewModel @Inject constructor( } } + private fun getAnalyticsClientType(isUserHasPromo: Boolean): AnalyticsParam.ClientType { + return if (isUserHasPromo) { + AnalyticsParam.ClientType.New() + } else { + AnalyticsParam.ClientType.Old() + } + } + private fun createErrorDialog(error: PromotionError): MainScreenState.Dialog? { return when (error) { is PromotionError.CodeWasNotAppliedInShop -> {