Updated on 2026-08-14

2024-07-18 11:28:18 +01:00 · 2024-07-18 11:28:18 +01:00 · 226a413558
commit 226a413558
parent 0c21b7571f 6d74f3936c
994 changed files with 27178 additions and 11929 deletions
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingDialog.kt
@ -1,7 +1,7 @@
 package com.tangem.tap.features.onboarding

 import com.tangem.common.extensions.VoidCallback
-import com.tangem.core.navigation.StateDialog
+import com.tangem.domain.redux.StateDialog

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@ -3,10 +3,10 @@ package com.tangem.tap.features.onboarding
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
 import com.tangem.common.extensions.guard
+import com.tangem.common.routing.AppRoute
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.analytics.models.Basic
-import com.tangem.core.navigation.AppScreen
-import com.tangem.core.navigation.NavigationAction
+
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.common.util.twinsIsTwinned
 import com.tangem.domain.models.scan.CardDTO
@ -56,18 +56,18 @@ object OnboardingHelper {
        }
    }

-    fun whereToNavigate(scanResponse: ScanResponse): AppScreen {
+    fun whereToNavigate(scanResponse: ScanResponse): AppRoute {
        return when (val type = scanResponse.productType) {
-            ProductType.Note -> AppScreen.OnboardingNote
+            ProductType.Note -> AppRoute.OnboardingNote
            ProductType.Wallet,
            ProductType.Wallet2,
            ProductType.Ring,
            -> if (scanResponse.card.settings.isBackupAllowed) {
-                AppScreen.OnboardingWallet
+                AppRoute.OnboardingWallet()
            } else {
-                AppScreen.OnboardingOther
+                AppRoute.OnboardingOther
            }
-            ProductType.Twins -> AppScreen.OnboardingTwins
+            ProductType.Twins -> AppRoute.OnboardingTwins
            ProductType.Start2Coin,
            ProductType.Visa,
            -> throw UnsupportedOperationException("Onboarding for ${type.name} cards is not supported")
@ -111,14 +111,14 @@ object OnboardingHelper {
                            backupCardsIds = backupCardsIds?.toSet(),
                        ),
                    )
-                    store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
+                    store.dispatchNavigationAction { push(AppRoute.Wallet) }
                    delay(timeMillis = 1_800)
-                    store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.SaveWallet))
+                    store.dispatchNavigationAction { push(AppRoute.SaveWallet) }
                }
                // If device has no biometry and save wallet screen has been shown, then go through old scenario
                else -> {
                    proceedWithScanResponse(scanResponse, backupCardsIds, hasBackupError)
-                    store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
+                    store.dispatchNavigationAction { push(AppRoute.Wallet) }
                }
            }
        }
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt
@ -7,15 +7,20 @@ import androidx.core.view.MenuProvider
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.Basic
+import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.common.feedback.SupportInfo
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.store
+import com.tangem.utils.Provider
 import com.tangem.wallet.R

 /**
 [REDACTED_AUTHOR]
 */
-class OnboardingMenuProvider : MenuProvider {
+class OnboardingMenuProvider(
+    private val scanResponseProvider: Provider<ScanResponse>,
+) : MenuProvider {
+
    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
        menuInflater.inflate(R.menu.menu_onboarding, menu)
    }
@ -24,7 +29,12 @@ class OnboardingMenuProvider : MenuProvider {
        R.id.menu_item_chat_support -> {
            Analytics.send(Basic.ButtonSupport(AnalyticsParam.ScreensSources.Intro))
            // changed on email support [REDACTED_TASK_KEY]
-            store.dispatch(GlobalAction.SendEmail(SupportInfo()))
+            store.dispatch(
+                GlobalAction.SendEmail(
+                    feedbackData = SupportInfo(),
+                    scanResponse = scanResponseProvider(),
+                ),
+            )
            true
        }
        else -> false
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/BaseOnboardingFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/BaseOnboardingFragment.kt
@ -9,6 +9,8 @@ import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.transitions.HomeToOnboardingTransition
 import com.tangem.tap.features.BaseStoreFragment
 import com.tangem.tap.features.onboarding.OnboardingMenuProvider
+import com.tangem.tap.store
+import com.tangem.utils.Provider
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentOnboardingMainBinding
 import com.tangem.wallet.databinding.ViewOnboardingProgressBinding
@ -32,7 +34,13 @@ abstract class BaseOnboardingFragment<T> : BaseStoreFragment(R.layout.fragment_o
        (activity as? AppCompatActivity)?.setSupportActionBar(binding.toolbar)
    }

-    override fun loadToolbarMenu(): MenuProvider? = OnboardingMenuProvider()
+    override fun loadToolbarMenu(): MenuProvider = OnboardingMenuProvider(
+        scanResponseProvider = Provider {
+            store.state.globalState.onboardingState.onboardingManager?.scanResponse
+                ?: store.state.detailsState.scanResponse
+                ?: error("ScanResponse must be not null")
+        },
+    )

    protected fun showConfetti(show: Boolean) = with(binding.vConfetti) {
        lavConfetti.show(show)
--- 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
@ -2,8 +2,9 @@ package com.tangem.tap.features.onboarding.products.note.redux

 import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.guard
+import com.tangem.common.routing.AppRouter
 import com.tangem.core.analytics.Analytics
-import com.tangem.core.navigation.NavigationAction
+
 import com.tangem.data.tokens.utils.CryptoCurrencyFactory
 import com.tangem.domain.common.extensions.makePrimaryWalletManager
 import com.tangem.domain.common.extensions.withMainContext
@ -204,7 +205,7 @@ private fun handleNoteAction(appState: () -> AppState?, action: Action, dispatch
                OnboardingDialog.InterruptOnboarding(
                    onOk = {
                        OnboardingHelper.onInterrupted()
-                        store.dispatch(NavigationAction.PopBackTo())
+                        store.dispatchNavigationAction(AppRouter::pop)
                    },
                ),
            )
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
@ -3,9 +3,10 @@ package com.tangem.tap.features.onboarding.products.twins.redux
 import com.tangem.blockchain.extensions.Result
 import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.guard
+import com.tangem.common.routing.AppRoute
+import com.tangem.common.routing.utils.popTo
 import com.tangem.core.analytics.Analytics
-import com.tangem.core.navigation.AppScreen
-import com.tangem.core.navigation.NavigationAction
+
 import com.tangem.data.tokens.utils.CryptoCurrencyFactory
 import com.tangem.domain.common.extensions.makePrimaryWalletManager
 import com.tangem.domain.common.extensions.withMainContext
@ -39,6 +40,7 @@ import kotlinx.coroutines.runBlocking
 import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
+import kotlin.reflect.KClass

 object TwinCardsMiddleware {
    val handler = twinsWalletMiddleware
@ -328,7 +330,7 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
                        if (walletsRepository.shouldSaveUserWalletsSync()) {
                            OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(scanResponse)
                        } else {
-                            store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
+                            store.dispatchNavigationAction { popTo<AppRoute.Home>() }
                        }
                    }
                }
@ -352,7 +354,7 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
                    store.dispatch(TwinCardsAction.CardsManager.Release)

                    action.shouldResetTwinCardsWidget(shouldReturnCardBack) {
-                        store.dispatchOnMain(NavigationAction.PopBackTo(getPopBackScreen()))
+                        store.dispatchNavigationAction { popTo(routeClass = getPopBackScreen()) }
                    }
                }
                store.dispatchDialogShow(OnboardingDialog.InterruptOnboarding(onOkCallback))
@ -362,18 +364,19 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
    }
 }

-private fun getPopBackScreen(): AppScreen {
+private fun getPopBackScreen(): KClass<out AppRoute> {
    val userWalletsListManager = store.inject(DaggerGraphState::generalUserWalletsListManager)

    return if (userWalletsListManager.hasUserWallets) {
        val isLocked = runCatching { userWalletsListManager.asLockable()?.isLockedSync }
            .fold(onSuccess = { true }, onFailure = { false })
+
        if (isLocked) {
-            AppScreen.Welcome
+            AppRoute.Welcome::class
        } else {
-            AppScreen.Wallet
+            AppRoute.Wallet::class
        }
    } else {
-        AppScreen.Home
+        AppRoute.Home::class
    }
 }
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsReducer.kt
@ -1,7 +1,7 @@
 package com.tangem.tap.features.onboarding.products.twins.redux

-import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.common.getTwinCardNumber
+import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.tap.common.redux.AppState
 import org.rekotlin.Action

@ -35,7 +35,10 @@ private fun internalReduce(action: Action, state: AppState): TwinCardsState {
            )
        }
        is TwinCardsAction.SetStepOfScreen -> {
-            state = state.copy(currentStep = action.step)
+            state = state.copy(
+                currentStep = action.step,
+                welcomeOnlyScanResponse = (action.step as? TwinCardsStep.WelcomeOnly)?.scanResponse,
+            )
        }
        is TwinCardsAction.SetUserUnderstand -> {
            state = state.copy(userWasUnderstandIfWalletRecreate = action.isUnderstand)
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt
@ -1,8 +1,8 @@
 package com.tangem.tap.features.onboarding.products.twins.redux

 import com.tangem.blockchain.common.WalletManager
-import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.common.TwinCardNumber
+import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.twins.TwinCardsManager
 import com.tangem.tap.features.onboarding.OnboardingWalletBalance
@ -29,6 +29,7 @@ data class TwinCardsState(
    val balanceNonCriticalError: TapError? = null,
    val balanceCriticalError: TapError? = null,
    val showConfetti: Boolean = false,
+    val welcomeOnlyScanResponse: ScanResponse? = null,
 ) : StateType {

    val steps: List<TwinCardsStep>
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/OnboardingTwinsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/OnboardingTwinsFragment.kt
@ -6,6 +6,7 @@ import android.view.View
 import android.view.animation.OvershootInterpolator
 import androidx.annotation.LayoutRes
 import androidx.constraintlayout.widget.ConstraintSet
+import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import androidx.transition.TransitionManager
 import coil.load
@ -25,12 +26,14 @@ import com.tangem.tap.common.toggleWidget.RefreshBalanceWidget
 import com.tangem.tap.common.transitions.InternalNoteLayoutTransition
 import com.tangem.tap.domain.twins.TwinsCardWidget
 import com.tangem.tap.features.addBackPressHandler
+import com.tangem.tap.features.onboarding.OnboardingMenuProvider
 import com.tangem.tap.features.onboarding.products.BaseOnboardingFragment
 import com.tangem.tap.features.onboarding.products.twins.redux.CreateTwinWalletMode
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsStep
 import com.tangem.tap.store
+import com.tangem.utils.Provider
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.LayoutOnboardingContainerTopBinding
 import dagger.hilt.android.AndroidEntryPoint
@ -61,6 +64,15 @@ internal class OnboardingTwinsFragment : BaseOnboardingFragment<TwinCardsState>(
        }
    }

+    override fun loadToolbarMenu(): MenuProvider = OnboardingMenuProvider(
+        scanResponseProvider = Provider {
+            store.state.twinCardsState.welcomeOnlyScanResponse
+                ?: store.state.globalState.onboardingState.onboardingManager?.scanResponse
+                ?: store.state.detailsState.scanResponse
+                ?: error("ScanResponse must be not null")
+        },
+    )
+
    @Suppress("MagicNumber")
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@ -7,16 +7,16 @@ import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.ifNotNull
 import com.tangem.common.extensions.toHexString
+import com.tangem.common.routing.AppRoute
+import com.tangem.common.routing.AppRouter
 import com.tangem.common.services.Result
 import com.tangem.core.analytics.Analytics
-import com.tangem.core.navigation.AppScreen
-import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.wallets.models.Artwork
 import com.tangem.domain.wallets.builder.UserWalletBuilder
+import com.tangem.domain.wallets.models.Artwork
 import com.tangem.feature.onboarding.data.model.CreateWalletResponse
 import com.tangem.feature.onboarding.presentation.wallet2.analytics.SeedPhraseSource
 import com.tangem.feature.wallet.presentation.wallet.domain.BackupValidator
@ -25,10 +25,7 @@ import com.tangem.operations.backup.BackupService
 import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Onboarding
-import com.tangem.tap.common.extensions.dispatchDialogShow
-import com.tangem.tap.common.extensions.dispatchOnMain
-import com.tangem.tap.common.extensions.dispatchWithMain
-import com.tangem.tap.common.extensions.inject
+import com.tangem.tap.common.extensions.*
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.tasks.product.CreateProductWalletTaskResponse
@ -164,7 +161,7 @@ private fun handleWalletAction(action: Action) {
            store.dispatch(GlobalAction.Onboarding.Stop)

            if (scanResponse == null) {
-                store.dispatch(NavigationAction.PopBackTo())
+                store.dispatchNavigationAction(AppRouter::pop)
                store.dispatch(HomeAction.ReadCard(scope = action.scope))
            } else {
                val backupState = store.state.onboardingWalletState.backupState
@ -529,7 +526,8 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
                    addedBackupCardsCount = backupService.addedBackupCardsCount,
                ),
            )
-            store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
+
+            store.dispatchNavigationAction { push(AppRoute.OnboardingWallet()) }
        }
        is BackupAction.SkipBackup -> {
            Analytics.send(Onboarding.Backup.Skipped())
@ -614,7 +612,7 @@ private fun handleOnBackPressed(state: OnboardingWalletState) {
        }
        BackupStep.Finished -> {
            OnboardingHelper.onInterrupted()
-            store.dispatch(NavigationAction.PopBackTo())
+            store.dispatchNavigationAction(AppRouter::pop)
        }
    }
 }
@ -625,7 +623,7 @@ private fun showInterruptOnboardingDialog() {
            onOk = {
                OnboardingHelper.onInterrupted()
                store.dispatch(BackupAction.DiscardBackup)
-                store.dispatch(NavigationAction.PopBackTo())
+                store.dispatchNavigationAction(AppRouter::pop)
            },
        ),
    )
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
@ -2,7 +2,7 @@ package com.tangem.tap.features.onboarding.products.wallet.redux

 import android.graphics.Bitmap
 import android.net.Uri
-import com.tangem.core.navigation.StateDialog
+import com.tangem.domain.redux.StateDialog
 import org.rekotlin.StateType

 /**
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt
@ -1,6 +1,10 @@
 package com.tangem.tap.features.onboarding.products.wallet.ui

+import android.app.Activity
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.collectAsState
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.windowsize.rememberWindowSize
 import com.tangem.feature.onboarding.api.OnboardingSeedPhraseScreen
 import com.tangem.feature.onboarding.api.OnboardingSeedPhraseApi
 import com.tangem.feature.onboarding.presentation.wallet2.viewmodel.SeedPhraseScreen
@ -16,6 +20,7 @@ import com.tangem.wallet.R
 */
 internal class OnboardingSeedPhraseStateHandler(
    private val onboardingSeedPhraseApi: OnboardingSeedPhraseApi = OnboardingSeedPhraseScreen(),
+    private val activity: Activity,
 ) {

    fun newState(
@ -49,11 +54,16 @@ internal class OnboardingSeedPhraseStateHandler(
            val subScreen = viewModel.currentScreen.collectAsState().value
            setMainScreenToolbarTitle(walletFragment, subScreen)

-            onboardingSeedPhraseApi.ScreenContent(
-                uiState = viewModel.uiState,
-                subScreen = subScreen,
-                progress = viewModel.progress.collectAsState(0).value.toFloat() / onboardingWalletMaxProgress,
-            )
+            TangemTheme(
+                isDark = isSystemInDarkTheme(),
+                windowSize = rememberWindowSize(activity = activity),
+            ) {
+                onboardingSeedPhraseApi.ScreenContent(
+                    uiState = viewModel.uiState,
+                    subScreen = subScreen,
+                    progress = viewModel.progress.collectAsState(0).value.toFloat() / onboardingWalletMaxProgress,
+                )
+            }
        }
    }

--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@ -21,13 +21,13 @@ import com.google.android.material.tabs.TabLayoutMediator
 import com.tangem.common.CardIdFormatter
 import com.tangem.common.CompletionResult
 import com.tangem.common.core.CardIdDisplayFormat
+import com.tangem.common.routing.AppRoute
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.Basic
 import com.tangem.core.ui.extensions.setStatusBarColor
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.feature.onboarding.data.model.CreateWalletResponse
-import com.tangem.feature.onboarding.navigation.OnboardingRouter
 import com.tangem.feature.onboarding.presentation.wallet2.analytics.SeedPhraseSource
 import com.tangem.feature.onboarding.presentation.wallet2.viewmodel.SeedPhraseMediator
 import com.tangem.feature.onboarding.presentation.wallet2.viewmodel.SeedPhraseRouter
@ -46,6 +46,7 @@ import com.tangem.tap.features.onboarding.products.wallet.redux.*
 import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.AccessCodeDialog
 import com.tangem.tap.mainScope
 import com.tangem.tap.store
+import com.tangem.utils.Provider
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentOnboardingWalletBinding
 import com.tangem.wallet.databinding.LayoutOnboardingSeedPhraseBinding
@ -66,9 +67,10 @@ class OnboardingWalletFragment :

    internal val bindingSeedPhrase: LayoutOnboardingSeedPhraseBinding by lazy { binding.onboardingSeedPhraseContainer }

-    private val canSkipBackup by lazy { arguments?.getBoolean(OnboardingRouter.CAN_SKIP_BACKUP) ?: true }
+    private val canSkipBackup by lazy { arguments?.getBoolean(AppRoute.OnboardingWallet.CAN_SKIP_BACKUP_KEY) ?: true }
+
+    private lateinit var seedPhraseStateHandler: OnboardingSeedPhraseStateHandler

-    private val seedPhraseStateHandler: OnboardingSeedPhraseStateHandler = OnboardingSeedPhraseStateHandler()
    private val seedPhraseViewModel by viewModels<SeedPhraseViewModel>()

    private lateinit var cardsWidget: WalletCardsWidget
@ -79,6 +81,7 @@ class OnboardingWalletFragment :

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+        seedPhraseStateHandler = OnboardingSeedPhraseStateHandler(activity = requireActivity())

        val newSeedPhraseRouter = makeSeedPhraseRouter()
        seedPhraseRouter = newSeedPhraseRouter
@ -113,7 +116,12 @@ class OnboardingWalletFragment :
        )
    }

-    override fun loadToolbarMenu(): MenuProvider = OnboardingMenuProvider()
+    override fun loadToolbarMenu(): MenuProvider = OnboardingMenuProvider(
+        scanResponseProvider = Provider {
+            store.state.globalState.onboardingState.onboardingManager?.scanResponse
+                ?: error("ScanResponse must be not null")
+        },
+    )

    private fun reInitCardsWidgetIfNeeded(backupCardsCounts: Int) = with(binding) {
        val viewBackupCount = flCardsContainer.childCount - 1
@ -505,7 +513,13 @@ class OnboardingWalletFragment :
        onOpenChat = {
            Analytics.send(Basic.ButtonSupport(AnalyticsParam.ScreensSources.Intro))
            // changed on email support [REDACTED_TASK_KEY]
-            store.dispatch(GlobalAction.SendEmail(SupportInfo()))
+            store.dispatch(
+                GlobalAction.SendEmail(
+                    feedbackData = SupportInfo(),
+                    scanResponse = store.state.globalState.onboardingState.onboardingManager?.scanResponse
+                        ?: error("ScanResponse must be not null"),
+                ),
+            )
        },
        onOpenUriClick = { uri ->
            store.dispatchOpenUrl(uri.toString())
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/WalletActivationErrorDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/WalletActivationErrorDialog.kt
@ -23,7 +23,13 @@ object WalletActivationErrorDialog {
            setNegativeButton(R.string.common_support) { _, _ ->
                // changed on email support [REDACTED_TASK_KEY]
                Analytics.send(Basic.ButtonSupport(AnalyticsParam.ScreensSources.Intro))
-                store.dispatch(GlobalAction.SendEmail(SupportInfo()))
+                store.dispatch(
+                    GlobalAction.SendEmail(
+                        feedbackData = SupportInfo(),
+                        scanResponse = store.state.globalState.onboardingState.onboardingManager?.scanResponse
+                            ?: error("ScanResponse must be not null"),
+                    ),
+                )
            }
            setOnDismissListener { store.dispatchDialogHide() }
            setCancelable(false)