diff --git a/app/build.gradle b/app/build.gradle
index 251ffa5c62..e383b6fdbf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,8 +80,8 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
     implementation 'com.tangem:blockchain:develop-65'
-    implementation 'com.tangem.tangem-sdk-kotlin:core:develop-139'
-    implementation 'com.tangem.tangem-sdk-kotlin:android:develop-139'
+    implementation 'com.tangem.tangem-sdk-kotlin:core:develop-140'
+    implementation 'com.tangem.tangem-sdk-kotlin:android:develop-140'
 
     // WebView
     implementation "androidx.browser:browser:1.3.0"
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEvent.kt b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEvent.kt
index 5099d3e1cd..90ff7d7f3b 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEvent.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEvent.kt
@@ -4,6 +4,7 @@ enum class AnalyticsEvent(val event: String) {
     CARD_IS_SCANNED("card_is_scanned"),
     TRANSACTION_IS_SENT("transaction_is_sent"),
     READY_TO_SCAN("ready_to_scan"),
+    DEMO_MODE_ACTIVATED("demo_mode_activated"),
 
     APP_RATING_DISPLAYED("rate_app_warning_displayed"),
     APP_RATING_DISMISS("dismiss_rate_app_warning"),
@@ -20,6 +21,7 @@ enum class AnalyticsEvent(val event: String) {
 
 enum class AnalyticsParam(val param: String) {
     BLOCKCHAIN("blockchain"),
+    CARD_ID("cardId"),
     BATCH_ID("batch_id"),
     FIRMWARE("firmware"),
     ACTION("action"),
diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
index bb104a4c80..d4ac60c730 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -26,11 +26,13 @@ import com.tangem.operations.pins.SetUserCodeCommand
 import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.analytics.AnalyticsEvent
 import com.tangem.tap.common.analytics.AnalyticsHandler
+import com.tangem.tap.common.analytics.AnalyticsParam
 import com.tangem.tap.domain.tasks.CreateWalletAndRescanTask
 import com.tangem.tap.domain.tasks.product.ResetToFactorySettingsTask
 import com.tangem.tap.domain.tasks.product.ScanProductTask
 import com.tangem.tap.domain.tasks.product.ScanResponse
 import com.tangem.tap.domain.tokens.CurrenciesRepository
+import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
@@ -70,12 +72,21 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
         result: CompletionResult<ScanResponse>
     ) {
         when (result) {
-            is CompletionResult.Success ->
+            is CompletionResult.Success -> {
                 analyticsHandler?.triggerEvent(
                     event = AnalyticsEvent.CARD_IS_SCANNED,
                     card = result.data.card,
                     blockchain = result.data.walletData?.blockchain
                 )
+                if (DemoHelper.isDemoCard(result.data)) {
+                    analyticsHandler?.triggerEvent(
+                        event = AnalyticsEvent.DEMO_MODE_ACTIVATED,
+                        card = result.data.card,
+                        blockchain = result.data.walletData?.blockchain,
+                        params = mapOf(AnalyticsParam.CARD_ID.param to result.data.card.cardId)
+                    )
+                }
+            }
             is CompletionResult.Failure ->
                 (result.error as? TangemSdkError)?.let { error ->
                     analyticsHandler?.logCardSdkError(
diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index 55fc7f2154..15ac94f6ac 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -27,26 +27,49 @@ import com.tangem.tap.network.coinmarketcap.CoinMarketCapService
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.math.BigDecimal
 
 
 class TapWalletManager {
-    private val coinMarketCapService = CoinMarketCapService()
-
-    private val blockchainSdkConfig by lazy {
-        store.state.globalState.configManager?.config?.blockchainSdkConfig ?: BlockchainSdkConfig()
-    }
     val walletManagerFactory: WalletManagerFactory
         by lazy { WalletManagerFactory(blockchainSdkConfig) }
 
-    suspend fun loadWalletData(walletManager: WalletManager) {
-        handleUpdateWalletResult(walletManager.safeUpdate(), walletManager)
+    private val coinMarketCapService = CoinMarketCapService()
+    private val blockchainSdkConfig by lazy {
+        store.state.globalState.configManager?.config?.blockchainSdkConfig ?: BlockchainSdkConfig()
     }
 
-    suspend fun updateWallet(walletManager: WalletManager) {
-        val result = walletManager.safeUpdate()
+    private val walletManagersThrottler = Throttler<Blockchain>(10000)
+    private val fiatRatesThrottler = Throttler<Currency>(60000)
+
+    suspend fun loadWalletData(walletManager: WalletManager) {
+        val blockchain = walletManager.wallet.blockchain
+        val result = if (walletManagersThrottler.isStillThrottled(blockchain)) {
+            delay(200)
+            Result.Success(walletManager.wallet)
+        } else {
+            walletManagersThrottler.updateThrottlingTo(blockchain)
+            walletManager.safeUpdate()
+        }
+        handleUpdateWalletResult(result, walletManager)
+    }
+
+    suspend fun updateWallet(walletManager: WalletManager, force: Boolean) {
+        val result = if (force) {
+            walletManager.safeUpdate()
+        } else {
+            val blockchain = walletManager.wallet.blockchain
+            if (walletManagersThrottler.isStillThrottled(blockchain)) {
+                delay(200)
+                Result.Success(walletManager.wallet)
+            } else {
+                walletManagersThrottler.updateThrottlingTo(blockchain)
+                walletManager.safeUpdate()
+            }
+        }
         withContext(Dispatchers.Main) {
             when (result) {
                 is Result.Success ->
@@ -73,12 +96,17 @@ class TapWalletManager {
     suspend fun loadFiatRate(fiatCurrency: FiatCurrencyName, currencies: List<Currency>) {
         val results = mutableListOf<Pair<Currency, Result<BigDecimal>?>>()
         currencies.forEach {
-            results.add(it to coinMarketCapService.getRate(it.currencySymbol, fiatCurrency))
+            if (!fiatRatesThrottler.isStillThrottled(it)) {
+                fiatRatesThrottler.updateThrottlingTo(it)
+                results.add(it to coinMarketCapService.getRate(it.currencySymbol, fiatCurrency))
+                handleFiatRatesResult(results)
+            }
         }
-        handleFiatRatesResult(results)
     }
 
     suspend fun onCardScanned(data: ScanResponse) {
+        walletManagersThrottler.clear()
+        fiatRatesThrottler.clear()
         store.state.globalState.feedbackManager?.infoHolder?.setCardInfo(data.card)
         updateConfigManager(data)
 
@@ -305,4 +333,31 @@ class TapWalletManager {
 
 fun Wallet.getFirstToken(): Token? {
     return getTokens().toList().getOrNull(0)
+}
+
+class Throttler<T>(
+    private val duration: Long,
+) {
+
+    private val items: MutableMap<T, Long> = mutableMapOf()
+
+    fun isStillThrottled(item: T): Boolean {
+        val inThrottlingUpTo = items[item] ?: return false
+        val diff = System.currentTimeMillis() - inThrottlingUpTo
+        return diff < 0
+    }
+
+    fun updateThrottlingTo(item: T): T {
+        val now = System.currentTimeMillis()
+        val throttledUpTo = items[item] ?: 0L
+        if (throttledUpTo == 0L || throttledUpTo < now) {
+            val newTime = now + duration
+            items[item] = newTime
+        }
+        return item
+    }
+
+    fun clear() {
+        items.clear()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/demo/Extentions.kt b/app/src/main/java/com/tangem/tap/features/demo/Extentions.kt
index f32c079efc..a863282f6d 100644
--- a/app/src/main/java/com/tangem/tap/features/demo/Extentions.kt
+++ b/app/src/main/java/com/tangem/tap/features/demo/Extentions.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.demo
 
-import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.tap.domain.tasks.product.ScanResponse
 
@@ -8,5 +7,4 @@ import com.tangem.tap.domain.tasks.product.ScanResponse
 [REDACTED_AUTHOR]
  */
 fun ScanResponse.isDemoCard(): Boolean = DemoHelper.isDemoCardId(card.cardId)
-fun WalletManager.isDemoWallet(): Boolean = DemoHelper.isDemoCardId(wallet.cardId)
-fun Wallet.isDemoWallet(): Boolean = DemoHelper.isDemoCardId(cardId)
\ No newline at end of file
+fun WalletManager.isDemoWallet(): Boolean = DemoHelper.isDemoCardId(wallet.cardId)
\ No newline at end of file
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 b577781a18..e9d11624a9 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
@@ -1,6 +1,8 @@
 package com.tangem.tap.features.home
 
+import android.content.Context
 import android.os.Bundle
+import android.telephony.TelephonyManager
 import android.view.View
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
@@ -28,13 +30,15 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
         super.onViewCreated(view, savedInstanceState)
 
         store.dispatch(BackupAction.CheckForUnfinishedBackup)
+        val tm = requireContext().getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+        val countryCodeValue = tm.networkCountryIso
 
         getView()?.findViewById<ComposeView>(R.id.cv_stories)?.setContent {
             AppCompatTheme {
                 StoriesScreen(
                     homeState,
                     onScanButtonClick = { store.dispatch(HomeAction.ReadCard) },
-                    onShopButtonClick = { store.dispatch(HomeAction.GoToShop) }
+                    onShopButtonClick = { store.dispatch(HomeAction.GoToShop(countryCodeValue)) }
                 )
             }
         }
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 d14d4cf71b..79055cf993 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
@@ -6,7 +6,7 @@ import org.rekotlin.Action
 sealed class HomeAction : Action {
     // from ui
     object ReadCard : HomeAction()
-    object GoToShop : HomeAction()
+    data class GoToShop(val region: String) : HomeAction()
 
     // internal
     data class ShouldScanCardOnResume(val shouldScanCard: Boolean) : HomeAction()
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
index 89c34cbf42..eb0f261f8b 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@@ -4,6 +4,7 @@ import com.tangem.tap.common.analytics.AnalyticsEvent
 import com.tangem.tap.common.analytics.AnalyticsParam
 import com.tangem.tap.common.analytics.GetCardSourceParams
 import com.tangem.tap.common.entities.IndeterminateProgressButton
+import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.onCardScanned
 import com.tangem.tap.common.extensions.withMainContext
 import com.tangem.tap.common.post
@@ -14,6 +15,7 @@ import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.FragmentShareTransition
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.DELAY_SDK_DIALOG_CLOSE
+import com.tangem.tap.features.home.redux.HomeMiddleware.Companion.BUY_WALLET_URL
 import com.tangem.tap.features.onboarding.OnboardingHelper
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsStep
@@ -29,6 +31,7 @@ class HomeMiddleware {
         val handler = homeMiddleware
 
         const val CARD_SHOP_URI = "http://cards.tangem.com/"
+        const val BUY_WALLET_URL = "https://mv.tangem.com/"
     }
 }
 
@@ -49,7 +52,11 @@ private val homeMiddleware: Middleware<AppState> = { dispatch, state ->
                 }
                 is HomeAction.ReadCard -> handleReadCard()
                 is HomeAction.GoToShop -> {
-                    store.dispatch(NavigationAction.NavigateTo(AppScreen.Shop))
+                    if (action.region == "ru") {
+                        store.dispatchOpenUrl(BUY_WALLET_URL)
+                    } else {
+                        store.dispatch(NavigationAction.NavigateTo(AppScreen.Shop))
+                    }
                     store.state.globalState.analyticsHandlers?.triggerEvent(
                         event = AnalyticsEvent.GET_CARD,
                         params = mapOf(AnalyticsParam.SOURCE.param to GetCardSourceParams.WELCOME.param)
@@ -66,7 +73,7 @@ private fun handleReadCard() {
         store.dispatch(NavigationAction.NavigateTo(AppScreen.Disclaimer))
     } else {
         changeButtonState(ButtonState.PROGRESS)
-        store.dispatch(GlobalAction.ScanCard( onSuccess =  { scanResponse ->
+        store.dispatch(GlobalAction.ScanCard(onSuccess = { scanResponse ->
             store.state.globalState.tapWalletManager.updateConfigManager(scanResponse)
             store.dispatch(TwinCardsAction.IfTwinsPrepareState(scanResponse))
 
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 57ede6fd8a..4795e9ffa8 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
@@ -21,7 +21,6 @@ sealed class OnboardingWalletAction : Action {
 sealed class BackupAction : Action {
 
     object DetermineBackupStep : BackupAction()
-    data class IntroduceBackup(val buyCardsUrl: String? = null) : BackupAction()
     object StartBackup : BackupAction()
     object DismissBackup : BackupAction()
 
@@ -42,7 +41,6 @@ sealed class BackupAction : Action {
         data class Success(val cardId: CardId, val artwork: Bitmap)
     }
 
-    object GoToShop : BackupAction()
     object FinishAddingBackupCards : BackupAction()
 
     object ShowAccessCodeInfoScreen : BackupAction()
@@ -58,7 +56,7 @@ sealed class BackupAction : Action {
     data class WriteBackupCard(val cardNumber: Int) : BackupAction()
 
     object PrepareToWritePrimaryCard : BackupAction()
-    object WritePrimaryCard: BackupAction()
+    object WritePrimaryCard : BackupAction()
 
     object FinishBackup : BackupAction()
     object DiscardBackup : BackupAction()
diff --git 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
index 9abbebd018..4004c0f96b 100644
--- 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
@@ -4,9 +4,6 @@ import com.tangem.common.CompletionResult
 import com.tangem.common.card.Card
 import com.tangem.operations.backup.BackupService
 import com.tangem.tap.*
-import com.tangem.tap.common.analytics.AnalyticsEvent
-import com.tangem.tap.common.analytics.AnalyticsParam
-import com.tangem.tap.common.analytics.GetCardSourceParams
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.withMainContext
 import com.tangem.tap.common.redux.AppState
@@ -17,7 +14,6 @@ import com.tangem.tap.domain.extensions.hasWallets
 import com.tangem.tap.domain.tasks.product.ScanResponse
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.redux.HomeAction
-import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletMiddleware.Companion.BUY_WALLET_URL
 import com.tangem.tap.features.wallet.redux.Artwork
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
@@ -26,8 +22,6 @@ import org.rekotlin.Middleware
 class OnboardingWalletMiddleware {
     companion object {
         val handler = onboardingWalletMiddleware
-
-        const val BUY_WALLET_URL = "https://wallet.tangem.com/"
     }
 }
 
@@ -116,21 +110,8 @@ private fun handleWalletAction(action: Action) {
         OnboardingWalletAction.ProceedBackup -> {
             val newAction = when (val backupState = backupService.currentState) {
                 BackupService.State.FinalizingPrimaryCard -> BackupAction.PrepareToWritePrimaryCard
-                is BackupService.State.FinalizingBackupCard ->
-                    BackupAction.PrepareToWriteBackupCard(backupState.index)
-                else -> {
-                    val url = if (card?.issuer?.name?.lowercase()?.contains("tangem") == true) {
-                        BUY_WALLET_URL
-                    } else {
-                        null
-                    }
-                    if (walletState.backupState.backupStep == BackupStep.InitBackup ||
-                        walletState.backupState.backupStep == BackupStep.Finished) {
-                        BackupAction.IntroduceBackup(url)
-                    } else {
-                        null
-                    }
-                }
+                is BackupService.State.FinalizingBackupCard -> BackupAction.PrepareToWriteBackupCard(backupState.index)
+                else -> null
             }
             newAction?.let { store.dispatch(it) }
         }
@@ -221,13 +202,6 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
                 }
             }
         }
-        is BackupAction.GoToShop -> {
-            store.dispatch(NavigationAction.NavigateTo(AppScreen.Shop))
-            store.state.globalState.analyticsHandlers?.triggerEvent(
-                event = AnalyticsEvent.GET_CARD,
-                params = mapOf(AnalyticsParam.SOURCE.param to GetCardSourceParams.ONBOARDING.param)
-            )
-        }
         is BackupAction.FinishAddingBackupCards -> {
             if (backupService.addedBackupCardsCount == 1) {
                 store.dispatchOnMain(GlobalAction.ShowDialog(BackupDialog.AddMoreBackupCards))
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
index f46c1bf0ff..50ce9878e1 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
@@ -39,14 +39,7 @@ class BackupReducer {
         ): BackupState {
 
             return when (action) {
-                is BackupAction.IntroduceBackup -> BackupState(
-                    backupStep = BackupStep.InitBackup,
-                    canSkipBackup = state.canSkipBackup,
-                    buyAdditionalCardsUrl = action.buyCardsUrl
-                )
-
                 BackupAction.StartAddingPrimaryCard -> state.copy(backupStep = BackupStep.ScanOriginCard)
-
                 BackupAction.StartAddingBackupCards -> {
                     state.copy(backupStep = BackupStep.AddBackupCards)
                 }
@@ -122,7 +115,6 @@ class BackupReducer {
                 BackupAction.DismissBackup -> state
                 is BackupAction.LoadBackupCardArtwork -> state
                 is BackupAction.CheckAccessCode -> state
-                BackupAction.GoToShop -> state
                 BackupAction.DetermineBackupStep -> state
                 BackupAction.CheckForUnfinishedBackup -> state
                 BackupAction.DiscardBackup -> state
diff --git 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
index 7aaa0fe88f..591573b35b 100644
--- 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
@@ -52,7 +52,6 @@ data class BackupState(
     val backupStep: BackupStep = BackupStep.InitBackup,
     val maxBackupCards: Int = 2,
     val canSkipBackup: Boolean = true,
-    val buyAdditionalCardsUrl: String? = null
 )
 
 enum class AccessCodeError {
diff --git 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
index 056eb28b12..b9691488c5 100644
--- 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
@@ -2,7 +2,9 @@ package com.tangem.tap.features.onboarding.products.wallet.ui
 
 import android.os.Bundle
 import android.util.TypedValue
-import android.view.*
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
@@ -387,28 +389,6 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.shop_menu -> {
-                store.dispatch(BackupAction.GoToShop)
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.shop, menu)
-
-        val backupState = store.state.onboardingWalletState.backupState
-        val backupStep = backupState.backupStep
-
-        val shopMenuShouldBeVisible =
-            (backupStep == BackupStep.ScanOriginCard || backupStep == BackupStep.AddBackupCards) &&
-                backupState.buyAdditionalCardsUrl != null
-        menu.getItem(0).isVisible = shopMenuShouldBeVisible
-    }
-
     override fun handleOnBackPressed() {
         store.dispatch(OnboardingWalletAction.OnBackPressed)
     }
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 57a03d4313..f2ec828995 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
@@ -74,7 +74,7 @@ sealed class WalletAction : Action {
         class CheckRemainingSignatures(val remainingSignatures: Int?) : Warnings()
     }
 
-    data class UpdateWallet(val blockchain: Blockchain? = null) : WalletAction() {
+    data class UpdateWallet(val blockchain: Blockchain? = null, val force: Boolean = true) : WalletAction() {
         object ScheduleUpdatingWallet : WalletAction()
         data class Success(val wallet: Wallet) : WalletAction()
         data class Failure(val errorMessage: String? = null) : WalletAction()
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
index 92491013ad..b4ce090f81 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
@@ -54,8 +54,8 @@ data class WalletState(
     val primaryWallet = if (wallets.isNotEmpty()) wallets[0] else null
 
     val shouldShowDetails: Boolean =
-            primaryWallet?.currencyData?.status != BalanceStatus.EmptyCard &&
-                    primaryWallet?.currencyData?.status != BalanceStatus.UnknownBlockchain
+        primaryWallet?.currencyData?.status != BalanceStatus.EmptyCard &&
+            primaryWallet?.currencyData?.status != BalanceStatus.UnknownBlockchain
 
     val blockchains: List<Blockchain>
         get() = walletManagers.map { it.wallet.blockchain }
@@ -101,10 +101,10 @@ data class WalletState(
 
         if (!isPrimaryCurrency(walletData)) {
             val walletManager = getWalletManager(walletData.currency)
-                    ?: return true
+                ?: return true
 
             if (walletData.currency is Currency.Blockchain &&
-                    walletManager.cardTokens.isNotEmpty()
+                walletManager.cardTokens.isNotEmpty()
             ) {
                 return false
             }
@@ -113,22 +113,22 @@ data class WalletState(
 
             if (walletData.currency is Currency.Blockchain) {
                 return wallet.recentTransactions.toPendingTransactions(wallet.address).isEmpty() &&
-                        wallet.amounts.toSendableAmounts().isEmpty()
+                    wallet.amounts.toSendableAmounts().isEmpty()
             } else if (walletData.currency is Currency.Token) (
-                    return wallet.recentTransactions.toPendingTransactionsForToken(
-                        walletData.currency.token, wallet.address).isEmpty()
-                            && wallet.amounts[AmountType.Token(token = walletData.currency.token)]
-                            ?.isAboveZero() != true
-                    )
+                return wallet.recentTransactions.toPendingTransactionsForToken(
+                    walletData.currency.token, wallet.address).isEmpty()
+                    && wallet.amounts[AmountType.Token(token = walletData.currency.token)]
+                    ?.isAboveZero() != true
+                )
         }
         return false
     }
 
     private fun isPrimaryCurrency(walletData: WalletData): Boolean {
         return (walletData.currency is Currency.Blockchain &&
-                walletData.currency.blockchain == store.state.walletState.primaryBlockchain)
-                || (walletData.currency is Currency.Token &&
-                walletData.currency.token == store.state.walletState.primaryToken)
+            walletData.currency.blockchain == store.state.walletState.primaryBlockchain)
+            || (walletData.currency is Currency.Token &&
+            walletData.currency.token == store.state.walletState.primaryToken)
     }
 
     fun replaceWalletInWallets(walletData: WalletData?): List<WalletData> {
@@ -149,7 +149,7 @@ data class WalletState(
         val remainingWallets: MutableList<WalletData> = newWallets.toMutableList()
         val updatedWallets = wallets.map { wallet ->
             val newWallet = newWallets
-                    .firstOrNull { wallet.currency == it.currency }
+                .firstOrNull { wallet.currency == it.currency }
             if (newWallet == null) {
                 wallet
             } else {
@@ -176,7 +176,7 @@ data class WalletState(
 
     fun addWalletManagers(newWalletManagers: List<WalletManager>): WalletState {
         val updatedWalletManagers = this.walletManagers +
-                newWalletManagers.filterNot { this.blockchains.contains(it.wallet.blockchain) }
+            newWalletManagers.filterNot { this.blockchains.contains(it.wallet.blockchain) }
         return copy(walletManagers = updatedWalletManagers)
     }
 }
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 379008a18b..dc17653642 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
@@ -63,9 +63,9 @@ class WalletMiddleware {
             is WalletAction.LoadWallet -> {
                 scope.launch {
                     if (action.blockchain == null) {
-                            walletState.walletManagers.map { walletManager ->
-                                async { globalState.tapWalletManager.loadWalletData(walletManager) }
-                            }.awaitAll()
+                        walletState.walletManagers.map { walletManager ->
+                            async { globalState.tapWalletManager.loadWalletData(walletManager) }
+                        }.awaitAll()
                     } else {
                         val walletManager = walletState.getWalletManager(action.blockchain)
                         walletManager?.let { globalState.tapWalletManager.loadWalletData(it) }
@@ -99,7 +99,7 @@ class WalletMiddleware {
                         else -> {
                             globalState.tapWalletManager.loadFiatRate(
                                 fiatCurrency = globalState.appCurrency,
-                                currencies = walletState.wallets.mapNotNull { it.currency }
+                                currencies = walletState.wallets.map { it.currency }
                             )
                         }
                     }
@@ -131,13 +131,13 @@ class WalletMiddleware {
                 if (action.blockchain != null) {
                     scope.launch {
                         val walletManager = walletState.getWalletManager(action.blockchain)
-                        walletManager?.let { globalState.tapWalletManager.updateWallet(it) }
+                        walletManager?.let { globalState.tapWalletManager.updateWallet(it, action.force) }
                     }
                 } else {
                     scope.launch {
                         if (walletState.state == ProgressState.Done) {
                             walletState.walletManagers.map { walletManager ->
-                                globalState.tapWalletManager.updateWallet(walletManager)
+                                globalState.tapWalletManager.updateWallet(walletManager, action.force)
                             }
                         }
                     }
@@ -163,6 +163,7 @@ class WalletMiddleware {
                             )
                             withMainContext { actionList.forEach { store.dispatch(it) } }
                         }
+                        is Result.Failure -> {}
                     }
                     store.dispatchOnMain(WalletAction.Warnings.CheckIfNeeded)
                 }
@@ -230,12 +231,12 @@ class WalletMiddleware {
                 when (currency) {
                     is Currency.Blockchain -> {
                         val amountToSend = amounts?.find { it.currencySymbol == currency.blockchain.currency }
-                                ?: return WalletAction.Send.ChooseCurrency(amounts)
+                            ?: return WalletAction.Send.ChooseCurrency(amounts)
                         PrepareSendScreen(amountToSend, selectedWalletData.fiatRate, walletManager)
                     }
                     is Currency.Token -> {
                         val amountToSend = amounts?.find { it.currencySymbol == currency.token.symbol }
-                                ?: return WalletAction.Send.ChooseCurrency(amounts)
+                            ?: return WalletAction.Send.ChooseCurrency(amounts)
                         prepareSendActionForToken(amountToSend, state, selectedWalletData, wallet, walletManager)
                     }
                 }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
index af75afcb1b..960a4e76b7 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
@@ -95,7 +95,6 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
         is WalletAction.LoadWallet -> {
             if (action.blockchain == null) {
                 val wallets = newState.wallets.map { wallet ->
-
                     wallet.copy(
                         currencyData = wallet.currencyData.copy(
                             status = BalanceStatus.Loading,
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index 9f6a876537..ca1b70231e 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -63,7 +63,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
             }.select { it.walletState }
         }
         walletView.setFragment(this, binding)
-        store.dispatch(WalletAction.UpdateWallet())
+        store.dispatch(WalletAction.UpdateWallet(force = false))
     }
 
     override fun onStop() {
diff --git a/app/src/main/res/layout/fragment_onboarding_wallet.xml b/app/src/main/res/layout/fragment_onboarding_wallet.xml
index 904ab50059..903a3c218b 100644
--- a/app/src/main/res/layout/fragment_onboarding_wallet.xml
+++ b/app/src/main/res/layout/fragment_onboarding_wallet.xml
@@ -23,7 +23,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:menu="@menu/shop"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
             app:title="@string/onboarding_getting_started" />
 
diff --git a/app/src/main/res/menu/shop.xml b/app/src/main/res/menu/shop.xml
deleted file mode 100644
index 092327411a..0000000000
--- a/app/src/main/res/menu/shop.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/shop_menu"
-        android:title="@string/home_button_shop"
-        app:showAsAction="always" />
-</menu>
\ No newline at end of file