From 2fd785580ddbceadb27512928508c8bf463a34cf Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 19 Oct 2023 16:52:42 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../java/com/tangem/tap/features/home/redux/HomeAction.kt | 4 ++-- .../products/wallet/redux/OnboardingWalletAction.kt | 4 ++-- .../com/tangem/tap/features/wallet/redux/WalletAction.kt | 3 ++- .../features/wallet/redux/middlewares/WalletMiddleware.kt | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt index 5623bd46a0..4b83396c14 100644 --- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt +++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt @@ -1,10 +1,10 @@ package com.tangem.tap.features.home.redux -import androidx.lifecycle.LifecycleCoroutineScope import com.tangem.core.analytics.models.AnalyticsEvent import com.tangem.tap.common.analytics.events.AnalyticsParam import com.tangem.tap.common.analytics.events.Basic import com.tangem.tap.common.entities.IndeterminateProgressButton +import kotlinx.coroutines.CoroutineScope import org.rekotlin.Action sealed class HomeAction : Action { @@ -22,7 +22,7 @@ sealed class HomeAction : Action { */ data class ReadCard( val analyticsEvent: AnalyticsEvent? = Basic.CardWasScanned(AnalyticsParam.ScannedFrom.Introduction), - val scope: LifecycleCoroutineScope, + val scope: CoroutineScope, ) : HomeAction() data class ScanInProgress(val scanInProgress: Boolean) : HomeAction() diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt index 67210a4dc4..ce2c8784a8 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt @@ -1,11 +1,11 @@ package com.tangem.tap.features.onboarding.products.wallet.redux import android.net.Uri -import androidx.lifecycle.LifecycleCoroutineScope import com.tangem.common.CompletionResult import com.tangem.feature.onboarding.data.model.CreateWalletResponse import com.tangem.feature.onboarding.presentation.wallet2.analytics.SeedPhraseSource import com.tangem.tap.domain.tasks.product.CreateProductWalletTaskResponse +import kotlinx.coroutines.CoroutineScope import org.rekotlin.Action sealed class OnboardingWalletAction : Action { @@ -18,7 +18,7 @@ sealed class OnboardingWalletAction : Action { ) : OnboardingWalletAction() object Done : OnboardingWalletAction() - data class FinishOnboarding(val scope: LifecycleCoroutineScope) : OnboardingWalletAction() + data class FinishOnboarding(val scope: CoroutineScope) : OnboardingWalletAction() object ResumeBackup : OnboardingWalletAction() 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 1e8ad23e91..30b0aaadce 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 @@ -19,6 +19,7 @@ import com.tangem.tap.domain.model.WalletStoreModel import com.tangem.tap.features.wallet.models.Currency import com.tangem.tap.features.wallet.redux.models.WalletDialog import com.tangem.wallet.R +import kotlinx.coroutines.CoroutineScope import org.rekotlin.Action sealed class WalletAction : Action { @@ -76,7 +77,7 @@ sealed class WalletAction : Action { data class Scan( val onScanSuccessEvent: AnalyticsEvent?, - val lifecycleScope: LifecycleCoroutineScope, + val scope: CoroutineScope, ) : WalletAction() data class Send(val amount: Amount? = null) : WalletAction() diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt index 39fec7fbb8..1779986bfb 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt @@ -116,9 +116,9 @@ class WalletMiddleware { } is WalletAction.Scan -> { store.dispatch(NavigationAction.PopBackTo(AppScreen.Home)) - action.lifecycleScope.launch { + action.scope.launch { delay(timeMillis = 700) - store.dispatchOnMain(HomeAction.ReadCard(action.onScanSuccessEvent, action.lifecycleScope)) + store.dispatchOnMain(HomeAction.ReadCard(action.onScanSuccessEvent, action.scope)) } } is WalletAction.LoadData, @@ -391,7 +391,7 @@ class WalletMiddleware { store.dispatch( WalletAction.Scan( onScanSuccessEvent = Basic.CardWasScanned(AnalyticsParam.ScannedFrom.Main), - lifecycleScope = lifecycleScope, + scope = lifecycleScope, ), ) }