diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index fe998d4f19..2821cc4a99 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.View import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import com.google.accompanist.appcompattheme.AppCompatTheme @@ -17,7 +16,6 @@ import com.tangem.tap.features.home.redux.HomeState import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction import com.tangem.tap.features.send.redux.states.ButtonState import com.tangem.tap.features.tokens.redux.TokensAction -import com.tangem.tap.features.wallet.redux.ProgressState import com.tangem.tap.store import com.tangem.wallet.R import org.rekotlin.StoreSubscriber @@ -36,17 +34,17 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber(R.id.cv_stories)?.setContent { AppCompatTheme { StoriesScreen( homeState, onScanButtonClick = { - store.dispatch(HomeAction.ReadCard) - homeState.value = HomeState(store.state.homeState.shouldScanCardOnResume, + homeState.value = HomeState( + store.state.homeState.shouldScanCardOnResume, IndeterminateProgressButton(ButtonState.PROGRESS) ) - }, + store.dispatch(HomeAction.ReadCard) + }, onShopButtonClick = { store.dispatch(HomeAction.GoToShop(store.state.globalState.userCountryCode)) }, diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt b/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt index 183392a4b4..2df573ae65 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt @@ -139,11 +139,11 @@ fun StoriesScreen( colorFilter = if (isDarkBackground) null else ColorFilter.tint(Color.Black) ) when (currentStep.value) { - 1 -> FirstStoriesContent(isPaused, currentStep.duration()) { hideContent.value = it } + 1 -> FirstStoriesContent(needsToBePaused.value, currentStep.duration()) { hideContent.value = it } 2 -> StoriesRevolutionaryWallet(currentStep.duration()) - 3 -> StoriesUltraSecureBackup(isPaused, currentStep.duration()) - 4 -> StoriesCurrencies(isPaused, currentStep.duration()) - 5 -> StoriesWeb3(isPaused, currentStep.duration()) + 3 -> StoriesUltraSecureBackup(needsToBePaused.value, currentStep.duration()) + 4 -> StoriesCurrencies(needsToBePaused.value, currentStep.duration()) + 5 -> StoriesWeb3(needsToBePaused.value, currentStep.duration()) 6 -> StoriesWalletForEveryone(currentStep.duration()) } }