From 982bd4130e233e9152f1a2c698c3181cb888a85e Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 27 Jun 2023 20:18:25 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../learn2earn/domain/DefaultLearn2earnInteractor.kt | 6 ++---- .../feature/learn2earn/domain/api/Learn2earnInteractor.kt | 2 +- .../feature/learn2earn/presentation/Learn2earnViewModel.kt | 3 +-- .../feature/learn2earn/presentation/ui/GetBonusView.kt | 2 +- .../learn2earn/presentation/ui/state/Learn2earnState.kt | 4 ++-- .../learn2earn/presentation/ui/state/StateBuilder.kt | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt index 2eea7cf470..b32e34cc9f 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/DefaultLearn2earnInteractor.kt @@ -61,17 +61,15 @@ class DefaultLearn2earnInteractor( return repository.getUserData().isRegisteredInPromotion } - override fun getAwardAmount(): Pair { + override fun getAwardAmount(): Int { val userInfo = repository.getUserData() val promotionInfo = promotion.getPromotionInfo() - val awardAmount = if (userInfo.promoCode == null) { + return if (userInfo.promoCode == null) { promotionInfo.awardForOldCard } else { promotionInfo.awardForNewCard }.toInt() - - return awardAmount to awardAmount.toString() } @Throws(IllegalArgumentException::class) diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt index 1121665973..55cd1adfce 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/api/Learn2earnInteractor.kt @@ -21,7 +21,7 @@ interface Learn2earnInteractor : WebViewRedirectHandler { fun isUserRegisteredInPromotion(): Boolean - fun getAwardAmount(): Pair + fun getAwardAmount(): Int @Throws(IllegalArgumentException::class) suspend fun requestAward(): Result 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 7f65afe887..8cd6e4536c 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 @@ -109,8 +109,7 @@ class Learn2earnViewModel @Inject constructor( return if (interactor.isUserRegisteredInPromotion()) { MainScreenState.Description.GetBonus } else { - val (count, award) = interactor.getAwardAmount() - MainScreenState.Description.Learn(count, award) + MainScreenState.Description.Learn(interactor.getAwardAmount()) } } diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt index 392f3e1e04..ed76e37110 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusView.kt @@ -146,7 +146,7 @@ private fun OneInchStoriesContentPreview_Dark() { private fun makePreviewState(): MainScreenState = MainScreenState( isVisible = true, onClick = {}, - description = MainScreenState.Description.Learn(0, "0"), + description = MainScreenState.Description.Learn(0), logoState = MainScreenState.LogoState.Idle, showProgress = false, ) \ No newline at end of file diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt index 7ceb3441d6..2f6d1381f0 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/Learn2earnState.kt @@ -36,9 +36,9 @@ data class MainScreenState( sealed class Description(val title: TextReference, val subtitle: TextReference) { - class Learn(count: Int, award: String) : Description( + class Learn(award: Int) : Description( TextReference.Res(R.string.main_learn_title), - TextReference.PluralRes(R.plurals.main_learn_subtitle, count, WrappedList(listOf(award))), + TextReference.PluralRes(R.plurals.main_learn_subtitle, award, WrappedList(listOf(award))), ) object GetBonus : Description( diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt index 4faefc208d..57dc52fc59 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/state/StateBuilder.kt @@ -12,7 +12,7 @@ internal fun Learn2earnState.Companion.init(uiActions: UiActions): Learn2earnSta mainScreenState = MainScreenState( isVisible = false, onClick = uiActions.buttonMainClick, - description = MainScreenState.Description.Learn(0, "0"), + description = MainScreenState.Description.Learn(0), logoState = MainScreenState.LogoState.Idle, showProgress = false, ),