diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt index 125ba49fff..b182753729 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt @@ -9,6 +9,7 @@ import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.NavigationAction +import com.tangem.tap.domain.DELAY_SDK_DIALOG_CLOSE import com.tangem.tap.domain.TapError import com.tangem.tap.domain.extensions.hasWallets import com.tangem.tap.domain.extensions.makePrimaryWalletManager @@ -69,7 +70,7 @@ private fun handleNoteAction(action: Action, dispatch: DispatchFunction) { } OnboardingNoteStep.Done -> { onboardingManager.activationFinished(card.cardId) - postUi(500) { store.dispatch(OnboardingNoteAction.Confetti.Show) } + postUi(DELAY_SDK_DIALOG_CLOSE) { store.dispatch(OnboardingNoteAction.Confetti.Show) } } } } @@ -148,7 +149,7 @@ private fun handleNoteAction(action: Action, dispatch: DispatchFunction) { store.dispatch(GlobalAction.Onboarding.Stop) scope.launch { store.onCardScanned(scanResponse) - store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet)) + withMainContext { store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet)) } } } } diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt index fd2dbee87d..4a6f973e1f 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt @@ -58,7 +58,7 @@ private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) { is OnboardingOtherCardsAction.SetStepOfScreen -> { if (action.step == OnboardingOtherCardsStep.Done) { onboardingManager.activationFinished(card.cardId) - postUi(500) { store.dispatch(OnboardingOtherCardsAction.Confetti.Show) } + postUi(200) { store.dispatch(OnboardingOtherCardsAction.Confetti.Show) } } } is OnboardingOtherCardsAction.CreateWallet -> { @@ -85,7 +85,7 @@ private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) { store.dispatch(GlobalAction.Onboarding.Stop) scope.launch { store.onCardScanned(onboardingManager.scanResponse) - store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet)) + withMainContext { store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet)) } } } } 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 513627f250..9ec6e10f13 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 @@ -147,7 +147,7 @@ class WalletMiddleware { WalletAction.LoadArtwork(action.card, response.data.artwork?.id), GlobalAction.SetIfCardVerifiedOnline(response.data.passed) ) - actionList.forEach { store.dispatch(it) } + withMainContext { actionList.forEach { store.dispatch(it) } } } is Result.Failure -> { store.dispatchOnMain(GlobalAction.SetIfCardVerifiedOnline(false))