From 5d2282b734231610e210abe16d0c4893d85406df Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 29 Jun 2023 10:55:38 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../data/DefaultLearn2earnRepository.kt | 9 ++++++++- .../data/models/PromotionInfoResponseExt.kt | 14 -------------- .../domain/DefaultLearn2earnInteractor.kt | 16 ++++++++++++---- .../learn2earn/domain/models/PromotionExt.kt | 14 -------------- 4 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromotionInfoResponseExt.kt delete mode 100644 features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/PromotionExt.kt diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt index 4718b9e094..c10f0d57bb 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/DefaultLearn2earnRepository.kt @@ -6,7 +6,6 @@ import com.tangem.datasource.api.promotion.models.* import com.tangem.feature.learn2earn.data.api.Learn2earnPreferenceStorage import com.tangem.feature.learn2earn.data.api.Learn2earnRepository import com.tangem.feature.learn2earn.data.models.PromoUserData -import com.tangem.feature.learn2earn.data.models.getData import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider import kotlinx.coroutines.withContext import timber.log.Timber @@ -127,4 +126,12 @@ internal class DefaultLearn2earnRepository( private companion object { const val PROGRAM_NAME: String = "1inch" } +} + +private fun PromotionInfoResponse.getData(promoCode: String?): PromotionInfoResponse.Data? { + return if (promoCode == null) { + newCard + } else { + oldCard + } } \ No newline at end of file diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromotionInfoResponseExt.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromotionInfoResponseExt.kt deleted file mode 100644 index ff422dc670..0000000000 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/data/models/PromotionInfoResponseExt.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.tangem.feature.learn2earn.data.models - -import com.tangem.datasource.api.promotion.models.PromotionInfoResponse - -/** -[REDACTED_AUTHOR] - */ -internal fun PromotionInfoResponse.getData(promoCode: String?): PromotionInfoResponse.Data? { - return if (promoCode == null) { - newCard - } else { - oldCard - } -} \ No newline at end of file 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 5342c96630..6ed2706253 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 @@ -8,7 +8,6 @@ import com.tangem.feature.learn2earn.data.models.PromoUserData import com.tangem.feature.learn2earn.domain.api.* import com.tangem.feature.learn2earn.domain.models.Promotion import com.tangem.feature.learn2earn.domain.models.PromotionError -import com.tangem.feature.learn2earn.domain.models.getData import com.tangem.feature.learn2earn.domain.models.toDomainError import com.tangem.lib.crypto.DerivationManager import com.tangem.lib.crypto.UserWalletManager @@ -210,11 +209,12 @@ class DefaultLearn2earnInteractor( onSuccess = { response -> val responseError = response.error if (responseError == null) { + val npeMessage = { "Shouldn't be null" } Promotion( info = Promotion.PromotionInfo( - newCard = response.newCard!!, - oldCard = response.oldCard!!, - awardPaymentToken = response.awardPaymentToken!!, + newCard = requireNotNull(response.newCard, npeMessage), + oldCard = requireNotNull(response.oldCard, npeMessage), + awardPaymentToken = requireNotNull(response.awardPaymentToken, npeMessage), ), error = null, ) @@ -252,4 +252,12 @@ class DefaultLearn2earnInteractor( repository.updateUserData(this) } } +} + +private fun Promotion.PromotionInfo.getData(promoCode: String?): PromotionInfoResponse.Data { + return if (promoCode == null) { + newCard + } else { + oldCard + } } \ No newline at end of file diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/PromotionExt.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/PromotionExt.kt deleted file mode 100644 index 6b9ddbc060..0000000000 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/domain/models/PromotionExt.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.tangem.feature.learn2earn.domain.models - -import com.tangem.datasource.api.promotion.models.PromotionInfoResponse - -/** -[REDACTED_AUTHOR] - */ -internal fun Promotion.PromotionInfo.getData(promoCode: String?): PromotionInfoResponse.Data { - return if (promoCode == null) { - newCard - } else { - oldCard - } -} \ No newline at end of file