diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index 8af57145e..c94df8b10 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -92,7 +92,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 433
-        versionName "4.1.0"
+        versionName "4.1.2"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
     }
diff --git a/packages/mobile/index.js b/packages/mobile/index.js
index 6b6d6dad9..d5b3354c7 100644
--- a/packages/mobile/index.js
+++ b/packages/mobile/index.js
@@ -22,7 +22,6 @@ import crashlytics from '@react-native-firebase/crashlytics';
 import messaging from '@react-native-firebase/messaging';
 import { withIAPContext } from 'react-native-iap';
 import { startApp } from './src/index';
-import { tk } from './src/wallet';
 
 LogBox.ignoreLogs([
   'Non-serializable values were found in the navigation state',
@@ -47,15 +46,17 @@ async function handleDappMessage(remoteMessage) {
   ) {
     return null;
   }
-
+  await useNotificationsStore.persist.rehydrate();
   if (remoteMessage.data?.type === 'better_stake_option_found') {
-    tk.wallet.staking.toggleRestakeBanner(
-      true,
-      remoteMessage.data.stakingAddressToMigrateFrom,
-    );
+    useNotificationsStore
+      .getState()
+      .actions.toggleRestakeBanner(
+        remoteMessage.data.account,
+        true,
+        remoteMessage.data.stakingAddressToMigrateFrom,
+      );
   }
 
-  await useNotificationsStore.persist.rehydrate();
   useNotificationsStore.getState().actions.addNotification(
     {
       ...remoteMessage.data,
diff --git a/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj b/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
index 5bffe413f..764467a97 100644
--- a/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
+++ b/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
@@ -1294,7 +1294,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1328,7 +1328,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.1.0;
+				MARKETING_VERSION = 4.1.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/packages/mobile/src/components/RestakeBanner/RestakeBanner.tsx b/packages/mobile/src/components/RestakeBanner/RestakeBanner.tsx
index 3ab76b3d2..302f802d7 100644
--- a/packages/mobile/src/components/RestakeBanner/RestakeBanner.tsx
+++ b/packages/mobile/src/components/RestakeBanner/RestakeBanner.tsx
@@ -26,6 +26,7 @@ import { IconsComposition } from './IconsComposition';
 import { useFiatValue } from '$hooks/useFiatValue';
 import { CryptoCurrencies } from '$shared/constants';
 import { stakingFormatter } from '$utils/formatter';
+import { useNotificationsStore } from '$store';
 
 export interface ExtendedPoolInfo extends PoolInfo {
   isWithdrawal: boolean;
@@ -35,6 +36,7 @@ export interface ExtendedPoolInfo extends PoolInfo {
 export interface RestakeBannerProps {
   poolsList: ExtendedPoolInfo[];
   migrateFrom: string;
+  bypassUnstakeStep?: boolean;
 }
 
 export enum RestakeSteps {
@@ -52,11 +54,14 @@ export const RestakeBanner = memo<RestakeBannerProps>((props) => {
     ) as ExtendedPoolInfo;
   }, [props.poolsList]);
   const { handleTopUpPress } = usePoolInfo(tonstakersPool);
+  const toggleRestakeBanner = useNotificationsStore(
+    (state) => state.actions.toggleRestakeBanner,
+  );
 
   const handleCloseRestakeBanner = useCallback(() => {
     LayoutAnimation.easeInEaseOut();
-    tk.wallet.staking.toggleRestakeBanner(false);
-  }, []);
+    toggleRestakeBanner(tk.wallet.address.ton.raw, false);
+  }, [toggleRestakeBanner]);
 
   const poolToWithdrawal = useMemo(
     () =>
@@ -68,8 +73,6 @@ export const RestakeBanner = memo<RestakeBannerProps>((props) => {
     [poolToWithdrawal],
   );
 
-  const bypassStakeStep = useStakingState((s) => s.bypassStakeStep, []);
-
   const readyWithdraw = useFiatValue(
     CryptoCurrencies.Ton,
     stakingFormatter.fromNano(toWithdrawalStakingInfo?.ready_withdraw ?? '0'),
@@ -79,13 +82,17 @@ export const RestakeBanner = memo<RestakeBannerProps>((props) => {
 
   const handleWithdrawal = useCallback(
     (pool: ExtendedPoolInfo, withdrawAll?: boolean) => () => {
+      if (pool.implementation === PoolImplementationType.Tf) {
+        nav.push(AppStackRouteNames.StakingSend, {
+          poolAddress: pool.address,
+          transactionType: StakingTransactionType.WITHDRAWAL_CONFIRM,
+        });
+        return;
+      }
       nav.push(AppStackRouteNames.StakingSend, {
         amount: withdrawAll && pool.balance,
         poolAddress: pool.address,
-        transactionType:
-          pool.implementation === PoolImplementationType.Tf
-            ? StakingTransactionType.WITHDRAWAL_CONFIRM
-            : StakingTransactionType.WITHDRAWAL,
+        transactionType: StakingTransactionType.WITHDRAWAL,
       });
     },
     [nav],
@@ -107,7 +114,11 @@ export const RestakeBanner = memo<RestakeBannerProps>((props) => {
       return RestakeSteps.DONE;
     }
     // Go to last step if pool to withdrawal is empty now (or if balance so small, or step is bypassed)
-    if (bypassStakeStep || Number(poolToWithdrawal?.balance) < 0.1) {
+    if (
+      props.bypassUnstakeStep ||
+      !poolToWithdrawal?.balance ||
+      Number(poolToWithdrawal?.balance) < 0.1
+    ) {
       return RestakeSteps.STAKE_INTO_TONSTAKERS;
     }
     // If user has pending withdrawal, render step with waiting
@@ -116,7 +127,7 @@ export const RestakeBanner = memo<RestakeBannerProps>((props) => {
     }
     return RestakeSteps.UNSTAKE;
   }, [
-    bypassStakeStep,
+    props.bypassUnstakeStep,
     isWaitingForWithdrawal,
     poolToWithdrawal?.balance,
     readyWithdraw.amount,
@@ -130,8 +141,8 @@ export const RestakeBanner = memo<RestakeBannerProps>((props) => {
   }, [currentStepId, handleCloseRestakeBanner]);
 
   const { formattedDuration, isCooldown } = useStakingCycle(
-    poolToWithdrawal?.cycle_start,
-    poolToWithdrawal?.cycle_end,
+    poolToWithdrawal?.cycle_start ?? Date.now(),
+    poolToWithdrawal?.cycle_end ?? Date.now(),
     isWaitingForWithdrawal,
   );
 
@@ -195,12 +206,14 @@ export const RestakeBanner = memo<RestakeBannerProps>((props) => {
                   }),
                 })}
               />,
-              <Button
-                color="tertiary"
-                size="small"
-                onPress={handleWithdrawal(poolToWithdrawal)}
-                title={t('restake_banner.unstake_action_manual')}
-              />,
+              poolToWithdrawal.implementation !== PoolImplementationType.Tf && (
+                <Button
+                  color="tertiary"
+                  size="small"
+                  onPress={handleWithdrawal(poolToWithdrawal)}
+                  title={t('restake_banner.unstake_action_manual')}
+                />
+              ),
             ]
           }
           stepId={RestakeSteps.UNSTAKE}
diff --git a/packages/mobile/src/core/DeleteAccountDone/DeleteAccountDone.tsx b/packages/mobile/src/core/DeleteAccountDone/DeleteAccountDone.tsx
index 98f0d95bb..3b6abc06d 100644
--- a/packages/mobile/src/core/DeleteAccountDone/DeleteAccountDone.tsx
+++ b/packages/mobile/src/core/DeleteAccountDone/DeleteAccountDone.tsx
@@ -22,7 +22,7 @@ export const DeleteAccountDone: React.FC = () => {
   }, []);
 
   const handleAnimationEnd = useCallback(() => {
-    dispatch(walletActions.cleanWallet({ cleanAll: true }));
+    dispatch(walletActions.cleanWallet({ cleanAll: false }));
   }, [dispatch]);
 
   return (
diff --git a/packages/mobile/src/core/Notifications/Notification.tsx b/packages/mobile/src/core/Notifications/Notification.tsx
index 64d33236b..15afa856b 100644
--- a/packages/mobile/src/core/Notifications/Notification.tsx
+++ b/packages/mobile/src/core/Notifications/Notification.tsx
@@ -6,6 +6,7 @@ import {
   disableNotifications,
   useConnectedAppsList,
   useDAppsNotifications,
+  useNotificationsStore,
 } from '$store';
 import { format, getDomainFromURL } from '$utils';
 import { Swipeable, TouchableOpacity } from 'react-native-gesture-handler';
@@ -54,6 +55,9 @@ export const Notification: React.FC<NotificationProps> = (props) => {
   const { showActionSheetWithOptions } = useActionSheet();
   const { deleteNotificationByReceivedAt } = useDAppsNotifications();
   const listItemRef = useRef(null);
+  const toggleRestakeBanner = useNotificationsStore(
+    (state) => state.actions.toggleRestakeBanner,
+  );
 
   const handleDelete = useCallback(() => {
     deleteNotificationByReceivedAt(props.notification.received_at);
@@ -141,7 +145,7 @@ export const Notification: React.FC<NotificationProps> = (props) => {
 
   const handleOpenInWebView = useCallback(() => {
     if (props.notification.type === NotificationType.BETTER_STAKE_OPTION_FOUND) {
-      tk.wallet.staking.toggleRestakeBanner(true);
+      toggleRestakeBanner(tk.wallet.address.ton.raw, true);
     }
 
     if (!props.notification.link && !props.notification.deeplink) {
diff --git a/packages/mobile/src/core/Settings/Settings.tsx b/packages/mobile/src/core/Settings/Settings.tsx
index 6f7bbc70e..ffd77082d 100644
--- a/packages/mobile/src/core/Settings/Settings.tsx
+++ b/packages/mobile/src/core/Settings/Settings.tsx
@@ -211,20 +211,24 @@ export const Settings: FC = () => {
   }, []);
 
   const handleDeleteAccount = useCallback(() => {
-    Alert.alert(t('settings_delete_alert_title'), t('settings_delete_alert_caption'), [
-      {
-        text: t('cancel'),
-        style: 'cancel',
-      },
-      {
-        text: t('settings_delete_alert_button'),
-        style: 'destructive',
-        onPress: () => {
-          trackEvent('delete_wallet');
-          openDeleteAccountDone();
+    Alert.alert(
+      t('settings_delete_alert_title', { space: Platform.OS === 'ios' ? '\n' : ' ' }),
+      t('settings_delete_alert_caption'),
+      [
+        {
+          text: t('cancel'),
+          style: 'cancel',
         },
-      },
-    ]);
+        {
+          text: t('settings_delete_alert_button'),
+          style: 'destructive',
+          onPress: () => {
+            trackEvent('delete_wallet');
+            openDeleteAccountDone();
+          },
+        },
+      ],
+    );
   }, []);
 
   const handleCustomizePress = useCallback(
diff --git a/packages/mobile/src/core/Staking/Staking.tsx b/packages/mobile/src/core/Staking/Staking.tsx
index 47dbd7dff..dec0220fa 100644
--- a/packages/mobile/src/core/Staking/Staking.tsx
+++ b/packages/mobile/src/core/Staking/Staking.tsx
@@ -2,7 +2,7 @@ import { useStakingRefreshControl } from '$hooks/useStakingRefreshControl';
 import { useNavigation } from '@tonkeeper/router';
 import { MainStackRouteNames, openDAppBrowser } from '$navigation';
 import { StakingListCell } from '$shared/components';
-import { FlashCountKeys, useFlashCount } from '$store';
+import { FlashCountKeys, useFlashCount, useNotificationsStore } from '$store';
 import { Button, Icon, ScrollHandler, Spacer, Text } from '$uikit';
 import { List } from '$uikit/List/old/List';
 import { getImplementationIcon, getPoolIcon } from '$utils/staking';
@@ -24,6 +24,8 @@ import { useBalancesState, useJettons, useStakingState } from '@tonkeeper/shared
 import { StakingManager, StakingProvider } from '$wallet/managers/StakingManager';
 import { config } from '$config';
 import { RestakeBanner } from '../../components/RestakeBanner/RestakeBanner';
+import { shallow } from 'zustand/shallow';
+import { tk } from '$wallet';
 
 interface Props {}
 
@@ -36,9 +38,11 @@ export const Staking: FC<Props> = () => {
   const pools = useStakingState((s) => s.pools);
   const stakingInfo = useStakingState((s) => s.stakingInfo);
   const highestApyPool = useStakingState((s) => s.highestApyPool);
-  const showRestakeBanner = useStakingState((s) => s.showRestakeBanner);
-  const stakingAddressToMigrateFrom = useStakingState(
-    (s) => s.stakingAddressToMigrateFrom,
+
+  const rawAddress = tk.wallet.address.ton.raw ?? '';
+  const notificationsStore = useNotificationsStore(
+    (state) => state.wallets[rawAddress],
+    shallow,
   );
 
   const [flashShownCount] = useFlashCount(FlashCountKeys.Staking);
@@ -221,15 +225,17 @@ export const Staking: FC<Props> = () => {
           showsVerticalScrollIndicator={false}
         >
           <S.Content bottomInset={bottomInset}>
-            {showRestakeBanner && stakingAddressToMigrateFrom && (
-              <>
-                <RestakeBanner
-                  migrateFrom={stakingAddressToMigrateFrom}
-                  poolsList={poolsList}
-                />
-                <Spacer y={16} />
-              </>
-            )}
+            {notificationsStore?.showRestakeBanner &&
+              notificationsStore?.stakingAddressToMigrateFrom && (
+                <>
+                  <RestakeBanner
+                    bypassUnstakeStep={notificationsStore?.bypassUnstakeStep}
+                    migrateFrom={notificationsStore?.stakingAddressToMigrateFrom}
+                    poolsList={poolsList}
+                  />
+                  <Spacer y={16} />
+                </>
+              )}
             {!hasActivePools ? (
               <S.LargeTitleContainer>
                 <Text variant="h2">{t('staking.title_large')}</Text>
diff --git a/packages/mobile/src/core/StakingSend/StakingSend.tsx b/packages/mobile/src/core/StakingSend/StakingSend.tsx
index 826b9f396..46d565839 100644
--- a/packages/mobile/src/core/StakingSend/StakingSend.tsx
+++ b/packages/mobile/src/core/StakingSend/StakingSend.tsx
@@ -9,7 +9,7 @@ import { AppStackRouteNames } from '$navigation';
 import { AppStackParamList } from '$navigation/AppStack';
 import { StepView, StepViewItem, StepViewRef } from '$shared/components';
 import { CryptoCurrencies, Decimals } from '$shared/constants';
-import { Toast } from '$store';
+import { Toast, useNotificationsStore } from '$store';
 import { getStakingPoolByAddress } from '@tonkeeper/shared/utils/staking';
 import { walletWalletSelector } from '$store/wallet';
 import { NavBar } from '$uikit';
@@ -38,6 +38,7 @@ import { SignRawMessage } from '$core/ModalContainer/NFTOperations/TXRequest.typ
 import { useStakingState, useWallet } from '@tonkeeper/shared/hooks';
 import { tk } from '$wallet';
 import { Address } from '@tonkeeper/shared/Address';
+import { shallow } from 'zustand/shallow';
 
 interface Props {
   route: RouteProp<AppStackParamList, AppStackRouteNames.StakingSend>;
@@ -176,6 +177,15 @@ export const StakingSend: FC<Props> = (props) => {
 
   const messages = useRef<SignRawMessage[]>([]);
 
+  const rawAddress = wallet.address.ton.raw ?? '';
+  const stakingAddressToMigrateFrom = useNotificationsStore(
+    (state) => state.wallets[rawAddress]?.stakingAddressToMigrateFrom,
+    shallow,
+  );
+  const bypassUnstakeStep = useNotificationsStore(
+    (state) => state.actions.bypassUnstakeStep,
+  );
+
   const { isLiquidJetton, price } = useCurrencyToSend(currency, tokenType);
 
   const parsedAmount = useMemo(() => {
@@ -334,22 +344,32 @@ export const StakingSend: FC<Props> = (props) => {
       const privateKey = await vault.getTonPrivateKey();
 
       await actionRef.current.send(privateKey);
+
+      const endTimestamp = pool.cycle_end * 1000;
+      const isCooldown = Date.now() > endTimestamp;
+
       if (
-        isWithdrawalConfrim &&
-        tk.wallet.staking.state.data.stakingAddressToMigrateFrom &&
-        Address.compare(
-          tk.wallet.staking.state.data.stakingAddressToMigrateFrom,
-          pool.address,
-        )
+        (isWithdrawalConfrim || isCooldown) &&
+        stakingAddressToMigrateFrom &&
+        Address.compare(stakingAddressToMigrateFrom, pool.address)
       ) {
-        tk.wallet.staking.setBypassStakeStep();
+        bypassUnstakeStep(rawAddress);
       }
     } catch (e) {
       throw e;
     } finally {
       setSending(false);
     }
-  }, [isDeposit, isWithdrawalConfrim, pool, totalFee, unlockVault]);
+  }, [
+    bypassUnstakeStep,
+    isDeposit,
+    isWithdrawalConfrim,
+    pool,
+    rawAddress,
+    stakingAddressToMigrateFrom,
+    totalFee,
+    unlockVault,
+  ]);
 
   useEffect(() => {
     if (isWithdrawalConfrim || initialAmount) {
diff --git a/packages/mobile/src/store/zustand/notifications/types.ts b/packages/mobile/src/store/zustand/notifications/types.ts
index 33119a0c3..97a8536d4 100644
--- a/packages/mobile/src/store/zustand/notifications/types.ts
+++ b/packages/mobile/src/store/zustand/notifications/types.ts
@@ -20,6 +20,9 @@ export interface INotificationsState {
   last_seen: number;
   last_seen_activity_screen: number;
   should_show_red_dot: boolean;
+  showRestakeBanner?: boolean;
+  stakingAddressToMigrateFrom?: string;
+  bypassUnstakeStep?: boolean;
 }
 
 export interface INotificationsStore {
@@ -35,5 +38,11 @@ export interface INotificationsStore {
     deleteNotificationByReceivedAt: (receivedAt: number, rawAddress: string) => void;
     removeNotificationsByDappUrl: (dapp_url: string, rawAddress: string) => void;
     removeRedDot: (rawAddress: string) => void;
+    toggleRestakeBanner: (
+      rawAddress: string,
+      showRestakeBanner: boolean,
+      stakingAddressToMigrateFrom?: string,
+    ) => void;
+    bypassUnstakeStep: (rawAddress: string) => void;
   };
 }
diff --git a/packages/mobile/src/store/zustand/notifications/useNotificationsStore.ts b/packages/mobile/src/store/zustand/notifications/useNotificationsStore.ts
index e59ef6da8..8b4769b2d 100644
--- a/packages/mobile/src/store/zustand/notifications/useNotificationsStore.ts
+++ b/packages/mobile/src/store/zustand/notifications/useNotificationsStore.ts
@@ -110,6 +110,40 @@ export const useNotificationsStore = create(
             };
           });
         },
+        toggleRestakeBanner: (
+          rawAddress: string,
+          showRestakeBanner: boolean,
+          stakingAddressToMigrateFrom?: string,
+        ) => {
+          set((state) => {
+            const wallet = state.wallets[rawAddress];
+            return {
+              wallets: {
+                ...state.wallets,
+                [rawAddress]: {
+                  ...wallet,
+                  showRestakeBanner,
+                  bypassUnstakeStep: false,
+                  ...(stakingAddressToMigrateFrom ? { stakingAddressToMigrateFrom } : {}),
+                },
+              },
+            };
+          });
+        },
+        bypassUnstakeStep: (rawAddress) => {
+          set((state) => {
+            const wallet = state.wallets[rawAddress];
+            return {
+              wallets: {
+                ...state.wallets,
+                [rawAddress]: {
+                  ...wallet,
+                  bypassUnstakeStep: true,
+                },
+              },
+            };
+          });
+        },
         reset: () => set(initialState),
       },
     }),
diff --git a/packages/mobile/src/wallet/AppVault.ts b/packages/mobile/src/wallet/AppVault.ts
index 75156f359..37f747946 100644
--- a/packages/mobile/src/wallet/AppVault.ts
+++ b/packages/mobile/src/wallet/AppVault.ts
@@ -56,6 +56,11 @@ export class AppVault implements Vault {
   }
 
   public async import(identifier: string, mnemonic: string, passcode: string) {
+    try {
+      if (!this.decryptedVaultState) {
+        this.decryptedVaultState = await this.getDecryptedVaultState(passcode);
+      }
+    } catch {}
     /** check passcode */
     if (Object.keys(this.decryptedVaultState).length > 0) {
       await this.verifyPasscode(passcode);
diff --git a/packages/mobile/src/wallet/Tonkeeper.ts b/packages/mobile/src/wallet/Tonkeeper.ts
index e1380bac5..12d2890a6 100644
--- a/packages/mobile/src/wallet/Tonkeeper.ts
+++ b/packages/mobile/src/wallet/Tonkeeper.ts
@@ -154,6 +154,10 @@ export class Tonkeeper {
         ),
       );
 
+      if (!this.wallet && this.walletsStore.data.wallets.length) {
+        return await this.switchWallet(this.walletsStore.data.wallets[0].identifier);
+      }
+
       this.emitChangeWallet();
     } catch (err) {
       console.log('TK:init', err);
@@ -262,7 +266,7 @@ export class Tonkeeper {
     );
     walletsInstances.map((instance) => instance.tonProof.obtainProof(keyPair));
 
-    this.setWallet(walletsInstances[0]);
+    await this.setWallet(walletsInstances[0]);
 
     return walletsInstances.map((item) => item.identifier);
   }
@@ -357,7 +361,7 @@ export class Tonkeeper {
       wallets: [...wallets, config],
     }));
     const wallet = await this.createWalletInstance(config);
-    this.setWallet(wallet);
+    await this.setWallet(wallet);
 
     return [wallet.identifier];
   }
@@ -489,13 +493,13 @@ export class Tonkeeper {
     this.walletSubscribers.forEach((subscriber) => subscriber(this.wallet));
   }
 
-  public switchWallet(identifier: string) {
+  public async switchWallet(identifier: string) {
     const wallet = this.wallets.get(identifier);
-    this.setWallet(wallet!);
+    await this.setWallet(wallet!);
   }
 
-  private setWallet(wallet: Wallet | null) {
-    this.walletsStore.set({ selectedIdentifier: wallet?.identifier ?? '' });
+  private async setWallet(wallet: Wallet | null) {
+    await this.walletsStore.setAsync({ selectedIdentifier: wallet?.identifier ?? '' });
     this.emitChangeWallet();
   }
 
diff --git a/packages/mobile/src/wallet/managers/StakingManager.ts b/packages/mobile/src/wallet/managers/StakingManager.ts
index ccc7bf097..72af2fef4 100644
--- a/packages/mobile/src/wallet/managers/StakingManager.ts
+++ b/packages/mobile/src/wallet/managers/StakingManager.ts
@@ -40,9 +40,6 @@ export type StakingState = {
   stakingJettons: Record<string, JettonMetadata>;
   stakingJettonsUpdatedAt: number;
   stakingBalance: string;
-  showRestakeBanner: boolean;
-  stakingAddressToMigrateFrom?: string;
-  bypassStakeStep?: boolean;
 };
 
 export class StakingManager {
@@ -61,8 +58,6 @@ export class StakingManager {
     providers: [],
     highestApyPool: null,
     stakingBalance: '0',
-    showRestakeBanner: false,
-    bypassStakeStep: false,
   };
 
   static calculatePoolBalance(pool: PoolInfo, stakingInfo: StakingInfo) {
@@ -281,24 +276,6 @@ export class StakingManager {
     }
   }
 
-  public toggleRestakeBanner(
-    showRestakeBanner: boolean,
-    stakingAddressToMigrateFrom?: string,
-  ) {
-    if (stakingAddressToMigrateFrom) {
-      return this.state.set({
-        stakingAddressToMigrateFrom,
-        showRestakeBanner,
-        bypassStakeStep: false,
-      });
-    }
-    this.state.set({ showRestakeBanner, bypassStakeStep: false });
-  }
-
-  public setBypassStakeStep() {
-    this.state.set({ bypassStakeStep: true });
-  }
-
   public async reload() {
     await this.load();
   }
diff --git a/packages/shared/i18n/locales/tonkeeper/en.json b/packages/shared/i18n/locales/tonkeeper/en.json
index 6021cb5ff..9e2e1c139 100644
--- a/packages/shared/i18n/locales/tonkeeper/en.json
+++ b/packages/shared/i18n/locales/tonkeeper/en.json
@@ -620,7 +620,7 @@
   "settings_delete_account": "Delete account",
   "settings_delete_alert_button": "Delete account and data",
   "settings_delete_alert_caption": "This action will delete your account and all data from this application.",
-  "settings_delete_alert_title": "Are you sure you want to delete your account?",
+  "settings_delete_alert_title": "\uD83D\uDEA8\uD83D\uDEA8\uD83D\uDEA8%{space}Are you sure you want to delete your account?",
   "settings_jettons_list": "Tokens",
   "settings_legal_documents": "Legal",
   "language": {
@@ -648,9 +648,9 @@
   "settings_reset": "Sign Out",
   "settings_reset_alert_button": "Sign Out",
   "settings_reset_alert_caption": "This will erase key to your wallet. Make sure you have backed up your recovery phrase.",
-  "settings_reset_alert_title": "Sign Out?",
+  "settings_reset_alert_title": "\uD83D\uDEA7 \uD83D\uDEA8 Sign Out? \uD83D\uDEA8 \uD83D\uDEA7",
   "settings_reset_alert_caption_all": "This will erase keys to all wallets. Make sure you have backed up your recovery phrases.",
-  "settings_reset_alert_title_all": "Sign Out of All Wallets?",
+  "settings_reset_alert_title_all": "\uD83D\uDEA7 \uD83D\uDEA8\uD83D\uDEA8\uD83D\uDEA8 \uD83D\uDEA7\nSign Out of All Wallets?",
   "settings_delete_watch_account": "Delete Watch Account?",
   "settings_delete_watch_account_button": "Delete",
   "settings_search_engine": "Search",
diff --git a/packages/shared/i18n/locales/tonkeeper/ru-RU.json b/packages/shared/i18n/locales/tonkeeper/ru-RU.json
index 3a2bbe300..b4b3389f5 100644
--- a/packages/shared/i18n/locales/tonkeeper/ru-RU.json
+++ b/packages/shared/i18n/locales/tonkeeper/ru-RU.json
@@ -611,7 +611,7 @@
   "settings_delete_account" : "Удалить аккаунт",
   "settings_delete_alert_button" : "Удалить аккаунт и данные",
   "settings_delete_alert_caption" : "Это действие приведет к удалению вашего аккаунта и всех данных из этого приложения.",
-  "settings_delete_alert_title" : "Вы уверены, что хотите удалить аккаунт?",
+  "settings_delete_alert_title": "\uD83D\uDEA8\uD83D\uDEA8\uD83D\uDEA8%{space}Вы уверены, что хотите удалить аккаунт?",
   "settings_jettons_list" : "Токены",
   "settings_legal_documents" : "Юридические документы",
   "language": {
@@ -639,9 +639,9 @@
   "settings_reset" : "Выйти",
   "settings_reset_alert_button" : "Выйти",
   "settings_reset_alert_caption" : "Доступ к кошельку будет отключен. Убедитесь, что вы сохранили секретный ключ.",
-  "settings_reset_alert_title" : "Выйти из кошелька?",
+  "settings_reset_alert_title" : "\uD83D\uDEA7 \uD83D\uDEA8 Выйти из кошелька? \uD83D\uDEA8 \uD83D\uDEA7",
   "settings_reset_alert_caption_all": "Доступ к кошелькам будет отключён. Убедитесь, что вы сохранили все секретные ключи.",
-  "settings_reset_alert_title_all": "Выйти из всех кошельков?",
+  "settings_reset_alert_title_all": "\uD83D\uDEA7 \uD83D\uDEA8\uD83D\uDEA8\uD83D\uDEA8 \uD83D\uDEA7\nВыйти из всех кошельков?",
   "settings_delete_watch_account": "Удалить аккаунт для просмотра?",
   "settings_delete_watch_account_button": "Удалить",
   "settings_search_engine" : "Поиск",
diff --git a/packages/shared/i18n/locales/tonkeeper/tr-TR.json b/packages/shared/i18n/locales/tonkeeper/tr-TR.json
index 4de4f1935..401fb8610 100644
--- a/packages/shared/i18n/locales/tonkeeper/tr-TR.json
+++ b/packages/shared/i18n/locales/tonkeeper/tr-TR.json
@@ -670,7 +670,7 @@
   "settings_delete_account" : "Hesabı sil",
   "settings_delete_alert_button" : "Hesabı ve verileri sil",
   "settings_delete_alert_caption" : "Bu işlem hesabınızı ve bu uygulamadaki tüm verilerinizi silecektir.",
-  "settings_delete_alert_title" : "Hesabınızı silmek istediğinize emin misiniz?",
+  "settings_delete_alert_title" : "\uD83D\uDEA8\uD83D\uDEA8\uD83D\uDEA8%{space}Hesabınızı silmek istediğinize emin misiniz?",
   "settings_jettons_list" : "Token'lar",
   "settings_legal_documents" : "Hukuki açıklama",
   "settings_network_alert_title" : "Ağ seçin",
@@ -682,7 +682,7 @@
   "settings_reset" : "Oturumu kapat",
   "settings_reset_alert_button" : "Oturumu kapat",
   "settings_reset_alert_caption" : "Bu işlem, cüzdan anahtarlarını siler. Gizli kurtarma ifadesini yedeklediğinizden emin olun.",
-  "settings_reset_alert_title" : "Oturum kapatılsın mı?",
+  "settings_reset_alert_title": "\uD83D\uDEA7 \uD83D\uDEA8 Oturum kapatılsın mı? \uD83D\uDEA8 \uD83D\uDEA7",
   "settings_search_engine" : "Arama",
   "settings_security" : "Güvenlik",
   "settings_subscriptions" : "Üyelikler",
@@ -1060,4 +1060,4 @@
   "wallet_swap" : "Takas",
   "wallet_title" : "Cüzdan",
   "yesterday" : "Dün"
-}
\ No newline at end of file
+}
diff --git a/packages/shared/i18n/locales/tonkeeper/zh-Hans-CN.json b/packages/shared/i18n/locales/tonkeeper/zh-Hans-CN.json
index 167d08782..b5aea1cd4 100644
--- a/packages/shared/i18n/locales/tonkeeper/zh-Hans-CN.json
+++ b/packages/shared/i18n/locales/tonkeeper/zh-Hans-CN.json
@@ -539,7 +539,7 @@
   "settings_delete_account" : "删除账户",
   "settings_delete_alert_button" : "删除账户和数据",
   "settings_delete_alert_caption" : "此操作将从此应用中删除您的账户和所有数据。",
-  "settings_delete_alert_title" : "您确定要删除您的账户吗？",
+  "settings_delete_alert_title" : "\uD83D\uDEA7 \uD83D\uDEA8\uD83D\uDEA8\uD83D\uDEA8 \uD83D\uDEA7%{space}您确定要删除您的账户吗？",
   "settings_jettons_list" : "代币",
   "settings_legal_documents" : "法律文件",
   "settings_network_alert_title" : "选择网络",
@@ -552,7 +552,7 @@
   "settings_reset" : "退出登录",
   "settings_reset_alert_button" : "退出登录",
   "settings_reset_alert_caption" : "这将删除钱包的密钥。确保您已备份了您的秘密恢复短语。",
-  "settings_reset_alert_title" : "退出登录？",
+  "settings_reset_alert_title": "\uD83D\uDEA7 \uD83D\uDEA8 退出登录？ \uD83D\uDEA8 \uD83D\uDEA7",
   "settings_search_engine" : "搜索",
   "settings_security" : "安全",
   "settings_subscriptions" : "订阅",
@@ -882,4 +882,4 @@
   "wallet_toncommunity_chat_link" : "https://t.me/toncoin_chat",
   "wallet_toncommunity_link" : "https://t.me/toncoin",
   "yesterday" : "昨天"
-}
\ No newline at end of file
+}
diff --git a/packages/shared/modals/AddWalletModal.tsx b/packages/shared/modals/AddWalletModal.tsx
index e1702b490..1ad6ee80f 100644
--- a/packages/shared/modals/AddWalletModal.tsx
+++ b/packages/shared/modals/AddWalletModal.tsx
@@ -16,6 +16,7 @@ import { tk } from '@tonkeeper/mobile/src/wallet';
 import { useUnlockVault } from '@tonkeeper/mobile/src/core/ModalContainer/NFTOperations/useUnlockVault';
 import { getLastEnteredPasscode } from '@tonkeeper/mobile/src/store/wallet/sagas';
 import { config } from '@tonkeeper/mobile/src/config';
+import { InteractionManager } from 'react-native';
 
 interface AddWalletModalProps {
   isTonConnect?: boolean;
@@ -89,7 +90,9 @@ export const AddWalletModal = memo<AddWalletModalProps>(({ isTonConnect }) => {
             <List.Item
               onPress={() => {
                 nav.goBack();
-                nav.navigate('ImportWalletStack');
+                InteractionManager.runAfterInteractions(() => {
+                  nav.navigate('ImportWalletStack');
+                });
               }}
               leftContentStyle={styles.iconContainer}
               leftContent={<Icon name="ic-key-28" color="accentBlue" />}
@@ -104,7 +107,9 @@ export const AddWalletModal = memo<AddWalletModalProps>(({ isTonConnect }) => {
               <List.Item
                 onPress={() => {
                   nav.goBack();
-                  nav.navigate('AddWatchOnlyStack');
+                  InteractionManager.runAfterInteractions(() => {
+                    nav.navigate('AddWatchOnlyStack');
+                  });
                 }}
                 leftContentStyle={styles.iconContainer}
                 leftContent={<Icon name="ic-magnifying-glass-28" color="accentBlue" />}
@@ -120,9 +125,11 @@ export const AddWalletModal = memo<AddWalletModalProps>(({ isTonConnect }) => {
               <List.Item
                 onPress={() => {
                   nav.goBack();
-                  nav.navigate('ImportWalletStack', {
-                    screen: 'ImportWallet',
-                    params: { testnet: true },
+                  InteractionManager.runAfterInteractions(() => {
+                    nav.navigate('ImportWalletStack', {
+                      screen: 'ImportWallet',
+                      params: { testnet: true },
+                    });
                   });
                 }}
                 leftContentStyle={styles.iconContainer}
diff --git a/packages/uikit/src/containers/Modal/SheetModal/SheetModal.tsx b/packages/uikit/src/containers/Modal/SheetModal/SheetModal.tsx
index d59fb605b..2e330b876 100644
--- a/packages/uikit/src/containers/Modal/SheetModal/SheetModal.tsx
+++ b/packages/uikit/src/containers/Modal/SheetModal/SheetModal.tsx
@@ -19,6 +19,7 @@ import { useTheme } from '../../../styles';
 
 import { useSheetInternal } from '@tonkeeper/router';
 import { Easing, ReduceMotion, useReducedMotion } from 'react-native-reanimated';
+import { Handle, InteractionManager } from 'react-native';
 
 export type SheetModalRef = BottomSheetModal;
 
@@ -64,10 +65,15 @@ export const SheetModal = memo(
       return initialState === 'closed' ? -1 : 0;
     }, []);
 
+    const interactionHandle = useRef<Handle | null>(null);
+
     useEffect(() => {
       delegateMethods({
         present: () => bottomSheetRef.current?.snapToIndex(0),
-        close: () => bottomSheetRef.current?.close(),
+        close: () => {
+          interactionHandle.current = InteractionManager.createInteractionHandle();
+          bottomSheetRef.current?.close();
+        },
       });
     }, []);
 
@@ -83,6 +89,10 @@ export const SheetModal = memo(
     );
 
     const handleClose = useCallback(async () => {
+      if (interactionHandle.current !== null) {
+        InteractionManager.clearInteractionHandle(interactionHandle.current);
+        interactionHandle.current = null;
+      }
       if (ignoreOnClose) {
         return;
       }