From 4da3abcf5f963f2d3cca62db76a8144e2ec97460 Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Tue, 12 Mar 2024 17:06:34 +0300
Subject: [PATCH 01/11] fix(mobile): DNS as name for watch-only account (#760)

---
 packages/mobile/src/core/AddWatchOnly/AddWatchOnly.tsx | 5 ++++-
 packages/mobile/src/wallet/Tonkeeper.ts                | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/mobile/src/core/AddWatchOnly/AddWatchOnly.tsx b/packages/mobile/src/core/AddWatchOnly/AddWatchOnly.tsx
index a88c22da5..971956831 100644
--- a/packages/mobile/src/core/AddWatchOnly/AddWatchOnly.tsx
+++ b/packages/mobile/src/core/AddWatchOnly/AddWatchOnly.tsx
@@ -129,7 +129,10 @@ export const AddWatchOnly: FC = () => {
     setLoading(true);
 
     try {
-      const identifiers = await tk.addWatchOnlyWallet(account.address);
+      const identifiers = await tk.addWatchOnlyWallet(
+        account.address,
+        account.domain ? account.domain.split('.')[0] : undefined,
+      );
       const isNotificationsDenied = await tk.wallet.notifications.getIsDenied();
 
       if (isNotificationsDenied) {
diff --git a/packages/mobile/src/wallet/Tonkeeper.ts b/packages/mobile/src/wallet/Tonkeeper.ts
index 1fe5a8834..2b2d8d1b4 100644
--- a/packages/mobile/src/wallet/Tonkeeper.ts
+++ b/packages/mobile/src/wallet/Tonkeeper.ts
@@ -302,7 +302,7 @@ export class Tonkeeper {
     });
   }
 
-  public async addWatchOnlyWallet(address: string) {
+  public async addWatchOnlyWallet(address: string, name?: string) {
     const rawAddress = Address.parse(address).toRaw();
     const { public_key: pubkey } = await this.tonapi.mainnet.accounts.getAccountPublicKey(
       rawAddress,
@@ -325,7 +325,7 @@ export class Tonkeeper {
 
     const config: WalletConfig = {
       ...DEFAULT_WALLET_STYLE_CONFIG,
-      name: this.getNewWalletName(),
+      name: name ?? this.getNewWalletName(),
       identifier: uuidv4(),
       network: WalletNetwork.mainnet,
       type: WalletType.WatchOnly,

From 92ca6be8e0d78029d39a28dfe68afbb11556a6d0 Mon Sep 17 00:00:00 2001
From: Andrey Sorokin <sorokin0andrey@gmail.com>
Date: Tue, 12 Mar 2024 18:25:27 +0000
Subject: [PATCH 02/11] feat(mobile): add swap host to dev menu (#761)

---
 packages/mobile/src/core/DevMenu/DevConfigScreen.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/mobile/src/core/DevMenu/DevConfigScreen.tsx b/packages/mobile/src/core/DevMenu/DevConfigScreen.tsx
index 0a8f0a937..79a539a0b 100644
--- a/packages/mobile/src/core/DevMenu/DevConfigScreen.tsx
+++ b/packages/mobile/src/core/DevMenu/DevConfigScreen.tsx
@@ -56,6 +56,18 @@ export const DevConfigScreen = memo(() => {
               })
             }
           />
+          <List.Item
+            title="Swap host"
+            value={config.get('stonfiUrl')}
+            valueStyle={styles.value}
+            onPress={() =>
+              nav.navigate('/dev/config/edit', {
+                configKey: 'stonfiUrl',
+                title: 'Swap host',
+                onSave: handleSave,
+              })
+            }
+          />
           <List.Item
             title="Enable battery"
             onPress={handleBooleanSwitch('disable_battery')}

From dff8135cc9a035977096de6edfb410f2dc4e0ee5 Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Wed, 13 Mar 2024 14:04:45 +0300
Subject: [PATCH 03/11] fix(mobile): Avoid update cache by adding query param
 (#767)

---
 packages/mobile/src/store/zustand/updates/useUpdatesStore.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/mobile/src/store/zustand/updates/useUpdatesStore.ts b/packages/mobile/src/store/zustand/updates/useUpdatesStore.ts
index c100f98d5..e95784ccd 100644
--- a/packages/mobile/src/store/zustand/updates/useUpdatesStore.ts
+++ b/packages/mobile/src/store/zustand/updates/useUpdatesStore.ts
@@ -45,8 +45,9 @@ export const useUpdatesStore = create(
           }
         },
         startUpdate: async () => {
+          const state = getState();
           let download = RNFS.downloadFile({
-            fromUrl: 'https://data2.ton.app/apk/tonkeeper.apk',
+            fromUrl: `https://data2.ton.app/apk/tonkeeper.apk?requestVersion=${state.meta?.version}`,
             toFile: getUpdatePath(),
             progress: (res) => {
               set({

From 3cdcdb4e1b34c20a77830beb1f840053430d37e4 Mon Sep 17 00:00:00 2001
From: Andrey Sorokin <sorokin0andrey@gmail.com>
Date: Wed, 13 Mar 2024 14:40:32 +0000
Subject: [PATCH 04/11] fix(mobile): fix seed phrase on small displays

---
 .../BackupPhraseScreen/BackupPhraseScreen.tsx | 77 +++++++++----------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/packages/mobile/src/screens/BackupPhraseScreen/BackupPhraseScreen.tsx b/packages/mobile/src/screens/BackupPhraseScreen/BackupPhraseScreen.tsx
index 0b03553ec..9b56fb282 100644
--- a/packages/mobile/src/screens/BackupPhraseScreen/BackupPhraseScreen.tsx
+++ b/packages/mobile/src/screens/BackupPhraseScreen/BackupPhraseScreen.tsx
@@ -41,43 +41,45 @@ export const BackupPhraseScreen = memo(() => {
   return (
     <Screen>
       <Screen.Header />
-      <View style={styles.container}>
-        <Text type="h2" textAlign="center">
-          {t('recovery_phrase.title')}
-        </Text>
-        <Spacer y={4} />
-        <Text type="body1" color="textSecondary" textAlign="center">
-          {t('recovery_phrase.caption')}
-        </Text>
-        <Spacer y={16} />
+      <Screen.ScrollView>
+        <View style={styles.container}>
+          <Text type="h2" textAlign="center">
+            {t('recovery_phrase.title')}
+          </Text>
+          <Spacer y={4} />
+          <Text type="body1" color="textSecondary" textAlign="center">
+            {t('recovery_phrase.caption')}
+          </Text>
+          <Spacer y={16} />
 
-        <View style={styles.centered}>
-          <View style={styles.columns}>
-            <View style={styles.leftColumn}>
-              {leftColumn.map((word, index) => (
-                <View style={styles.line} key={`${word}-${index}`}>
-                  <Text type="body2" color="textSecondary" style={styles.num}>
-                    {index + 1}.
-                  </Text>
-                  <Text type="body1">{word}</Text>
-                </View>
-              ))}
-            </View>
-            <View>
-              {rightColumn.map((word, index) => (
-                <View style={styles.line} key={`${word}-${index + 1 + 12}`}>
-                  <Text type="body2" color="textSecondary" style={styles.num}>
-                    {index + 1 + 12}.
-                  </Text>
-                  <Text type="body1">{word}</Text>
-                </View>
-              ))}
+          <View style={styles.centered}>
+            <View style={styles.columns}>
+              <View style={styles.leftColumn}>
+                {leftColumn.map((word, index) => (
+                  <View style={styles.line} key={`${word}-${index}`}>
+                    <Text type="body2" color="textSecondary" style={styles.num}>
+                      {index + 1}.
+                    </Text>
+                    <Text type="body1">{word}</Text>
+                  </View>
+                ))}
+              </View>
+              <View>
+                {rightColumn.map((word, index) => (
+                  <View style={styles.line} key={`${word}-${index + 1 + 12}`}>
+                    <Text type="body2" color="textSecondary" style={styles.num}>
+                      {index + 1 + 12}.
+                    </Text>
+                    <Text type="body1">{word}</Text>
+                  </View>
+                ))}
+              </View>
             </View>
           </View>
         </View>
-      </View>
-
-      <View style={[styles.buttonContainer, { paddingBottom: safeArea.bottom + 32 }]}>
+        <Screen.ButtonSpacer />
+      </Screen.ScrollView>
+      <Screen.ButtonContainer>
         {lastBackupAt !== null && !params.isBackupAgain ? (
           <Button
             title={t('recovery_phrase.copy_button')}
@@ -94,7 +96,7 @@ export const BackupPhraseScreen = memo(() => {
             }
           />
         )}
-      </View>
+      </Screen.ButtonContainer>
     </Screen>
   );
 });
@@ -102,7 +104,6 @@ export const BackupPhraseScreen = memo(() => {
 const styles = StyleSheet.create({
   container: {
     paddingHorizontal: 16,
-    flex: 1,
   },
   centered: {
     justifyContent: 'center',
@@ -111,7 +112,7 @@ const styles = StyleSheet.create({
   columns: {
     flexDirection: 'row',
     maxWidth: 310,
-    paddingTop: 16,
+    paddingVertical: 16,
   },
   line: {
     width: 151,
@@ -129,8 +130,4 @@ const styles = StyleSheet.create({
     position: 'relative',
     top: 3,
   },
-  buttonContainer: {
-    marginTop: 16,
-    marginHorizontal: 32,
-  },
 });

From df8ff970a51f64123916102fef072e0d491481c5 Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Fri, 15 Mar 2024 23:00:23 +0300
Subject: [PATCH 05/11] fix(mobile): Resolve deeplink on swap screen (#770)

* fix(mobile): Resolve deeplink on swap screen

* fix(mobile): Increase timeout
---
 packages/mobile/android/app/build.gradle      |  2 +-
 .../ios/ton_keeper.xcodeproj/project.pbxproj  |  4 +-
 .../ExchangeMethod/ExchangeMethod.tsx         |  2 +-
 packages/mobile/src/core/Swap/Swap.style.ts   |  2 +-
 packages/mobile/src/core/Swap/Swap.tsx        | 55 +++++++++++++++++--
 5 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index ef0441fb9..8af57145e 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.0.0"
+        versionName "4.1.0"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
     }
diff --git a/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj b/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
index 3742e1b05..9ca3d609f 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.0.0;
+				MARKETING_VERSION = 4.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1328,7 +1328,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/packages/mobile/src/core/ModalContainer/ExchangeMethod/ExchangeMethod.tsx b/packages/mobile/src/core/ModalContainer/ExchangeMethod/ExchangeMethod.tsx
index e12035aa0..064a2651a 100644
--- a/packages/mobile/src/core/ModalContainer/ExchangeMethod/ExchangeMethod.tsx
+++ b/packages/mobile/src/core/ModalContainer/ExchangeMethod/ExchangeMethod.tsx
@@ -41,7 +41,7 @@ export const ExchangeMethod: FC<ExchangeMethodProps> = ({ methodId, onContinue }
 
         openBuyFiat(CryptoCurrencies.Ton, methodId);
       }
-    }, 500);
+    }, 800);
 
     if (isDontShow) {
       ExchangeDB.dontShowDetails(methodId);
diff --git a/packages/mobile/src/core/Swap/Swap.style.ts b/packages/mobile/src/core/Swap/Swap.style.ts
index f173b08d6..69c7bf324 100644
--- a/packages/mobile/src/core/Swap/Swap.style.ts
+++ b/packages/mobile/src/core/Swap/Swap.style.ts
@@ -1,4 +1,4 @@
-import { NavBarHeight, Opacity } from '$shared/constants';
+import { Opacity } from '$shared/constants';
 import styled from '$styled';
 import { hNs, ns } from '$utils';
 import WebView from 'react-native-webview';
diff --git a/packages/mobile/src/core/Swap/Swap.tsx b/packages/mobile/src/core/Swap/Swap.tsx
index 94212c8e6..9c9638461 100644
--- a/packages/mobile/src/core/Swap/Swap.tsx
+++ b/packages/mobile/src/core/Swap/Swap.tsx
@@ -5,13 +5,17 @@ import { getTimeSec } from '$utils/getTimeSec';
 import { useNavigation } from '@tonkeeper/router';
 import * as S from './Swap.style';
 import { Icon } from '$uikit';
-import { getDomainFromURL } from '$utils';
+import { getCorrectUrl, getDomainFromURL } from '$utils';
 import { logEvent } from '@amplitude/analytics-browser';
 import { checkIsTimeSynced } from '$navigation/hooks/useDeeplinkingResolvers';
 import { useWebViewBridge } from '$hooks/jsBridge';
 import { useWallet } from '@tonkeeper/shared/hooks';
 import { config } from '$config';
 import { tk } from '$wallet';
+import { ShouldStartLoadRequest } from 'react-native-webview/lib/WebViewTypes';
+import { Linking } from 'react-native';
+import { useDeeplinking } from '$libs/deeplinking';
+import DeviceInfo from 'react-native-device-info';
 
 interface Props {
   jettonAddress?: string;
@@ -19,11 +23,17 @@ interface Props {
   tt?: string;
 }
 
+const addVersionToUrl = (url: string) => {
+  const startChar = url.includes('?') ? '&' : '?';
+
+  return `${url}${startChar}clientVersion=${DeviceInfo.getVersion()}`;
+};
+
 export const Swap: FC<Props> = (props) => {
   const { jettonAddress } = props;
+  const deeplinking = useDeeplinking();
 
   const baseUrl = config.get('stonfiUrl', tk.wallet.isTestnet);
-
   const url = useMemo(() => {
     const ft = props.ft ?? jettonAddress ?? 'TON';
     const tt = props.tt ?? (jettonAddress ? 'TON' : null);
@@ -37,6 +47,13 @@ export const Swap: FC<Props> = (props) => {
     return path;
   }, [baseUrl, jettonAddress, props.ft, props.tt]);
 
+  const [webViewSource, setWebViewSource] = useState({ uri: addVersionToUrl(url) });
+
+  const openUrl = useCallback(
+    (url: string) => setWebViewSource({ uri: addVersionToUrl(getCorrectUrl(url)) }),
+    [],
+  );
+
   const wallet = useWallet();
 
   const address = wallet?.address.ton.friendly;
@@ -96,6 +113,35 @@ export const Swap: FC<Props> = (props) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  const handleOpenExternalLink = useCallback(
+    (req: ShouldStartLoadRequest): boolean => {
+      const resolver = deeplinking.getResolver(req.url, {
+        params: {
+          openUrl,
+          redirectToActivity: false,
+        },
+      });
+
+      if (resolver) {
+        setTimeout(() => {
+          resolver();
+        }, 200);
+        return false;
+      }
+
+      if (req.url.startsWith('http')) {
+        return true;
+      }
+
+      setTimeout(() => {
+        Linking.openURL(req.url);
+      }, 200);
+
+      return false;
+    },
+    [deeplinking, openUrl],
+  );
+
   return (
     <S.Container>
       <S.Browser
@@ -104,9 +150,7 @@ export const Swap: FC<Props> = (props) => {
         onMessage={onMessage}
         javaScriptEnabled
         domStorageEnabled
-        source={{
-          uri: url,
-        }}
+        source={webViewSource}
         onLoadEnd={handleLoadEnd}
         startInLoadingState={true}
         originWhitelist={[`https://${getDomainFromURL(baseUrl)}`]}
@@ -117,6 +161,7 @@ export const Swap: FC<Props> = (props) => {
         thirdPartyCookiesEnabled={true}
         keyboardDisplayRequiresUserAction={false}
         mediaPlaybackRequiresUserAction={false}
+        onShouldStartLoadWithRequest={handleOpenExternalLink}
       />
       {overlayVisible ? (
         <S.Overlay>

From 2dd9e249fdcdd699fed0755266941fdf94fc8c40 Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Mon, 18 Mar 2024 14:15:56 +0300
Subject: [PATCH 06/11] feature(mobile): Restake banner (#741)

* feature(mobile): Restake banner

* bump(mobile): 4.1.0

* Restake banner fixes

* fix notification for restake

* add more pools for demo

* Restake fixes

* fix state default value

* fix small balances and add collect stake

* fix cooldown period text

* fix(mobile): Bypass stake step

* fix(mobile): Bypass only when WITHDRAWAL_CONFIRM type

* fix(mobile): spacing and cooldown period text

* remove button, fix button display
---
 packages/mobile/index.js                      |  16 +-
 .../RestakeBanner/IconsComposition.tsx        |  36 +++
 .../RestakeBanner/RestakeBanner.tsx           | 266 ++++++++++++++++++
 .../components/RestakeBanner/RestakeStep.tsx  |  67 +++++
 packages/mobile/src/core/DevMenu/DevMenu.tsx  |  44 ++-
 .../src/core/Notifications/Notification.tsx   |  17 +-
 packages/mobile/src/core/Staking/Staking.tsx  |  14 +
 .../src/core/StakingSend/StakingSend.tsx      |  25 +-
 .../navigation/AppStack/AppStack.interface.ts |   1 +
 .../hooks/useDeeplinkingResolvers.ts          |  18 ++
 .../src/store/zustand/notifications/types.ts  |   8 +
 .../src/wallet/managers/StakingManager.ts     |  23 ++
 .../shared/i18n/locales/tonkeeper/en.json     |  13 +
 .../shared/i18n/locales/tonkeeper/ru-RU.json  |  13 +
 .../icons/png/ic-xmark-outline-28@4x.png      | Bin 0 -> 620 bytes
 .../icons/svg/28/ic-xmark-outline-28.svg      |   3 +
 packages/uikit/assets/staking/index.ts        |   1 +
 packages/uikit/assets/staking/ton@4x.png      | Bin 0 -> 8032 bytes
 .../uikit/src/components/Icon/Icon.types.ts   |   3 +
 .../src/components/Icon/IconList.native.ts    |   1 +
 20 files changed, 558 insertions(+), 11 deletions(-)
 create mode 100644 packages/mobile/src/components/RestakeBanner/IconsComposition.tsx
 create mode 100644 packages/mobile/src/components/RestakeBanner/RestakeBanner.tsx
 create mode 100644 packages/mobile/src/components/RestakeBanner/RestakeStep.tsx
 create mode 100644 packages/uikit/assets/icons/png/ic-xmark-outline-28@4x.png
 create mode 100644 packages/uikit/assets/icons/svg/28/ic-xmark-outline-28.svg
 create mode 100644 packages/uikit/assets/staking/ton@4x.png

diff --git a/packages/mobile/index.js b/packages/mobile/index.js
index 6e1dd78cf..6b6d6dad9 100644
--- a/packages/mobile/index.js
+++ b/packages/mobile/index.js
@@ -22,6 +22,7 @@ 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',
@@ -32,15 +33,28 @@ if (__DEV__) {
   getAttachScreenFromStorage();
 }
 
+// TODO: should be address-specified store
 async function handleDappMessage(remoteMessage) {
   // handle data-only messages
   if (remoteMessage.notification?.body) {
     return null;
   }
-  if (!['console_dapp_notification'].includes(remoteMessage.data?.type)) {
+
+  if (
+    !['console_dapp_notification', 'better_stake_option_found', 'collect_stake'].includes(
+      remoteMessage.data?.type,
+    )
+  ) {
     return null;
   }
 
+  if (remoteMessage.data?.type === 'better_stake_option_found') {
+    tk.wallet.staking.toggleRestakeBanner(
+      true,
+      remoteMessage.data.stakingAddressToMigrateFrom,
+    );
+  }
+
   await useNotificationsStore.persist.rehydrate();
   useNotificationsStore.getState().actions.addNotification(
     {
diff --git a/packages/mobile/src/components/RestakeBanner/IconsComposition.tsx b/packages/mobile/src/components/RestakeBanner/IconsComposition.tsx
new file mode 100644
index 000000000..27566add8
--- /dev/null
+++ b/packages/mobile/src/components/RestakeBanner/IconsComposition.tsx
@@ -0,0 +1,36 @@
+import { Steezy, View } from '@tonkeeper/uikit';
+import { Image } from 'react-native';
+import { liquidTfIconSource, tonIconSource } from '@tonkeeper/uikit/assets/staking';
+
+export const IconsComposition = () => {
+  return (
+    <View style={styles.container}>
+      <Image style={styles.image.static} source={tonIconSource} />
+      <View>
+        <View style={styles.border} />
+        <Image style={[styles.image.static]} source={liquidTfIconSource} />
+      </View>
+    </View>
+  );
+};
+
+export const styles = Steezy.create(({ colors }) => ({
+  container: {
+    flexDirection: 'row',
+    gap: -12,
+  },
+  image: {
+    width: 64,
+    height: 64,
+    borderRadius: 32,
+  },
+  border: {
+    position: 'absolute',
+    top: -3,
+    bottom: -3,
+    left: -3,
+    right: -3,
+    backgroundColor: colors.backgroundContent,
+    borderRadius: 35,
+  },
+}));
diff --git a/packages/mobile/src/components/RestakeBanner/RestakeBanner.tsx b/packages/mobile/src/components/RestakeBanner/RestakeBanner.tsx
new file mode 100644
index 000000000..3ab76b3d2
--- /dev/null
+++ b/packages/mobile/src/components/RestakeBanner/RestakeBanner.tsx
@@ -0,0 +1,266 @@
+import React, { memo, useCallback, useEffect, useMemo } from 'react';
+import {
+  Button,
+  Icon,
+  Spacer,
+  Steezy,
+  Text,
+  TouchableOpacity,
+  View,
+} from '@tonkeeper/uikit';
+import { t } from '@tonkeeper/shared/i18n';
+import { replaceString } from '@tonkeeper/shared/utils/replaceString';
+import { PoolImplementationType, PoolInfo } from '@tonkeeper/core/src/TonAPI';
+import { RestakeStep } from './RestakeStep';
+import { usePoolInfo } from '$hooks/usePoolInfo';
+import { AppStackRouteNames } from '$navigation';
+import { StakingTransactionType } from '$core/StakingSend/types';
+import { useNavigation } from '@tonkeeper/router';
+import { formatter } from '@tonkeeper/shared/formatter';
+import { useStakingState } from '@tonkeeper/shared/hooks';
+import { useStakingCycle } from '$hooks/useStakingCycle';
+import { LayoutAnimation } from 'react-native';
+import { tk } from '$wallet';
+import { Address } from '@tonkeeper/core';
+import { IconsComposition } from './IconsComposition';
+import { useFiatValue } from '$hooks/useFiatValue';
+import { CryptoCurrencies } from '$shared/constants';
+import { stakingFormatter } from '$utils/formatter';
+
+export interface ExtendedPoolInfo extends PoolInfo {
+  isWithdrawal: boolean;
+  balance: string | undefined;
+}
+
+export interface RestakeBannerProps {
+  poolsList: ExtendedPoolInfo[];
+  migrateFrom: string;
+}
+
+export enum RestakeSteps {
+  UNSTAKE = 1,
+  WAIT_FOR_WITHDRAWAL = 2,
+  STAKE_INTO_TONSTAKERS = 3,
+  DONE = 4,
+}
+
+export const RestakeBanner = memo<RestakeBannerProps>((props) => {
+  const nav = useNavigation();
+  const tonstakersPool = useMemo(() => {
+    return props.poolsList.find(
+      (pool) => pool.implementation === PoolImplementationType.LiquidTF,
+    ) as ExtendedPoolInfo;
+  }, [props.poolsList]);
+  const { handleTopUpPress } = usePoolInfo(tonstakersPool);
+
+  const handleCloseRestakeBanner = useCallback(() => {
+    LayoutAnimation.easeInEaseOut();
+    tk.wallet.staking.toggleRestakeBanner(false);
+  }, []);
+
+  const poolToWithdrawal = useMemo(
+    () =>
+      props.poolsList.find((pool) => Address.compare(pool.address, props.migrateFrom)),
+    [props.migrateFrom, props.poolsList],
+  );
+  const toWithdrawalStakingInfo = useStakingState(
+    (s) => poolToWithdrawal && s.stakingInfo[poolToWithdrawal.address],
+    [poolToWithdrawal],
+  );
+
+  const bypassStakeStep = useStakingState((s) => s.bypassStakeStep, []);
+
+  const readyWithdraw = useFiatValue(
+    CryptoCurrencies.Ton,
+    stakingFormatter.fromNano(toWithdrawalStakingInfo?.ready_withdraw ?? '0'),
+  );
+
+  const isReadyWithdraw = readyWithdraw.amount !== '0';
+
+  const handleWithdrawal = useCallback(
+    (pool: ExtendedPoolInfo, withdrawAll?: boolean) => () => {
+      nav.push(AppStackRouteNames.StakingSend, {
+        amount: withdrawAll && pool.balance,
+        poolAddress: pool.address,
+        transactionType:
+          pool.implementation === PoolImplementationType.Tf
+            ? StakingTransactionType.WITHDRAWAL_CONFIRM
+            : StakingTransactionType.WITHDRAWAL,
+      });
+    },
+    [nav],
+  );
+
+  const handleCollectWithdrawal = useCallback(
+    (pool: ExtendedPoolInfo) => () => {
+      nav.push(AppStackRouteNames.StakingSend, {
+        poolAddress: pool.address,
+        transactionType: StakingTransactionType.WITHDRAWAL_CONFIRM,
+      });
+    },
+    [nav],
+  );
+
+  const isWaitingForWithdrawal = toWithdrawalStakingInfo?.pending_withdraw;
+  const currentStepId = useMemo(() => {
+    if (tonstakersPool?.balance) {
+      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) {
+      return RestakeSteps.STAKE_INTO_TONSTAKERS;
+    }
+    // If user has pending withdrawal, render step with waiting
+    if (isWaitingForWithdrawal || readyWithdraw.amount !== '0') {
+      return RestakeSteps.WAIT_FOR_WITHDRAWAL;
+    }
+    return RestakeSteps.UNSTAKE;
+  }, [
+    bypassStakeStep,
+    isWaitingForWithdrawal,
+    poolToWithdrawal?.balance,
+    readyWithdraw.amount,
+    tonstakersPool?.balance,
+  ]);
+
+  useEffect(() => {
+    if (currentStepId === RestakeSteps.DONE) {
+      handleCloseRestakeBanner();
+    }
+  }, [currentStepId, handleCloseRestakeBanner]);
+
+  const { formattedDuration, isCooldown } = useStakingCycle(
+    poolToWithdrawal?.cycle_start,
+    poolToWithdrawal?.cycle_end,
+    isWaitingForWithdrawal,
+  );
+
+  const renderFormattedDuration = useCallback(() => {
+    return (
+      <Text type="body1" color="textPrimary" style={{ fontVariant: ['tabular-nums'] }}>
+        {formattedDuration}
+      </Text>
+    );
+  }, [formattedDuration]);
+
+  const waitForWithdrawalText = useMemo(() => {
+    if (currentStepId !== RestakeSteps.WAIT_FOR_WITHDRAWAL) {
+      return t('restake_banner.wait_step');
+    }
+    if (isReadyWithdraw) {
+      return t('restake_banner.wait_step_withdraw');
+    }
+    if (isCooldown) {
+      return t('restake_banner.wait_step_cooldown');
+    }
+    return replaceString(
+      t('restake_banner.wait_step_pending'),
+      '%duration',
+      renderFormattedDuration,
+    );
+  }, [currentStepId, isCooldown, isReadyWithdraw, renderFormattedDuration]);
+
+  return (
+    <View style={styles.container}>
+      <IconsComposition />
+      <TouchableOpacity
+        onPress={handleCloseRestakeBanner}
+        activeOpacity={0.95}
+        style={styles.absoluteCloseButton}
+      >
+        <Icon name={'ic-xmark-outline-28'} color="iconTertiary" />
+      </TouchableOpacity>
+      <Spacer y={20} />
+      <Text type="h3">
+        {replaceString(t('restake_banner.title'), '%apy', () => (
+          <Text type="h3" color="accentBlue">
+            APY {tonstakersPool.apy.toFixed(2)}%
+          </Text>
+        ))}
+      </Text>
+      <Spacer y={12} />
+      <View>
+        <RestakeStep
+          completed={currentStepId > RestakeSteps.UNSTAKE}
+          actions={
+            poolToWithdrawal &&
+            currentStepId === RestakeSteps.UNSTAKE && [
+              <Button
+                color="primary"
+                size="small"
+                onPress={handleWithdrawal(poolToWithdrawal, true)}
+                title={t('restake_banner.unstake_action_all', {
+                  amount: formatter.format(poolToWithdrawal.balance, {
+                    currency: 'TON',
+                  }),
+                })}
+              />,
+              <Button
+                color="tertiary"
+                size="small"
+                onPress={handleWithdrawal(poolToWithdrawal)}
+                title={t('restake_banner.unstake_action_manual')}
+              />,
+            ]
+          }
+          stepId={RestakeSteps.UNSTAKE}
+          text={t('restake_banner.unstake_step')}
+        />
+        <RestakeStep
+          completed={currentStepId > RestakeSteps.WAIT_FOR_WITHDRAWAL}
+          stepId={RestakeSteps.WAIT_FOR_WITHDRAWAL}
+          text={waitForWithdrawalText}
+          actions={
+            currentStepId <= RestakeSteps.WAIT_FOR_WITHDRAWAL &&
+            isReadyWithdraw && [
+              <Button
+                size="small"
+                color={'primary'}
+                onPress={handleCollectWithdrawal(poolToWithdrawal!)}
+                title={t('restake_banner.wait_step_collect')}
+              />,
+            ]
+          }
+        />
+        <RestakeStep
+          completed={currentStepId > RestakeSteps.STAKE_INTO_TONSTAKERS}
+          actionsContainerStyle={styles.lastActionsContainer}
+          stepId={RestakeSteps.STAKE_INTO_TONSTAKERS}
+          actions={[
+            <Button
+              size="small"
+              color={
+                currentStepId === RestakeSteps.STAKE_INTO_TONSTAKERS
+                  ? 'primary'
+                  : 'tertiary'
+              }
+              onPress={handleTopUpPress}
+              title={t('restake_banner.stake_into_tonstakers_action')}
+            />,
+          ]}
+          text={t('restake_banner.stake_into_step')}
+        />
+      </View>
+    </View>
+  );
+});
+
+const styles = Steezy.create(({ colors }) => ({
+  container: {
+    backgroundColor: colors.backgroundContent,
+    borderRadius: 16,
+    padding: 24,
+  },
+  lastActionsContainer: {
+    paddingBottom: 0,
+  },
+  absoluteCloseButton: {
+    position: 'absolute',
+    right: 0,
+    top: 0,
+    width: 76,
+    height: 76,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+}));
diff --git a/packages/mobile/src/components/RestakeBanner/RestakeStep.tsx b/packages/mobile/src/components/RestakeBanner/RestakeStep.tsx
new file mode 100644
index 000000000..f97818b50
--- /dev/null
+++ b/packages/mobile/src/components/RestakeBanner/RestakeStep.tsx
@@ -0,0 +1,67 @@
+import React, { memo, ReactNode } from 'react';
+import { Icon, Steezy, Text, View } from '@tonkeeper/uikit';
+import { StyleProp } from '@bogoslavskiy/react-native-steezy';
+import { ViewStyle } from 'react-native';
+
+export interface RestakeStepProps {
+  text: string | ReactNode;
+  stepId: number;
+  actions?: ReactNode[] | null | undefined | boolean;
+  actionsContainerStyle?: StyleProp<ViewStyle>;
+  completed?: boolean;
+}
+
+export const RestakeStep = memo<RestakeStepProps>((props) => {
+  return (
+    <View style={styles.container}>
+      <View style={styles.digitContainer}>
+        <Text color="textSecondary" type="body1">
+          {props.stepId}.
+        </Text>
+      </View>
+      <View style={styles.flex}>
+        <View style={styles.textWithCheckmark}>
+          <Text style={styles.flex.static} type="body1" color="textPrimary">
+            {props.text}
+          </Text>
+          {props.completed && (
+            <View style={styles.checkmarkContainer}>
+              <Icon name={'ic-donemark-28'} color="accentGreen" />
+            </View>
+          )}
+        </View>
+        {props.actions && (
+          <View style={[styles.actionsContainer, props.actionsContainerStyle]}>
+            {props.actions}
+          </View>
+        )}
+      </View>
+    </View>
+  );
+});
+
+const styles = Steezy.create({
+  container: {
+    paddingVertical: 8,
+    flexDirection: 'row',
+  },
+  digitContainer: {
+    width: 24,
+  },
+  flex: {
+    flex: 1,
+  },
+  actionsContainer: {
+    gap: 8,
+    paddingTop: 12,
+    paddingBottom: 8,
+  },
+  textWithCheckmark: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+  },
+  checkmarkContainer: {
+    paddingLeft: 12,
+  },
+});
diff --git a/packages/mobile/src/core/DevMenu/DevMenu.tsx b/packages/mobile/src/core/DevMenu/DevMenu.tsx
index b0384158e..d1abd6f3e 100644
--- a/packages/mobile/src/core/DevMenu/DevMenu.tsx
+++ b/packages/mobile/src/core/DevMenu/DevMenu.tsx
@@ -1,6 +1,6 @@
 import { useNotificationsStore } from '$store/zustand/notifications/useNotificationsStore';
 import crashlytics from '@react-native-firebase/crashlytics';
-import { DevFeature, useDevFeaturesToggle } from '$store';
+import { DevFeature, NotificationType, useDevFeaturesToggle } from '$store';
 import { List, Screen, copyText } from '@tonkeeper/uikit';
 import { Switch } from 'react-native-gesture-handler';
 import DeviceInfo from 'react-native-device-info';
@@ -46,6 +46,7 @@ export const DevMenu: FC = () => {
   const handlePushNotification = useCallback(() => {
     addNotification(
       {
+        type: NotificationType.CONSOLE_DAPP_NOTIFICATION,
         message: 'Test notification added',
         dapp_url: 'https://getgems.io',
         received_at: Date.now(),
@@ -55,6 +56,24 @@ export const DevMenu: FC = () => {
     );
   }, [addNotification]);
 
+  const handleShowRestakeBanner = useCallback(
+    (address: string, name: string) => () => {
+      addNotification(
+        {
+          type: NotificationType.BETTER_STAKE_OPTION_FOUND,
+          name: 'Tonkeeper',
+          icon_url: 'https://tonkeeper.com/assets/apps/tonkeeper.png',
+          message: `Withdraw from ${name} please 🥺`,
+          received_at: Date.now(),
+          deeplink: 'ton://staking',
+        },
+        tk.wallet.address.ton.raw,
+      );
+      tk.wallet.staking.toggleRestakeBanner(true, address);
+    },
+    [addNotification],
+  );
+
   const {
     devFeatures,
     actions: { toggleFeature },
@@ -177,6 +196,29 @@ export const DevMenu: FC = () => {
           <List.Item onPress={handleCopyFCMToken} title="Copy FCM token" />
           <List.Item onPress={handlePushNotification} title="Push notification" />
         </List>
+        <List>
+          <List.Item
+            onPress={handleShowRestakeBanner(
+              '0:efbc198fdf051c8e85cf6358c77d3e3e7e06f6f788a65581f910774b9c029e7a',
+              'Queue #2',
+            )}
+            title="Show restake banner (queue #2)"
+          />
+          <List.Item
+            onPress={handleShowRestakeBanner(
+              '0:00ff9fdd8b3b80d70e8ea734d262f5e1bd4c184c33535bf3190dd67408629e7a',
+              'Queue #1',
+            )}
+            title="Show restake banner (queue #1)"
+          />
+          <List.Item
+            onPress={handleShowRestakeBanner(
+              '0:98e0ce936589ce327181425aa2fe7c9e6880752de0457c680fe2e5d0d555a16a',
+              'Whales',
+            )}
+            title="Show restake banner (whales)"
+          />
+        </List>
       </Screen.ScrollView>
     </Screen>
   );
diff --git a/packages/mobile/src/core/Notifications/Notification.tsx b/packages/mobile/src/core/Notifications/Notification.tsx
index 1127bbc59..64d33236b 100644
--- a/packages/mobile/src/core/Notifications/Notification.tsx
+++ b/packages/mobile/src/core/Notifications/Notification.tsx
@@ -1,7 +1,7 @@
 import { Icon, List, Spacer, Text, View } from '$uikit';
 import React, { useCallback, useRef } from 'react';
 import { Steezy } from '$styles';
-import { INotification } from '$store/zustand/notifications/types';
+import { INotification, NotificationType } from '$store/zustand/notifications/types';
 import {
   disableNotifications,
   useConnectedAppsList,
@@ -17,6 +17,8 @@ import { TonConnect } from '$tonconnect';
 import { openDAppBrowser } from '$navigation';
 import { Alert, Animated } from 'react-native';
 import { useWallet } from '@tonkeeper/shared/hooks';
+import { useDeeplinking } from '$libs/deeplinking';
+import { tk } from '$wallet';
 
 interface NotificationProps {
   notification: INotification;
@@ -135,12 +137,21 @@ export const Notification: React.FC<NotificationProps> = (props) => {
     },
     [app, handleDelete, handleOpenSettings],
   );
+  const deeplinking = useDeeplinking();
 
   const handleOpenInWebView = useCallback(() => {
-    if (!props.notification.link) {
+    if (props.notification.type === NotificationType.BETTER_STAKE_OPTION_FOUND) {
+      tk.wallet.staking.toggleRestakeBanner(true);
+    }
+
+    if (!props.notification.link && !props.notification.deeplink) {
       return;
     }
 
+    if (props.notification.deeplink) {
+      return deeplinking.resolve(props.notification.deeplink);
+    }
+
     if (
       !props.notification.dapp_url ||
       getDomainFromURL(props.notification.link) ===
@@ -187,7 +198,7 @@ export const Notification: React.FC<NotificationProps> = (props) => {
       >
         <List style={styles.listStyle.static}>
           <List.Item
-            disabled={!props.notification.link}
+            disabled={!props.notification.link && !props.notification.deeplink}
             onPress={handleOpenInWebView}
             pictureStyle={styles.imageStyle.static}
             leftContentStyle={styles.leftContentStyle.static}
diff --git a/packages/mobile/src/core/Staking/Staking.tsx b/packages/mobile/src/core/Staking/Staking.tsx
index dc1a21cf4..47dbd7dff 100644
--- a/packages/mobile/src/core/Staking/Staking.tsx
+++ b/packages/mobile/src/core/Staking/Staking.tsx
@@ -23,6 +23,7 @@ import { Ton } from '$libs/Ton';
 import { useBalancesState, useJettons, useStakingState } from '@tonkeeper/shared/hooks';
 import { StakingManager, StakingProvider } from '$wallet/managers/StakingManager';
 import { config } from '$config';
+import { RestakeBanner } from '../../components/RestakeBanner/RestakeBanner';
 
 interface Props {}
 
@@ -35,6 +36,10 @@ 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 [flashShownCount] = useFlashCount(FlashCountKeys.Staking);
 
@@ -216,6 +221,15 @@ export const Staking: FC<Props> = () => {
           showsVerticalScrollIndicator={false}
         >
           <S.Content bottomInset={bottomInset}>
+            {showRestakeBanner && stakingAddressToMigrateFrom && (
+              <>
+                <RestakeBanner
+                  migrateFrom={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 46bff4162..826b9f396 100644
--- a/packages/mobile/src/core/StakingSend/StakingSend.tsx
+++ b/packages/mobile/src/core/StakingSend/StakingSend.tsx
@@ -37,6 +37,7 @@ import { useCurrencyToSend } from '$hooks/useCurrencyToSend';
 import { SignRawMessage } from '$core/ModalContainer/NFTOperations/TXRequest.types';
 import { useStakingState, useWallet } from '@tonkeeper/shared/hooks';
 import { tk } from '$wallet';
+import { Address } from '@tonkeeper/shared/Address';
 
 interface Props {
   route: RouteProp<AppStackParamList, AppStackRouteNames.StakingSend>;
@@ -57,7 +58,7 @@ const getTitle = (transactionType: StakingTransactionType) => {
 export const StakingSend: FC<Props> = (props) => {
   const {
     route: {
-      params: { poolAddress, transactionType },
+      params: { poolAddress, transactionType, amount: initialAmount },
     },
   } = props;
 
@@ -127,7 +128,7 @@ export const StakingSend: FC<Props> = (props) => {
       ? formatter.format(isWhalesPool ? readyWithdraw : poolInfo.balance.amount, {
           decimals,
         })
-      : '0',
+      : initialAmount ?? '0',
     all: false,
   });
 
@@ -333,19 +334,29 @@ export const StakingSend: FC<Props> = (props) => {
       const privateKey = await vault.getTonPrivateKey();
 
       await actionRef.current.send(privateKey);
+      if (
+        isWithdrawalConfrim &&
+        tk.wallet.staking.state.data.stakingAddressToMigrateFrom &&
+        Address.compare(
+          tk.wallet.staking.state.data.stakingAddressToMigrateFrom,
+          pool.address,
+        )
+      ) {
+        tk.wallet.staking.setBypassStakeStep();
+      }
     } catch (e) {
       throw e;
     } finally {
       setSending(false);
     }
-  }, [isDeposit, pool, totalFee, unlockVault]);
+  }, [isDeposit, isWithdrawalConfrim, pool, totalFee, unlockVault]);
 
   useEffect(() => {
-    if (isWithdrawalConfrim) {
+    if (isWithdrawalConfrim || initialAmount) {
       prepareConfirmSending();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isWithdrawalConfrim]);
+  }, [isWithdrawalConfrim, initialAmount]);
 
   const title = getTitle(transactionType);
 
@@ -367,7 +378,9 @@ export const StakingSend: FC<Props> = (props) => {
         backDisabled={isSending || isPreparing || isWithdrawalConfrim}
         onChangeStep={handleChangeStep}
         initialStepId={
-          isWithdrawalConfrim ? StakingSendSteps.CONFIRM : StakingSendSteps.AMOUNT
+          isWithdrawalConfrim || initialAmount
+            ? StakingSendSteps.CONFIRM
+            : StakingSendSteps.AMOUNT
         }
         useBackHandler
       >
diff --git a/packages/mobile/src/navigation/AppStack/AppStack.interface.ts b/packages/mobile/src/navigation/AppStack/AppStack.interface.ts
index 8d2d7114b..b5155d1bc 100644
--- a/packages/mobile/src/navigation/AppStack/AppStack.interface.ts
+++ b/packages/mobile/src/navigation/AppStack/AppStack.interface.ts
@@ -57,6 +57,7 @@ export type AppStackParamList = {
   [AppStackRouteNames.StakingSend]: {
     poolAddress: string;
     transactionType: StakingTransactionType;
+    amount?: string;
   };
   [AppStackRouteNames.CustomizeWallet]: {
     identifiers?: string[];
diff --git a/packages/mobile/src/navigation/hooks/useDeeplinkingResolvers.ts b/packages/mobile/src/navigation/hooks/useDeeplinkingResolvers.ts
index 5f7cb9c2b..a7854f292 100644
--- a/packages/mobile/src/navigation/hooks/useDeeplinkingResolvers.ts
+++ b/packages/mobile/src/navigation/hooks/useDeeplinkingResolvers.ts
@@ -39,6 +39,7 @@ import { tk } from '$wallet';
 import { config } from '$config';
 import { TokenType } from '$core/Send/Send.interface';
 import { ActionSource } from '$wallet/models/ActivityModel';
+import { StakingTransactionType } from '$core/StakingSend/types';
 
 const getWallet = () => {
   return store.getState().wallet.wallet;
@@ -679,4 +680,21 @@ export function useDeeplinkingResolvers() {
   });
 
   deeplinking.add('/ton-connect/*', tonConnectResolver);
+
+  deeplinking.add('/confirm-withdrawal/:address', ({ params }) => {
+    let address = params.address;
+
+    if (!Address.isValid(address)) {
+      return Toast.fail('transfer_deeplink_address_error');
+    }
+
+    nav.push(AppStackRouteNames.StakingSend, {
+      poolAddress: address,
+      transactionType: StakingTransactionType.WITHDRAWAL_CONFIRM,
+    });
+  });
+
+  deeplinking.add('/staking', () => {
+    nav.push(MainStackRouteNames.Staking);
+  });
 }
diff --git a/packages/mobile/src/store/zustand/notifications/types.ts b/packages/mobile/src/store/zustand/notifications/types.ts
index bd869d0b2..33119a0c3 100644
--- a/packages/mobile/src/store/zustand/notifications/types.ts
+++ b/packages/mobile/src/store/zustand/notifications/types.ts
@@ -1,10 +1,18 @@
+export enum NotificationType {
+  CONSOLE_DAPP_NOTIFICATION = 'console_dapp_notification',
+  BETTER_STAKE_OPTION_FOUND = 'better_stake_option_found',
+  COLLECT_STAKE = 'collect_stake',
+}
+
 export interface INotification {
+  type: NotificationType;
   message: string;
   dapp_url?: string;
   received_at: number;
   icon_url?: string;
   name?: string;
   link?: string;
+  deeplink?: string;
 }
 
 export interface INotificationsState {
diff --git a/packages/mobile/src/wallet/managers/StakingManager.ts b/packages/mobile/src/wallet/managers/StakingManager.ts
index 72af2fef4..ccc7bf097 100644
--- a/packages/mobile/src/wallet/managers/StakingManager.ts
+++ b/packages/mobile/src/wallet/managers/StakingManager.ts
@@ -40,6 +40,9 @@ export type StakingState = {
   stakingJettons: Record<string, JettonMetadata>;
   stakingJettonsUpdatedAt: number;
   stakingBalance: string;
+  showRestakeBanner: boolean;
+  stakingAddressToMigrateFrom?: string;
+  bypassStakeStep?: boolean;
 };
 
 export class StakingManager {
@@ -58,6 +61,8 @@ export class StakingManager {
     providers: [],
     highestApyPool: null,
     stakingBalance: '0',
+    showRestakeBanner: false,
+    bypassStakeStep: false,
   };
 
   static calculatePoolBalance(pool: PoolInfo, stakingInfo: StakingInfo) {
@@ -276,6 +281,24 @@ 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 6d5960cc5..6021cb5ff 100644
--- a/packages/shared/i18n/locales/tonkeeper/en.json
+++ b/packages/shared/i18n/locales/tonkeeper/en.json
@@ -1110,6 +1110,19 @@
     "with_passcode": "Enter Passcode",
     "with_biometry": "Continue with %{type}"
   },
+  "restake_banner": {
+    "title": "Earn more TON with %apy in Tonstakers liquid staking",
+    "unstake_action_all": "Unstake %{amount}",
+    "unstake_action_manual": "Enter manually",
+    "unstake_step": "Unstake TON from your current staking provider.",
+    "wait_step": "Wait until your TON become available.",
+    "wait_step_pending": "Your TON will be available in %duration. After this time you can сollect them.",
+    "stake_into_tonstakers_action": "Stake into Tonstakers",
+    "stake_into_step": "Stake available TON into Tonstakers.",
+    "wait_step_withdraw": "Collect available TON from your previous staking provider.",
+    "wait_step_cooldown": "Your TON will be available soon. You'll be able to collect them shortly.",
+    "wait_step_collect": "Collect"
+  },
   "tokenDetails": {
     "title": "Token Details",
     "tonviewer_button": "View on Tonviewer",
diff --git a/packages/shared/i18n/locales/tonkeeper/ru-RU.json b/packages/shared/i18n/locales/tonkeeper/ru-RU.json
index cae35777e..3a2bbe300 100644
--- a/packages/shared/i18n/locales/tonkeeper/ru-RU.json
+++ b/packages/shared/i18n/locales/tonkeeper/ru-RU.json
@@ -1175,6 +1175,19 @@
     "with_passcode": "Ввести пароль",
     "with_biometry": "Продолжить с %{type}"
   },
+  "restake_banner": {
+    "title": "Зарабатывайте больше TON c %apy в ликвидном стейкинге Tonstakers.",
+    "unstake_action_all": "Вывести %{amount}",
+    "unstake_action_manual": "Ввести вручную",
+    "unstake_step": "Выведите TON из своего текущего стейкинга.",
+    "wait_step": "Дождитесь, пока ваш TON станет доступным.",
+    "wait_step_pending": "Ваш TON будет готов к выводу через %duration.",
+    "stake_into_tonstakers_action": "Внести в Tonstakers",
+    "stake_into_step": "Внесите доступный TON в Tonstakers.",
+    "wait_step_withdraw": "Ваш TON готов к выводу.",
+    "wait_step_cooldown": "Ваш TON совсем скоро будет готов к выводу.",
+    "wait_step_collect": "Вывести"
+  },
   "tokenDetails": {
     "title": "Подробнее о токене",
     "tonviewer_button": "Открыть в Tonviewer",
diff --git a/packages/uikit/assets/icons/png/ic-xmark-outline-28@4x.png b/packages/uikit/assets/icons/png/ic-xmark-outline-28@4x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cf16455ae5a6201d6f6293625f17979e39e09c1
GIT binary patch
literal 620
zcmeAS@N?(olHy`uVBq!ia0vp^1t8491|*L?_~H$u*pj^6T^Rm@;DWu&Co?cGDSEm%
zhE&XXd*^h}AqN4shc9+_RL4FrK3rURlVi`p_f1D$IVl*QJX3Of&ibyoD!lA&d8V=K
zK$B2GgU+ORs&7?mzf9k|r1yKw%4v50b^i9+zgWL`$=dHV$tt<OBlTs&1UJ@ixmVOB
zv$4N?m+}8|)yH0`)ZW|4+}4qQuQ+bfm#XBa8}{vazQ*tQf5~JgSDzkr&-eE>hpA^y
zFL37(ygNO(SAX_3t!Wo}*X`%v5H~cw7nofkc)2uI{iW-ra<?PTPOrQ)-S<2DtnL$n
zozpdvTpp!%iA<~zcJ1)kGt)*{XuUvx#}Vx{sV<K~FDWT~)LJb$v7+}1Q1Y0Uo65Y&
zLV}&obNpN$u^Or>eQXN6S6;IG%zo84?o-ujLi&rEfU-*+Tpm@<7MxfS=+p5d|B-DK
zf4~Xn`jdP4_GrGZz4vsp!I}Q{@Ju%wr7CTpRdHO$l#{X_E#C6<QVahw(Ff|?FP_z^
zy11klKbn~=aM8K5;#q`C&dL;<Vjrb#0m}0%%>=VoNuHn6++n(<BmJD~kx5a<jGwC{
zamsx>v$NBpJ>ABbS#WuW!1*&yM`R{GnmMy$hEkG^v9#d(PMPy(JdR|S+|!@3cH1<s
z@87w3h0mWkomM{W7>Jp_;LFn~f1MT|l~!?!`CGS8@iFg_X{Y!9Zr$|q=cKQKZ@2xm
n_VmA3yfo_9AJj+%@dE!agy|^VKjO~+9>n!@^>bP0l+XkKLUs__

literal 0
HcmV?d00001

diff --git a/packages/uikit/assets/icons/svg/28/ic-xmark-outline-28.svg b/packages/uikit/assets/icons/svg/28/ic-xmark-outline-28.svg
new file mode 100644
index 000000000..330e2dfa7
--- /dev/null
+++ b/packages/uikit/assets/icons/svg/28/ic-xmark-outline-28.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M20.7071 8.70711C21.0976 8.31658 21.0976 7.68342 20.7071 7.29289C20.3166 6.90237 19.6834 6.90237 19.2929 7.29289L14 12.5858L8.70711 7.29289C8.31658 6.90237 7.68342 6.90237 7.29289 7.29289C6.90237 7.68342 6.90237 8.31658 7.29289 8.70711L12.5858 14L7.29289 19.2929C6.90237 19.6834 6.90237 20.3166 7.29289 20.7071C7.68342 21.0976 8.31658 21.0976 8.70711 20.7071L14 15.4142L19.2929 20.7071C19.6834 21.0976 20.3166 21.0976 20.7071 20.7071C21.0976 20.3166 21.0976 19.6834 20.7071 19.2929L15.4142 14L20.7071 8.70711Z" fill="white"/>
+</svg>
diff --git a/packages/uikit/assets/staking/index.ts b/packages/uikit/assets/staking/index.ts
index 0ec36bdef..a4fce7183 100644
--- a/packages/uikit/assets/staking/index.ts
+++ b/packages/uikit/assets/staking/index.ts
@@ -3,6 +3,7 @@ import { ImageRequireSource } from 'react-native';
 export const whalesIconSource = require('./whales.png') as ImageRequireSource;
 export const tfIconSource = require('./tf.png') as ImageRequireSource;
 export const liquidTfIconSource = require('./tonstakers.png') as ImageRequireSource;
+export const tonIconSource = require('./ton.png') as ImageRequireSource;
 
 export const tkPoolIconSource = require('./tk-pool.png') as ImageRequireSource;
 export const epnIconSource = require('./epn_1.png') as ImageRequireSource;
diff --git a/packages/uikit/assets/staking/ton@4x.png b/packages/uikit/assets/staking/ton@4x.png
new file mode 100644
index 0000000000000000000000000000000000000000..32266324db899212c1c88133d848c0b173bc38ea
GIT binary patch
literal 8032
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
SR+I~IKu6P1qvEc8#Qy;NV>JH&

literal 0
HcmV?d00001

diff --git a/packages/uikit/src/components/Icon/Icon.types.ts b/packages/uikit/src/components/Icon/Icon.types.ts
index 5a49a50be..dc24385ab 100644
--- a/packages/uikit/src/components/Icon/Icon.types.ts
+++ b/packages/uikit/src/components/Icon/Icon.types.ts
@@ -119,6 +119,7 @@ export type IconNames =
   | 'ic-wallet-28'
   | 'ic-warning-28'
   | 'ic-xmark-28'
+  | 'ic-xmark-outline-28'
   | 'ic-checkmark-circle-32'
   | 'ic-exclamationmark-circle-32'
   | 'ic-delete-36'
@@ -264,6 +265,7 @@ export const AllIcons = [
   'ic-wallet-28',
   'ic-warning-28',
   'ic-xmark-28',
+  'ic-xmark-outline-28',
   'ic-checkmark-circle-32',
   'ic-exclamationmark-circle-32',
   'ic-delete-36',
@@ -410,6 +412,7 @@ export const IconSizes = {
   'ic-wallet-28': 28,
   'ic-warning-28': 28,
   'ic-xmark-28': 28,
+  'ic-xmark-outline-28': 28,
   'ic-checkmark-circle-32': 32,
   'ic-exclamationmark-circle-32': 32,
   'ic-delete-36': 36,
diff --git a/packages/uikit/src/components/Icon/IconList.native.ts b/packages/uikit/src/components/Icon/IconList.native.ts
index 7cdc04444..54c933e42 100644
--- a/packages/uikit/src/components/Icon/IconList.native.ts
+++ b/packages/uikit/src/components/Icon/IconList.native.ts
@@ -119,6 +119,7 @@ export const IconList = {
   'ic-wallet-28': require('../../../assets/icons/png/ic-wallet-28.png'),
   'ic-warning-28': require('../../../assets/icons/png/ic-warning-28.png'),
   'ic-xmark-28': require('../../../assets/icons/png/ic-xmark-28.png'),
+  'ic-xmark-outline-28': require('../../../assets/icons/png/ic-xmark-outline-28.png'),
   'ic-checkmark-circle-32': require('../../../assets/icons/png/ic-checkmark-circle-32.png'),
   'ic-exclamationmark-circle-32': require('../../../assets/icons/png/ic-exclamationmark-circle-32.png'),
   'ic-delete-36': require('../../../assets/icons/png/ic-delete-36.png'),

From 0d842f37d7c7a559e0312d84740fcd1cb5f52e71 Mon Sep 17 00:00:00 2001
From: Andrey Sorokin <sorokin0andrey@gmail.com>
Date: Mon, 18 Mar 2024 14:51:13 +0000
Subject: [PATCH 07/11] feature(mobile): webview debugging (#771)

---
 packages/mobile/src/config/index.ts              |  2 ++
 packages/mobile/src/core/BuyFiat/BuyFiat.tsx     |  1 +
 .../mobile/src/core/DAppBrowser/DAppBrowser.tsx  |  2 ++
 packages/mobile/src/core/DevMenu/DevMenu.tsx     | 16 +++++++++-------
 packages/mobile/src/core/Swap/Swap.tsx           |  1 +
 packages/mobile/src/core/WebView/WebView.tsx     |  8 +++++---
 .../screens/HoldersWebView/HoldersWebView.tsx    |  1 +
 .../src/store/zustand/devFeaturesToggle/types.ts |  1 -
 .../devFeaturesToggle/useDevFeaturesToggle.ts    |  1 -
 packages/shared/modals/AddWalletModal.tsx        |  3 ++-
 10 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/mobile/src/config/index.ts b/packages/mobile/src/config/index.ts
index 7a9ef04e8..1af3a7a0f 100644
--- a/packages/mobile/src/config/index.ts
+++ b/packages/mobile/src/config/index.ts
@@ -57,6 +57,7 @@ export type AppConfigVars = {
   disable_tonstakers: boolean;
   disable_holders_cards: boolean;
   exclude_jetton_chart_periods: boolean;
+  devmode_enabled: boolean;
 };
 
 const defaultConfig: Partial<AppConfigVars> = {
@@ -89,6 +90,7 @@ const defaultConfig: Partial<AppConfigVars> = {
   disable_tonstakers: false,
   disable_holders_cards: true,
   exclude_jetton_chart_periods: true,
+  devmode_enabled: false,
 };
 
 export const config = new AppConfig<AppConfigVars>({
diff --git a/packages/mobile/src/core/BuyFiat/BuyFiat.tsx b/packages/mobile/src/core/BuyFiat/BuyFiat.tsx
index 6ae29f80c..a12a0182c 100644
--- a/packages/mobile/src/core/BuyFiat/BuyFiat.tsx
+++ b/packages/mobile/src/core/BuyFiat/BuyFiat.tsx
@@ -168,6 +168,7 @@ export const BuyFiat: FC<BuyFiatProps> = ({ route }) => {
         allowsFullscreenVideo
         keyboardDisplayRequiresUserAction={false}
         mediaPlaybackRequiresUserAction={false}
+        webviewDebuggingEnabled={config.get('devmode_enabled')}
       />
       {isLoading && (
         <S.LoaderWrap>
diff --git a/packages/mobile/src/core/DAppBrowser/DAppBrowser.tsx b/packages/mobile/src/core/DAppBrowser/DAppBrowser.tsx
index 62c0f64b9..53093a6c5 100644
--- a/packages/mobile/src/core/DAppBrowser/DAppBrowser.tsx
+++ b/packages/mobile/src/core/DAppBrowser/DAppBrowser.tsx
@@ -15,6 +15,7 @@ import { useAppInfo } from './hooks/useAppInfo';
 import { useDAppBridge } from './hooks/useDAppBridge';
 import { useWallet } from '@tonkeeper/shared/hooks';
 import { Address } from '@tonkeeper/shared/Address';
+import { config } from '$config';
 
 export interface DAppBrowserProps {
   url: string;
@@ -178,6 +179,7 @@ const DAppBrowserComponent: FC<DAppBrowserProps> = (props) => {
           allowsBackForwardNavigationGestures={true}
           onNavigationStateChange={handleNavigationStateChange}
           onShouldStartLoadWithRequest={handleOpenExternalLink}
+          webviewDebuggingEnabled={config.get('devmode_enabled')}
           {...webViewProps}
         />
         <S.LoadingBar style={loadingBarAnimatedStyle} />
diff --git a/packages/mobile/src/core/DevMenu/DevMenu.tsx b/packages/mobile/src/core/DevMenu/DevMenu.tsx
index d1abd6f3e..b90cfb7d1 100644
--- a/packages/mobile/src/core/DevMenu/DevMenu.tsx
+++ b/packages/mobile/src/core/DevMenu/DevMenu.tsx
@@ -7,7 +7,7 @@ import DeviceInfo from 'react-native-device-info';
 import { useNavigation } from '@tonkeeper/router';
 import { config } from '$config';
 import RNRestart from 'react-native-restart';
-import { FC, useCallback } from 'react';
+import { FC, useCallback, useState } from 'react';
 import { openLogs } from '$navigation';
 import Clipboard from '@react-native-community/clipboard';
 import { tk } from '$wallet';
@@ -17,6 +17,10 @@ export const DevMenu: FC = () => {
   const nav = useNavigation();
   const addNotification = useNotificationsStore((state) => state.actions.addNotification);
 
+  const [_, rerender] = useState(0);
+
+  const handleSave = useCallback(() => rerender((c) => c + 1), []);
+
   const handleLogs = useCallback(() => {
     openLogs();
   }, []);
@@ -91,8 +95,9 @@ export const DevMenu: FC = () => {
   }, [toggleFeature]);
 
   const toggleDevMode = useCallback(() => {
-    toggleFeature(DevFeature.ShowTestnet);
-  }, [toggleFeature]);
+    config.set({ devmode_enabled: !config.get('devmode_enabled') });
+    handleSave();
+  }, [handleSave]);
 
   const handleClearActivityCache = useCallback(() => {
     if (tk.wallet) {
@@ -113,10 +118,7 @@ export const DevMenu: FC = () => {
           <List.Item
             title="Dev mode"
             rightContent={
-              <Switch
-                value={devFeatures[DevFeature.ShowTestnet]}
-                onChange={toggleDevMode}
-              />
+              <Switch value={config.get('devmode_enabled')} onChange={toggleDevMode} />
             }
           />
           <List.Item
diff --git a/packages/mobile/src/core/Swap/Swap.tsx b/packages/mobile/src/core/Swap/Swap.tsx
index 9c9638461..98e41487b 100644
--- a/packages/mobile/src/core/Swap/Swap.tsx
+++ b/packages/mobile/src/core/Swap/Swap.tsx
@@ -162,6 +162,7 @@ export const Swap: FC<Props> = (props) => {
         keyboardDisplayRequiresUserAction={false}
         mediaPlaybackRequiresUserAction={false}
         onShouldStartLoadWithRequest={handleOpenExternalLink}
+        webviewDebuggingEnabled={config.get('devmode_enabled')}
       />
       {overlayVisible ? (
         <S.Overlay>
diff --git a/packages/mobile/src/core/WebView/WebView.tsx b/packages/mobile/src/core/WebView/WebView.tsx
index 9abe4ec76..81cb25fb5 100644
--- a/packages/mobile/src/core/WebView/WebView.tsx
+++ b/packages/mobile/src/core/WebView/WebView.tsx
@@ -7,6 +7,7 @@ import { useTheme } from '$hooks/useTheme';
 import { deviceWidth, isAndroid } from '$utils';
 import { WebViewProps } from './WebView.interface';
 import { useDeeplinking } from '$libs/deeplinking';
+import { config } from '$config';
 
 export const WebView: FC<WebViewProps> = ({ route }) => {
   const webviewRef = useRef<WebviewComponent>(null);
@@ -39,7 +40,7 @@ export const WebView: FC<WebViewProps> = ({ route }) => {
       setLoading(false);
     }, 500);
   }, []);
-  
+
   const handleOpenExternalLink = useCallback((req) => {
     const isHTTPS =
       !req.url.startsWith('https://app.tonkeeper.com') &&
@@ -49,8 +50,8 @@ export const WebView: FC<WebViewProps> = ({ route }) => {
       return true;
     } else {
       console.log(req.url);
-      deeplinking.resolve(req.url, { 
-        params: { withGoBack: false } 
+      deeplinking.resolve(req.url, {
+        params: { withGoBack: false },
       });
 
       return false;
@@ -104,6 +105,7 @@ export const WebView: FC<WebViewProps> = ({ route }) => {
           allowsFullscreenVideo
           keyboardDisplayRequiresUserAction={false}
           mediaPlaybackRequiresUserAction={false}
+          webviewDebuggingEnabled={config.get('devmode_enabled')}
         />
       </S.Wrap>
     </>
diff --git a/packages/mobile/src/screens/HoldersWebView/HoldersWebView.tsx b/packages/mobile/src/screens/HoldersWebView/HoldersWebView.tsx
index 4a52e31e2..747da00ce 100644
--- a/packages/mobile/src/screens/HoldersWebView/HoldersWebView.tsx
+++ b/packages/mobile/src/screens/HoldersWebView/HoldersWebView.tsx
@@ -251,6 +251,7 @@ export const HoldersWebView = memo<HoldersWebViewProps>((props) => {
         mediaPlaybackRequiresUserAction={false}
         contentInset={{ top: 0, bottom: 0 }}
         style={styles.webView.static}
+        webviewDebuggingEnabled={config.get('devmode_enabled')}
       />
       {mainButton && mainButton.isVisible && (
         <KeyboardAvoidingView
diff --git a/packages/mobile/src/store/zustand/devFeaturesToggle/types.ts b/packages/mobile/src/store/zustand/devFeaturesToggle/types.ts
index 5c54207af..0d5ddae0e 100644
--- a/packages/mobile/src/store/zustand/devFeaturesToggle/types.ts
+++ b/packages/mobile/src/store/zustand/devFeaturesToggle/types.ts
@@ -1,6 +1,5 @@
 export enum DevFeature {
   UseHttpProtocol = 'UseHttpProtocol',
-  ShowTestnet = 'ShowTestnet',
 }
 
 export interface IDevFeaturesToggleStore {
diff --git a/packages/mobile/src/store/zustand/devFeaturesToggle/useDevFeaturesToggle.ts b/packages/mobile/src/store/zustand/devFeaturesToggle/useDevFeaturesToggle.ts
index 85a2d46ec..0d2a84c28 100644
--- a/packages/mobile/src/store/zustand/devFeaturesToggle/useDevFeaturesToggle.ts
+++ b/packages/mobile/src/store/zustand/devFeaturesToggle/useDevFeaturesToggle.ts
@@ -8,7 +8,6 @@ import RNRestart from 'react-native-restart';
 const initialState: Omit<IDevFeaturesToggleStore, 'actions'> = {
   devFeatures: {
     [DevFeature.UseHttpProtocol]: false,
-    [DevFeature.ShowTestnet]: false,
   },
   devLanguage: null,
 };
diff --git a/packages/shared/modals/AddWalletModal.tsx b/packages/shared/modals/AddWalletModal.tsx
index 52009a2f7..e1702b490 100644
--- a/packages/shared/modals/AddWalletModal.tsx
+++ b/packages/shared/modals/AddWalletModal.tsx
@@ -15,6 +15,7 @@ import { DevFeature, useDevFeaturesToggle } from '@tonkeeper/mobile/src/store';
 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';
 
 interface AddWalletModalProps {
   isTonConnect?: boolean;
@@ -114,7 +115,7 @@ export const AddWalletModal = memo<AddWalletModalProps>(({ isTonConnect }) => {
               />
             </List>
           ) : null}
-          {devFeatures[DevFeature.ShowTestnet] ? (
+          {config.get('devmode_enabled') ? (
             <List>
               <List.Item
                 onPress={() => {

From 3e575a0664a97df2a8d1bd1d2adc647a8ef3146d Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Mon, 18 Mar 2024 18:08:19 +0300
Subject: [PATCH 08/11] fix(mobile): Show addresses with DNS in suggested
 addresses cell (#772)

* fix(mobile): Show addresses with DNS in suggested addresses cell

* remove console.log
---
 packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj       | 2 +-
 packages/mobile/src/core/Send/hooks/useSuggestedAddresses.ts   | 1 +
 .../mobile/src/core/Send/steps/AddressStep/AddressStep.tsx     | 1 +
 .../components/AddressSuggestCell/AddressSuggestCell.tsx       | 3 ++-
 .../AddressStep/components/AddressSuggests/AddressSuggests.tsx | 2 ++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj b/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
index 9ca3d609f..5bffe413f 100644
--- a/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
+++ b/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
@@ -1052,7 +1052,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$SRCROOT/$PROJECT_NAME/Resources/Generated/R.generated.swift",
+				$SRCROOT/$PROJECT_NAME/Resources/Generated/R.generated.swift,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
diff --git a/packages/mobile/src/core/Send/hooks/useSuggestedAddresses.ts b/packages/mobile/src/core/Send/hooks/useSuggestedAddresses.ts
index 994787236..c85a631b2 100644
--- a/packages/mobile/src/core/Send/hooks/useSuggestedAddresses.ts
+++ b/packages/mobile/src/core/Send/hooks/useSuggestedAddresses.ts
@@ -63,6 +63,7 @@ export const useSuggestedAddresses = () => {
           Address.compare(walletAddress, recipientAddress) ||
           payload.sender?.is_scam ||
           payload.recipient?.is_scam ||
+          !payload.recipient?.name ||
           !payload.recipient?.is_wallet
         ) {
           return false;
diff --git a/packages/mobile/src/core/Send/steps/AddressStep/AddressStep.tsx b/packages/mobile/src/core/Send/steps/AddressStep/AddressStep.tsx
index c1d521c0a..770caa4e4 100644
--- a/packages/mobile/src/core/Send/steps/AddressStep/AddressStep.tsx
+++ b/packages/mobile/src/core/Send/steps/AddressStep/AddressStep.tsx
@@ -304,6 +304,7 @@ const AddressStepComponent: FC<AddressStepProps> = (props) => {
           {suggestedAddresses.length > 0 ? (
             <FormItem title={suggestsLabel}>
               <AddressSuggests
+                cellsDisabled={!!recipient}
                 scrollY={scrollY}
                 addresses={suggestedAddresses}
                 onPressSuggest={handlePressSuggest}
diff --git a/packages/mobile/src/core/Send/steps/AddressStep/components/AddressSuggestCell/AddressSuggestCell.tsx b/packages/mobile/src/core/Send/steps/AddressStep/components/AddressSuggestCell/AddressSuggestCell.tsx
index df20fce09..a4fb2e0e2 100644
--- a/packages/mobile/src/core/Send/steps/AddressStep/components/AddressSuggestCell/AddressSuggestCell.tsx
+++ b/packages/mobile/src/core/Send/steps/AddressStep/components/AddressSuggestCell/AddressSuggestCell.tsx
@@ -33,6 +33,7 @@ interface Props {
   scrollY: Animated.SharedValue<number>;
   suggest: SuggestedAddress;
   onPress?: (suggest: SuggestedAddress) => void;
+  disabled?: boolean;
 }
 
 const AddressSuggestCellComponent: FC<Props> = (props) => {
@@ -147,7 +148,7 @@ const AddressSuggestCellComponent: FC<Props> = (props) => {
 
   return (
     <>
-      <S.Cell onPress={handlePress} isDisabled={!onPress}>
+      <S.Cell onPress={handlePress} isDisabled={props.disabled || !onPress}>
         <S.Container>
           <S.Content>
             <S.TitleContainer>
diff --git a/packages/mobile/src/core/Send/steps/AddressStep/components/AddressSuggests/AddressSuggests.tsx b/packages/mobile/src/core/Send/steps/AddressStep/components/AddressSuggests/AddressSuggests.tsx
index b1703c6d2..6f958ed3d 100644
--- a/packages/mobile/src/core/Send/steps/AddressStep/components/AddressSuggests/AddressSuggests.tsx
+++ b/packages/mobile/src/core/Send/steps/AddressStep/components/AddressSuggests/AddressSuggests.tsx
@@ -26,6 +26,7 @@ interface Props {
   scrollY: Animated.SharedValue<number>;
   addresses: SuggestedAddress[];
   onPressSuggest: (suggest: SuggestedAddress) => void;
+  cellsDisabled?: boolean;
 }
 
 const AddressSuggestsComponent: FC<Props> = (props) => {
@@ -41,6 +42,7 @@ const AddressSuggestsComponent: FC<Props> = (props) => {
           layout={SequencedTransition.duration(250)}
         >
           <AddressSuggestCell
+            disabled={props.cellsDisabled}
             separator={index < addresses.length - 1}
             scrollY={scrollY}
             suggest={item}

From ffe3f642de3dbaae1dbadc764f60f18f425c9bc6 Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Tue, 19 Mar 2024 17:03:16 +0300
Subject: [PATCH 09/11] fix(mobile): render chart if we have at least 5 points
 (#773)

---
 packages/mobile/package.json                              | 2 +-
 packages/mobile/src/shared/components/Chart/new/Chart.tsx | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index 12a1d2723..094fe39a9 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -32,7 +32,7 @@
     "@craftzdog/react-native-buffer": "^6.0.5",
     "@expo/react-native-action-sheet": "^4.0.1",
     "@gorhom/bottom-sheet": "^4.6.0",
-    "@rainbow-me/animated-charts": "https://github.com/tonkeeper/react-native-animated-charts#65f723604f3abc8a05ecfa2918fe9b0b42fd8363",
+    "@rainbow-me/animated-charts": "https://github.com/tonkeeper/react-native-animated-charts#737b1633c41e13da437c8e111c4aedd15bd10558",
     "@react-native-async-storage/async-storage": "^1.15.5",
     "@react-native-community/clipboard": "^1.5.1",
     "@react-native-community/netinfo": "^9.3.2",
diff --git a/packages/mobile/src/shared/components/Chart/new/Chart.tsx b/packages/mobile/src/shared/components/Chart/new/Chart.tsx
index a09543e03..7491c51b2 100644
--- a/packages/mobile/src/shared/components/Chart/new/Chart.tsx
+++ b/packages/mobile/src/shared/components/Chart/new/Chart.tsx
@@ -45,7 +45,11 @@ const ChartComponent: React.FC<ChartProps> = (props) => {
   });
 
   const points = useMemo(
-    () => (data?.points ? data.points.map(([x, y]) => ({ x, y })).reverse() : []),
+    () =>
+      // We need to have at least 5 points to render the chart properly
+      data?.points && data?.points.length > 4
+        ? data.points.map(([x, y]) => ({ x, y })).reverse()
+        : [],
     [data],
   );
 

From e5e586abf033169d1b06c5103dab247b20cc09ad Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Tue, 19 Mar 2024 20:10:45 +0300
Subject: [PATCH 10/11] fix(mobile): Extend Swap DApp originWhitelist (#775)

* fix(mobile): Extend Swap DApp originWhitelist

* fix(mobile): Remove DevMenu restake banner toggles
---
 packages/mobile/src/core/DevMenu/DevMenu.tsx | 23 --------------------
 packages/mobile/src/core/Swap/Swap.tsx       |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/packages/mobile/src/core/DevMenu/DevMenu.tsx b/packages/mobile/src/core/DevMenu/DevMenu.tsx
index b90cfb7d1..c1b6e5fcc 100644
--- a/packages/mobile/src/core/DevMenu/DevMenu.tsx
+++ b/packages/mobile/src/core/DevMenu/DevMenu.tsx
@@ -198,29 +198,6 @@ export const DevMenu: FC = () => {
           <List.Item onPress={handleCopyFCMToken} title="Copy FCM token" />
           <List.Item onPress={handlePushNotification} title="Push notification" />
         </List>
-        <List>
-          <List.Item
-            onPress={handleShowRestakeBanner(
-              '0:efbc198fdf051c8e85cf6358c77d3e3e7e06f6f788a65581f910774b9c029e7a',
-              'Queue #2',
-            )}
-            title="Show restake banner (queue #2)"
-          />
-          <List.Item
-            onPress={handleShowRestakeBanner(
-              '0:00ff9fdd8b3b80d70e8ea734d262f5e1bd4c184c33535bf3190dd67408629e7a',
-              'Queue #1',
-            )}
-            title="Show restake banner (queue #1)"
-          />
-          <List.Item
-            onPress={handleShowRestakeBanner(
-              '0:98e0ce936589ce327181425aa2fe7c9e6880752de0457c680fe2e5d0d555a16a',
-              'Whales',
-            )}
-            title="Show restake banner (whales)"
-          />
-        </List>
       </Screen.ScrollView>
     </Screen>
   );
diff --git a/packages/mobile/src/core/Swap/Swap.tsx b/packages/mobile/src/core/Swap/Swap.tsx
index 98e41487b..4e33e66a2 100644
--- a/packages/mobile/src/core/Swap/Swap.tsx
+++ b/packages/mobile/src/core/Swap/Swap.tsx
@@ -153,7 +153,7 @@ export const Swap: FC<Props> = (props) => {
         source={webViewSource}
         onLoadEnd={handleLoadEnd}
         startInLoadingState={true}
-        originWhitelist={[`https://${getDomainFromURL(baseUrl)}`]}
+        originWhitelist={[`https://${getDomainFromURL(baseUrl)}`, 'ton://']}
         decelerationRate="normal"
         javaScriptCanOpenWindowsAutomatically
         mixedContentMode="always"

From 4e23543925c129c79bf493855bdfacb9e066c9da Mon Sep 17 00:00:00 2001
From: Max Voloshinskii <me@voloshinskii.ru>
Date: Wed, 20 Mar 2024 14:27:31 +0300
Subject: [PATCH 11/11] Hotfixes from main (#776)

* add tonApiV2Key (#340)

* Bump(mobile): 3.1 (313)

* hotfix: bounce pool address (#361)

* fix(android): crash

* fix: build google play release without sensitive module

* bump(mobile): 3.3.1 351

* fix: script

* feat(mobile): renew all domains

* bump(mobile): 3.3.2 361

* fix(mobile): renew all domains

* bump(mobile): 3.3.2 362

* chore(mobile): remove console.log

* fix(mobile): add delay

* bump(mobile): 3.3.2 363

* fix(mobile): send pack messages

* fix(mobile): some fixes for renew all domains

* bump(mobile): 3.3.2 364

* fix(mobile): translactions

* fix(mobile): add renew alert for collectibles tab

* fix(mobile): some fixes

* bump(mobile): 3.3.2 365

* fix(mobile): some fixes

* bump(mobile): 3.3.2 366

* fix(mobile): translations

* fix(mobile): translations

* bump(mobile): 3.3.2 367

* fix(mobile): disable refresh browser when catch error

* bump(mobile): 3.3.3 369

* fix(mobile): fixes after merge

* Merge branch 'main' into release/3.4.1

* merge fixes

* fix(mobile): fix migration using biometry (#762)

* fix(mobile): fix migration using biometry

* bump(mobile): 4.0.1

* hotfix(mobile): race condition fix (#764)

* fix(mobile): fix migration using biometry

* bump(mobile): 4.0.1

* fix(mobile): Move isMigrated flag to separated storage to avoid race condition

* fix(mobile): add setAsync method

* add persist options for migrationStore

* fix(mobile): fix seed phrase on small displays

---------

Co-authored-by: Andrey Sorokin <sorokin0andrey@gmail.com>

* fix Android whitelist

---------

Co-authored-by: Andrey Sorokin <sorokin0andrey@gmail.com>
Co-authored-by: bogoslavskiy <luice96@yahoo.com>
---
 packages/@core-js/src/utils/State.ts          |   9 +++
 packages/mobile/package.json                  |   8 +--
 .../src/assets/icons/png/ic-globe-28@4x.png   | Bin 0 -> 2987 bytes
 .../src/assets/icons/svg/28/ic-globe-28.svg   |   5 ++
 packages/mobile/src/core/Swap/Swap.tsx        |   2 +-
 packages/mobile/src/hooks/useMigration.ts     |   6 +-
 .../src/navigation/MainStack/MainStack.tsx    |   2 +-
 packages/mobile/src/navigation/ModalStack.tsx |   1 +
 .../mobile/src/store/zustand/domains/types.ts |  41 ++++++------
 .../mobile/src/uikit/Icon/IconsMobileList.ts  |   1 +
 .../mobile/src/uikit/Icon/generated.types.ts  |   3 +
 packages/mobile/src/uikit/List/ListItem.tsx   |   6 +-
 .../mobile/src/uikit/TransitionOpacity.tsx    |  59 ++++++++++--------
 packages/mobile/src/wallet/Tonkeeper.ts       |  45 +++++++++----
 yarn.lock                                     |   8 +--
 15 files changed, 121 insertions(+), 75 deletions(-)
 create mode 100644 packages/mobile/src/assets/icons/png/ic-globe-28@4x.png
 create mode 100644 packages/mobile/src/assets/icons/svg/28/ic-globe-28.svg

diff --git a/packages/@core-js/src/utils/State.ts b/packages/@core-js/src/utils/State.ts
index b0c43ef23..a1a40c589 100644
--- a/packages/@core-js/src/utils/State.ts
+++ b/packages/@core-js/src/utils/State.ts
@@ -98,6 +98,15 @@ export class State<TData extends DefaultStateData> {
     this.storeIfNeeded();
   };
 
+  public setAsync = async (
+    updater: Partial<TData> | ((data: TData) => Partial<TData>),
+  ) => {
+    const newData = typeof updater === 'function' ? updater(this.data) : updater;
+    this.data = { ...this.data, ...newData };
+    this.emit();
+    await this.storeIfNeeded();
+  };
+
   private emit() {
     this.subscribers.forEach((subscriber) => subscriber(this.data));
   }
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index 094fe39a9..3c24d549c 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -36,10 +36,10 @@
     "@react-native-async-storage/async-storage": "^1.15.5",
     "@react-native-community/clipboard": "^1.5.1",
     "@react-native-community/netinfo": "^9.3.2",
-    "@react-native-firebase/analytics": "^18.5.0",
-    "@react-native-firebase/app": "^18.5.0",
-    "@react-native-firebase/crashlytics": "^18.5.0",
-    "@react-native-firebase/messaging": "^18.5.0",
+    "@react-native-firebase/analytics": "18.5.0",
+    "@react-native-firebase/app": "18.5.0",
+    "@react-native-firebase/crashlytics": "18.5.0",
+    "@react-native-firebase/messaging": "18.5.0",
     "@reduxjs/toolkit": "^1.6.1",
     "@shopify/flash-list": "^1.5.0",
     "@ton/core": "^0.53.0",
diff --git a/packages/mobile/src/assets/icons/png/ic-globe-28@4x.png b/packages/mobile/src/assets/icons/png/ic-globe-28@4x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b96ef40a450df70153fa5941383587dfe27e9fcb
GIT binary patch
literal 2987
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

literal 0
HcmV?d00001

diff --git a/packages/mobile/src/assets/icons/svg/28/ic-globe-28.svg b/packages/mobile/src/assets/icons/svg/28/ic-globe-28.svg
new file mode 100644
index 000000000..49eba3b39
--- /dev/null
+++ b/packages/mobile/src/assets/icons/svg/28/ic-globe-28.svg
@@ -0,0 +1,5 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.9429 20.9214C16.4787 21.2508 15.9883 21.4155 15.4717 21.4155C14.8802 21.4155 14.431 21.262 14.124 20.9551C13.8245 20.6481 13.6149 20.2588 13.4951 19.7871C13.3828 19.3079 13.3192 18.81 13.3042 18.2934C13.2967 17.7768 13.293 17.3089 13.293 16.8896C13.293 16.3506 13.1021 15.9088 12.7202 15.5644C12.3459 15.2125 11.8667 15.0366 11.2827 15.0366C10.3319 15.0366 9.5944 14.7783 9.07031 14.2617C8.54622 13.7451 8.28418 13.0264 8.28418 12.1055C8.28418 11.3942 8.49381 10.7428 8.91309 10.1514C9.33236 9.55988 9.89014 9.08446 10.5864 8.72508C11.2902 8.36571 12.0614 8.18602 12.8999 8.18602C13.2743 8.18602 13.6486 8.23843 14.0229 8.34325C14.4048 8.44058 14.7492 8.53791 15.0562 8.63524C15.3706 8.73257 15.6139 8.78123 15.7861 8.78123C15.9359 8.78123 16.0519 8.70262 16.1343 8.54539C16.2166 8.38068 16.2578 8.18228 16.2578 7.95018C16.2578 7.78547 16.1792 7.60204 16.022 7.39989C15.8722 7.19025 15.6813 7.01431 15.4492 6.87206C15.2171 6.72232 14.9813 6.64745 14.7417 6.64745C14.6743 6.64745 14.6219 6.66616 14.5845 6.7036C14.5545 6.73355 14.5321 6.78595 14.5171 6.86082C14.5096 7.02554 14.4572 7.16405 14.3599 7.27635C14.27 7.38117 14.1315 7.43358 13.9443 7.43358C13.6673 7.43358 13.4277 7.37368 13.2256 7.25389C13.0234 7.12661 12.8363 6.99933 12.6641 6.87206C12.4993 6.74478 12.3346 6.68114 12.1699 6.68114C12.0052 6.68114 11.8704 6.75226 11.7656 6.89452C11.6608 7.03677 11.5485 7.20148 11.4287 7.38866C11.3164 7.57583 11.1667 7.74054 10.9795 7.8828C10.7998 8.02505 10.5452 8.09618 10.2158 8.09618C9.90885 8.09618 9.66553 8.01008 9.48584 7.83788C9.30615 7.66567 9.21631 7.44107 9.21631 7.16405C9.21631 6.93944 9.2762 6.74103 9.396 6.56883C9.51579 6.39663 9.6543 6.22069 9.81152 6.041C9.97624 5.85383 10.1185 5.6367 10.2383 5.38963C10.3581 5.14256 10.418 4.8356 10.418 4.46873C10.418 4.09439 10.5677 3.72378 10.8672 3.35692C10.914 3.29845 10.9738 3.22515 11.0414 3.14307C6.26348 4.44202 2.75 8.81069 2.75 14C2.75 20.2132 7.7868 25.25 14 25.25C19.8771 25.25 24.7016 20.7434 25.2064 14.9973C24.8498 14.9552 24.2583 14.4242 24.0068 14.0146C23.7523 13.5879 23.5501 13.1387 23.4004 12.667C23.2507 12.1953 23.1196 11.7947 23.0073 11.4653C22.9025 11.1284 22.779 10.9599 22.6367 10.9599C22.5544 10.9599 22.487 10.9936 22.4346 11.061C22.3822 11.1284 22.3185 11.1958 22.2437 11.2632C22.1688 11.3231 22.0565 11.353 21.9067 11.353C21.7345 11.353 21.5361 11.2744 21.3115 11.1172C21.0944 10.9599 20.8698 10.7803 20.6377 10.5781C20.4131 10.3685 20.1997 10.185 19.9976 10.0278C19.8029 9.87059 19.6419 9.79198 19.5146 9.79198C19.3724 9.79198 19.2414 9.85936 19.1216 9.99413C19.0093 10.1289 18.9531 10.2861 18.9531 10.4658C18.9531 10.6081 19.0692 10.7615 19.3013 10.9263C19.5334 11.091 19.7992 11.2744 20.0986 11.4765C20.4056 11.6712 20.6751 11.8808 20.9072 12.1055C21.1393 12.3226 21.2554 12.5547 21.2554 12.8017C21.2554 13.1237 21.1543 13.4306 20.9521 13.7226C20.7575 14.0146 20.5591 14.2729 20.3569 14.4975C20.1623 14.7222 20.0649 14.9018 20.0649 15.0366C20.0649 15.3211 20.0837 15.6805 20.1211 16.1147C20.166 16.5415 20.0462 16.987 19.7617 17.4512C19.6494 17.6383 19.4585 17.9453 19.189 18.3721C18.9269 18.7988 18.605 19.248 18.2231 19.7197C17.8413 20.1839 17.4146 20.5845 16.9429 20.9214Z" fill="white"/>
+<path d="M17.8076 6.23192C17.9349 6.15705 18.0996 6.11961 18.3018 6.11961C18.4215 6.11961 18.5413 6.16079 18.6611 6.24315C18.7884 6.31802 18.9531 6.35545 19.1553 6.35545C19.2826 6.35545 19.3874 6.30679 19.4697 6.20946C19.5521 6.10464 19.5933 5.97736 19.5933 5.82762C19.5933 5.56558 19.4622 5.34471 19.2002 5.16502C18.9382 4.98534 18.6087 4.89549 18.2119 4.89549C17.7477 4.89549 17.3883 4.97036 17.1338 5.1201C16.8792 5.26235 16.752 5.46825 16.752 5.73778C16.752 5.91747 16.8081 6.06346 16.9204 6.17577C17.0402 6.28058 17.1862 6.33299 17.3584 6.33299C17.5381 6.33299 17.6878 6.2993 17.8076 6.23192Z" fill="white"/>
+<path opacity="0.32" d="M17.2332 21.3292L17.2345 21.3283C17.7431 20.965 18.2017 20.5341 18.6103 20.0374L18.6127 20.0343C19.0047 19.5502 19.3392 19.0842 19.6144 18.6364C19.8822 18.2123 20.0749 17.9026 20.1903 17.7103C20.5148 17.1801 20.6775 16.6277 20.6199 16.0675C20.5846 15.6576 20.5671 15.3243 20.566 15.0643C20.5686 15.0584 20.5726 15.05 20.5786 15.0389C20.6038 14.9924 20.6514 14.9227 20.7329 14.8283C20.9515 14.585 21.1626 14.3095 21.3668 14.0035C21.619 13.6379 21.7563 13.2344 21.7563 12.8018C21.7563 12.3809 21.5538 12.0259 21.253 11.7434C21.1471 11.6411 21.035 11.5422 20.9168 11.4468C20.951 11.4724 20.9852 11.4975 21.0192 11.5222L21.0192 11.5222L21.0258 11.5268C21.2886 11.7108 21.5884 11.853 21.9077 11.853C22.1075 11.853 22.3476 11.8159 22.5469 11.6615C22.6551 11.98 22.781 12.3654 22.9248 12.8183C23.0862 13.3268 23.3042 13.8112 23.5784 14.2708L23.5784 14.2708L23.5817 14.2763C23.7415 14.5365 23.9911 14.8107 24.2454 15.0257C24.3747 15.1349 24.5153 15.2376 24.6582 15.3186C24.7945 15.3958 24.9653 15.4722 25.1488 15.4939L25.6604 15.5543L25.7055 15.0411C25.7356 14.698 25.751 14.3507 25.751 14C25.751 7.51065 20.4903 2.25 14.001 2.25C12.9323 2.25 11.8963 2.39279 10.9112 2.66061L10.7576 2.70236L10.6564 2.8252C10.5889 2.90722 10.5279 2.98191 10.4792 3.04273C10.1276 3.47416 9.91895 3.95221 9.91895 4.46876C9.91895 4.78427 9.86703 5.01131 9.78935 5.17152C9.68727 5.38207 9.56922 5.56063 9.43714 5.71071L9.43621 5.71178C9.26843 5.90353 9.11821 6.09403 8.98652 6.28333C8.80423 6.54537 8.71729 6.84499 8.71729 7.16408C8.71729 7.5604 8.85114 7.92125 9.14086 8.1989C9.34788 8.39729 9.59719 8.51351 9.86802 8.56475C9.32614 8.91627 8.87035 9.34844 8.50615 9.86223C8.02821 10.5365 7.78516 11.2885 7.78516 12.1055C7.78516 13.1246 8.07819 13.9849 8.72029 14.6178C9.363 15.2513 10.2415 15.5366 11.2837 15.5366C11.7592 15.5366 12.1099 15.6761 12.3787 15.9288L12.3787 15.9289L12.3863 15.9357C12.6574 16.1803 12.7939 16.4844 12.7939 16.8897C12.7939 17.3118 12.7977 17.7822 12.8052 18.3007L12.8052 18.3007L12.8054 18.308C12.8213 18.8564 12.8889 19.3878 13.0093 19.9012L13.0092 19.9012L13.0115 19.9102C13.1499 20.4554 13.3983 20.9263 13.7671 21.3043L13.7671 21.3043L13.7714 21.3086C14.2021 21.7393 14.7979 21.9155 15.4727 21.9155C16.1035 21.9155 16.6935 21.7122 17.2332 21.3292ZM20.3103 10.9552C20.4457 11.0731 20.5794 11.1844 20.7114 11.2888C20.6032 11.2095 20.4906 11.1326 20.3735 11.0582C20.0789 10.8593 19.8183 10.6794 19.5916 10.5185C19.5242 10.4707 19.4831 10.4336 19.4594 10.4087C19.4665 10.3748 19.4805 10.3472 19.5018 10.3202C19.5082 10.3134 19.5138 10.3078 19.5186 10.3034C19.5552 10.322 19.61 10.3568 19.6844 10.4168L19.6843 10.4169L19.6916 10.4225C19.8798 10.569 20.0818 10.7423 20.2975 10.9437L20.3038 10.9495L20.3103 10.9552ZM12.9009 7.68605C12.5088 7.68605 12.1284 7.72226 11.7603 7.79508C11.7935 7.74894 11.8249 7.70145 11.8544 7.65259C11.9683 7.4748 12.0732 7.32131 12.1691 7.19114C12.1722 7.18703 12.1748 7.1838 12.1769 7.1813C12.2069 7.18266 12.2655 7.19522 12.3593 7.26773L12.3592 7.26782L12.3678 7.27417C12.5511 7.40963 12.7487 7.54388 12.9602 7.67704L12.9601 7.67719L12.9717 7.68407C12.9731 7.68494 12.9746 7.68581 12.9761 7.68668C12.951 7.68626 12.926 7.68605 12.9009 7.68605ZM15.2066 8.15812C14.9242 8.06863 14.6135 7.97982 14.2748 7.89159C14.4451 7.84503 14.6082 7.75558 14.7396 7.60281C14.8478 7.47766 14.9225 7.33683 14.9673 7.18661C15.034 7.2097 15.1044 7.24403 15.1791 7.29223L15.1791 7.29234L15.1889 7.29838C15.3672 7.40764 15.5075 7.53848 15.6161 7.69053L15.622 7.69883L15.6283 7.70689C15.7529 7.86709 15.7588 7.94337 15.7588 7.95021C15.7588 8.09376 15.7378 8.19906 15.7081 8.27621C15.6021 8.26432 15.439 8.22999 15.2066 8.15812ZM17.3787 5.5566L17.3787 5.55671L17.3883 5.5511C17.534 5.46537 17.7915 5.39552 18.2129 5.39552C18.534 5.39552 18.7583 5.46759 18.9184 5.57742C19.0774 5.68644 19.0942 5.76672 19.0942 5.82765C19.0942 5.83758 19.0938 5.84616 19.0931 5.85358C19.002 5.84782 18.9505 5.83016 18.9242 5.81686C18.7438 5.69764 18.5344 5.61964 18.3027 5.61964C18.0453 5.61964 17.7872 5.66637 17.5613 5.79737C17.5347 5.81168 17.4755 5.83302 17.3594 5.83302C17.3115 5.83302 17.2851 5.82388 17.2659 5.81127C17.2596 5.80061 17.2529 5.78029 17.2529 5.7378C17.2529 5.6669 17.2664 5.61936 17.3787 5.5566Z" fill="white" stroke="white"/>
+</svg>
diff --git a/packages/mobile/src/core/Swap/Swap.tsx b/packages/mobile/src/core/Swap/Swap.tsx
index 4e33e66a2..c5a4f817d 100644
--- a/packages/mobile/src/core/Swap/Swap.tsx
+++ b/packages/mobile/src/core/Swap/Swap.tsx
@@ -153,7 +153,7 @@ export const Swap: FC<Props> = (props) => {
         source={webViewSource}
         onLoadEnd={handleLoadEnd}
         startInLoadingState={true}
-        originWhitelist={[`https://${getDomainFromURL(baseUrl)}`, 'ton://']}
+        originWhitelist={[`https://${getDomainFromURL(baseUrl)}`, 'ton://*']}
         decelerationRate="normal"
         javaScriptCanOpenWindowsAutomatically
         mixedContentMode="always"
diff --git a/packages/mobile/src/hooks/useMigration.ts b/packages/mobile/src/hooks/useMigration.ts
index 855721763..e91e2f4a8 100644
--- a/packages/mobile/src/hooks/useMigration.ts
+++ b/packages/mobile/src/hooks/useMigration.ts
@@ -22,12 +22,8 @@ export const useMigration = () => {
     if (isNewSecurityFlow) {
       const keychainService = await AsyncStorage.getItem('keychainService');
 
-      if (!keychainService) {
-        throw new Error();
-      }
-
       jsonstr = await SecureStore.getItemAsync('biometry_' + keychainItemName, {
-        keychainService,
+        keychainService: keychainService || 'TKProtected',
       });
     } else {
       jsonstr = await EncryptedStorage.getItem(keychainItemName);
diff --git a/packages/mobile/src/navigation/MainStack/MainStack.tsx b/packages/mobile/src/navigation/MainStack/MainStack.tsx
index 1f8300cbe..c2a9f5106 100644
--- a/packages/mobile/src/navigation/MainStack/MainStack.tsx
+++ b/packages/mobile/src/navigation/MainStack/MainStack.tsx
@@ -63,7 +63,7 @@ export const MainStack: FC = () => {
   const showLockScreen =
     tk.lockEnabled && !isUnlocked && hasWallet && !attachedScreen.pathname;
 
-  const isMigrated = useExternalState(tk.walletsStore, (state) => state.isMigrated);
+  const isMigrated = useExternalState(tk.migrationStore, (state) => state.isMigrated);
 
   const root = useMemo(() => {
     if (hasWallet) {
diff --git a/packages/mobile/src/navigation/ModalStack.tsx b/packages/mobile/src/navigation/ModalStack.tsx
index d74ce6ac8..5e2bc1c36 100644
--- a/packages/mobile/src/navigation/ModalStack.tsx
+++ b/packages/mobile/src/navigation/ModalStack.tsx
@@ -59,6 +59,7 @@ export const ModalStack = React.memo(() => (
         path={AppStackRouteNames.ReceiveInscription}
       />
       <Stack.Modal component={NFT} path="NFTItemDetails" />
+      {/* <Stack.Modal component={Receive} path={AppStackRouteNames.Receive} /> */}
       <Stack.Modal component={Send} path={AppStackRouteNames.Send} />
       <Stack.Modal component={RenewAllDomainModal} path="RenewAllDomains" />
       <Stack.Modal component={ChooseCountry} path={AppStackRouteNames.ChooseCountry} />
diff --git a/packages/mobile/src/store/zustand/domains/types.ts b/packages/mobile/src/store/zustand/domains/types.ts
index b83d03908..8d51a7317 100644
--- a/packages/mobile/src/store/zustand/domains/types.ts
+++ b/packages/mobile/src/store/zustand/domains/types.ts
@@ -1,43 +1,42 @@
 export type RawAddress = string;
 export type ExpiringAt = number;
 
-
 export interface ExpiringDomainItem {
-  expiring_at: number
-  name: string
-  dns_item: DnsItem
+  expiring_at: number;
+  name: string;
+  dns_item: DnsItem;
 }
 
 export interface DnsItem {
-  address: string
-  index: number
-  owner: Owner
-  collection: Collection
-  verified: boolean
-  metadata: Metadata
-  previews: Preview[]
-  dns: string
-  approved_by: string[]
+  address: string;
+  index: number;
+  owner: Owner;
+  collection: Collection;
+  verified: boolean;
+  metadata: Metadata;
+  previews: Preview[];
+  dns: string;
+  approved_by: string[];
 }
 
 export interface Owner {
-  address: string
-  is_scam: boolean
+  address: string;
+  is_scam: boolean;
 }
 
 export interface Collection {
-  address: string
-  name: string
-  description: string
+  address: string;
+  name: string;
+  description: string;
 }
 
 export interface Metadata {
-  name: string
+  name: string;
 }
 
 export interface Preview {
-  resolution: string
-  url: string
+  resolution: string;
+  url: string;
 }
 
 export type ExpiringDomains = {
diff --git a/packages/mobile/src/uikit/Icon/IconsMobileList.ts b/packages/mobile/src/uikit/Icon/IconsMobileList.ts
index 0f92433f9..8368c40f4 100644
--- a/packages/mobile/src/uikit/Icon/IconsMobileList.ts
+++ b/packages/mobile/src/uikit/Icon/IconsMobileList.ts
@@ -67,6 +67,7 @@ export const MobileIconsList = {
   'ic-explore-28': require('$assets/icons/png/ic-explore-28.png'),
   'ic-flash-28': require('$assets/icons/png/ic-flash-28.png'),
   'ic-gear-28': require('$assets/icons/png/ic-gear-28.png'),
+  'ic-globe-28': require('$assets/icons/png/ic-globe-28.png'),
   'ic-home-28': require('$assets/icons/png/ic-home-28.png'),
   'ic-jetton-28': require('$assets/icons/png/ic-jetton-28.png'),
   'ic-key-28': require('$assets/icons/png/ic-key-28.png'),
diff --git a/packages/mobile/src/uikit/Icon/generated.types.ts b/packages/mobile/src/uikit/Icon/generated.types.ts
index ad8cd3a39..7991f0183 100644
--- a/packages/mobile/src/uikit/Icon/generated.types.ts
+++ b/packages/mobile/src/uikit/Icon/generated.types.ts
@@ -67,6 +67,7 @@ export type IconNames =
   | 'ic-explore-28'
   | 'ic-flash-28'
   | 'ic-gear-28'
+  | 'ic-globe-28'
   | 'ic-home-28'
   | 'ic-jetton-28'
   | 'ic-key-28'
@@ -191,6 +192,7 @@ export const AllIcons = [
   'ic-explore-28',
   'ic-flash-28',
   'ic-gear-28',
+  'ic-globe-28',
   'ic-home-28',
   'ic-jetton-28',
   'ic-key-28',
@@ -316,6 +318,7 @@ export const IconSizes = {
   'ic-explore-28': 28,
   'ic-flash-28': 28,
   'ic-gear-28': 28,
+  'ic-globe-28': 28,
   'ic-home-28': 28,
   'ic-jetton-28': 28,
   'ic-key-28': 28,
diff --git a/packages/mobile/src/uikit/List/ListItem.tsx b/packages/mobile/src/uikit/List/ListItem.tsx
index 9ac47dcdc..aefaba6ca 100644
--- a/packages/mobile/src/uikit/List/ListItem.tsx
+++ b/packages/mobile/src/uikit/List/ListItem.tsx
@@ -33,6 +33,8 @@ export interface ListItemProps {
   disabled?: boolean;
   titleProps?: TextProps;
   leftContentStyle?: StyleProp<ViewStyle>;
+
+  titleStyle?: ViewStyle;
   /*
     Shared value that will be updated when user press on ListItem
  */
@@ -81,7 +83,7 @@ export const ListItem = memo<ListItemProps>((props) => {
   const TouchableComponent = isAndroid ? Pressable : TouchableHighlight;
   const renderTitle = useCallback(() => {
     return (
-      <View style={styles.title}>
+      <View style={[styles.title, props.titleStyle]}>
         <View style={styles.titleTextContainer}>
           {typeof props.title === 'string' ? (
             <SText
@@ -205,7 +207,7 @@ const styles = Steezy.create(({ colors }) => ({
     height: 44,
     borderRadius: 44 / 2,
     overflow: 'hidden',
-    backgroundColor: colors.backgroundContentTint,
+    backgroundColor: colors.backgroundContentAttention,
   },
   picture: {
     width: 44,
diff --git a/packages/mobile/src/uikit/TransitionOpacity.tsx b/packages/mobile/src/uikit/TransitionOpacity.tsx
index 9576a80fb..d5638fd2c 100644
--- a/packages/mobile/src/uikit/TransitionOpacity.tsx
+++ b/packages/mobile/src/uikit/TransitionOpacity.tsx
@@ -1,6 +1,12 @@
 import React from 'react';
 import { StyleProp, ViewStyle } from 'react-native';
-import Animated, { runOnJS, useAnimatedStyle, useSharedValue, withDelay, withTiming } from 'react-native-reanimated';
+import Animated, {
+  runOnJS,
+  useAnimatedStyle,
+  useSharedValue,
+  withDelay,
+  withTiming,
+} from 'react-native-reanimated';
 
 interface TransitionOpacity {
   isVisible: boolean;
@@ -12,46 +18,49 @@ interface TransitionOpacity {
 } 
 
 export const TransitionOpacity: React.FC<TransitionOpacity> = (props) => {
-  const { 
-    children, 
-    isVisible, 
-    alwaysShown, 
-    style, 
-    entranceAnimation = true, 
-    duration = 150
+  const {
+    children,
+    isVisible,
+    alwaysShown,
+    style,
+    entranceAnimation = true,
+    duration = 150,
   } = props;
 
   const [shown, setIsShown] = React.useState(false);
-  const opacity = useSharedValue(entranceAnimation ? 0 : 1); 
+  const opacity = useSharedValue(entranceAnimation ? 0 : 1);
 
   React.useEffect(() => {
     if (isVisible) {
       setIsShown(true);
-      opacity.value = withDelay(250, withTiming(1, {
-        duration,
-      }));
+      opacity.value = withDelay(
+        250,
+        withTiming(1, {
+          duration,
+        }),
+      );
     } else {
-      opacity.value = withTiming(0, {
-        duration,
-      }, (isComplete) => {
-        if (isComplete) {
-          runOnJS(setIsShown)(false);
-        }
-      });
+      opacity.value = withTiming(
+        0,
+        {
+          duration,
+        },
+        (isComplete) => {
+          if (isComplete) {
+            runOnJS(setIsShown)(false);
+          }
+        },
+      );
     }
   }, [isVisible]);
 
   const opacityStyle = useAnimatedStyle(() => ({
-    opacity: opacity.value
+    opacity: opacity.value,
   }));
 
   if (!shown && !alwaysShown) {
     return null;
   }
 
-  return (
-    <Animated.View style={[style, opacityStyle]}>
-      {children}
-    </Animated.View>
-  );
+  return <Animated.View style={[style, opacityStyle]}>{children}</Animated.View>;
 };
diff --git a/packages/mobile/src/wallet/Tonkeeper.ts b/packages/mobile/src/wallet/Tonkeeper.ts
index 2b2d8d1b4..e1380bac5 100644
--- a/packages/mobile/src/wallet/Tonkeeper.ts
+++ b/packages/mobile/src/wallet/Tonkeeper.ts
@@ -45,6 +45,9 @@ export interface WalletsStoreState {
   selectedIdentifier: string;
   biometryEnabled: boolean;
   lockEnabled: boolean;
+}
+
+export interface MigrationState {
   isMigrated: boolean;
 }
 
@@ -77,6 +80,9 @@ export class Tonkeeper {
     selectedIdentifier: '',
     biometryEnabled: false,
     lockEnabled: true,
+  });
+
+  public migrationStore = new State<MigrationState>({
     isMigrated: false,
   });
 
@@ -99,6 +105,11 @@ export class Tonkeeper {
       storage: this.storage,
       key: 'walletsStore',
     });
+
+    this.migrationStore.persist({
+      storage: this.storage,
+      key: 'migrationStore',
+    });
   }
 
   public get wallet() {
@@ -122,12 +133,18 @@ export class Tonkeeper {
       await Promise.all([
         this.walletsStore.rehydrate(),
         this.tonPrice.rehydrate(),
+        this.migrationStore.rehydrate(),
         this.biometry.detectTypes(),
       ]);
 
+      // @ts-ignore moved to migrationStore, may be set on some clients. So we need to migrate it
+      if (this.walletsStore.data.isMigrated) {
+        this.setMigrated();
+      }
+
       this.tonPrice.load();
 
-      if (!this.walletsStore.data.isMigrated) {
+      if (!this.migrationStore.data.isMigrated) {
         this.migrationData = await this.getMigrationData();
       }
 
@@ -237,7 +254,9 @@ export class Tonkeeper {
       return indexA - indexB;
     });
 
-    this.walletsStore.set(({ wallets }) => ({ wallets: [...wallets, ...sortedWallets] }));
+    await this.walletsStore.setAsync(({ wallets }) => ({
+      wallets: [...wallets, ...sortedWallets],
+    }));
     const walletsInstances = await Promise.all(
       sortedWallets.map((wallet) => this.createWalletInstance(wallet)),
     );
@@ -334,7 +353,9 @@ export class Tonkeeper {
       version,
     };
 
-    this.walletsStore.set(({ wallets }) => ({ wallets: [...wallets, config] }));
+    await this.walletsStore.setAsync(({ wallets }) => ({
+      wallets: [...wallets, config],
+    }));
     const wallet = await this.createWalletInstance(config);
     this.setWallet(wallet);
 
@@ -348,7 +369,7 @@ export class Tonkeeper {
           Array.from(this.wallets.keys()).find((item) => item !== identifier) ?? '',
         ) ?? null;
 
-      this.walletsStore.set(({ wallets }) => ({
+      await this.walletsStore.setAsync(({ wallets }) => ({
         wallets: wallets.filter((w) => w.identifier !== identifier),
         selectedIdentifier: nextWallet?.identifier ?? '',
       }));
@@ -358,7 +379,7 @@ export class Tonkeeper {
       this.wallets.delete(identifier);
 
       if (this.wallets.size === 0) {
-        this.walletsStore.set({ biometryEnabled: false });
+        await this.walletsStore.setAsync({ biometryEnabled: false });
         this.vault.destroy();
       }
 
@@ -369,7 +390,7 @@ export class Tonkeeper {
   }
 
   public async removeAllWallets() {
-    this.walletsStore.set({
+    await this.walletsStore.setAsync({
       wallets: [],
       selectedIdentifier: '',
       biometryEnabled: false,
@@ -441,7 +462,7 @@ export class Tonkeeper {
         },
       );
 
-      this.walletsStore.set({ wallets: updatedWallets });
+      await this.walletsStore.setAsync({ wallets: updatedWallets });
 
       identifiers.forEach((identifier) => {
         const currentConfig = updatedWallets.find(
@@ -496,7 +517,7 @@ export class Tonkeeper {
 
   public setMigrated() {
     console.log('migrated');
-    this.walletsStore.set({ isMigrated: true });
+    this.migrationStore.set({ isMigrated: true });
   }
 
   public saveLastBackupTimestampAll(identifiers: string[], dismissSetup = false) {
@@ -512,7 +533,7 @@ export class Tonkeeper {
   public async enableBiometry(passcode: string) {
     await this.vault.setupBiometry(passcode);
 
-    this.walletsStore.set({ biometryEnabled: true });
+    await this.walletsStore.setAsync({ biometryEnabled: true });
   }
 
   public async disableBiometry() {
@@ -520,14 +541,14 @@ export class Tonkeeper {
       await this.vault.removeBiometry();
     } catch {}
 
-    this.walletsStore.set({ biometryEnabled: false });
+    await this.walletsStore.setAsync({ biometryEnabled: false });
   }
 
   public async enableLock() {
-    this.walletsStore.set({ lockEnabled: true });
+    await this.walletsStore.setAsync({ lockEnabled: true });
   }
 
   public async disableLock() {
-    this.walletsStore.set({ lockEnabled: false });
+    await this.walletsStore.setAsync({ lockEnabled: false });
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 069a320b9..c6c894e61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2734,12 +2734,12 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-9.4.1.tgz#7b880758adca65fe47ee866cf7b00416b9dcc192"
   integrity sha512-dAbY5mfw+6Kas/GJ6QX9AZyY+K+eq9ad4Su6utoph/nxyH3whp5cMSgRNgE2VhGQVRZ/OG0qq3IaD3+wzoqJXw==
 
-"@react-native-firebase/analytics@^18.5.0":
+"@react-native-firebase/analytics@18.5.0":
   version "18.5.0"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/analytics/-/analytics-18.5.0.tgz#cca5858e44f3f8cbf387fa7cd6debb95fbcf8023"
   integrity sha512-+8fkDedcftieOBEkNdqEW0lS/FB9SKzfUc3yYXnJcLTy3Ceg9JZga/tWz4BGbbxPddUy1Sm2UuWDuOxsdkFUyA==
 
-"@react-native-firebase/app@^18.5.0":
+"@react-native-firebase/app@18.5.0":
   version "18.5.0"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/app/-/app-18.5.0.tgz#198a133229d1b8710f257e76d9703dcb7e4cd6e0"
   integrity sha512-AhHQi5KFDlKZn/lH7rEYtLfpsGamEq+P/cXZWcNPcP0WGlmi++abk7Pxnn4MjnG7TNhEyG/C9uq//qb6VhXaZg==
@@ -2747,14 +2747,14 @@
     opencollective-postinstall "^2.0.1"
     superstruct "^0.6.2"
 
-"@react-native-firebase/crashlytics@^18.5.0":
+"@react-native-firebase/crashlytics@18.5.0":
   version "18.5.0"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/crashlytics/-/crashlytics-18.5.0.tgz#b5c1e15d260d5243c5ffb2963114bb7e42fe2b7f"
   integrity sha512-i/jt/kNyhLws10/DeYgSQbGIekNPCAdtdg36NmFSw7URZf+1JUczKePbHqq3TvMFZJi5OjnDj06Fj9oenQKjWA==
   dependencies:
     stacktrace-js "^2.0.0"
 
-"@react-native-firebase/messaging@^18.5.0":
+"@react-native-firebase/messaging@18.5.0":
   version "18.5.0"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/messaging/-/messaging-18.5.0.tgz#2a80b25816470e9843682e031a3a113566067ce6"
   integrity sha512-y1FApYxBMcygmbWBqUPFC+fCfvx6Yf6TdZewun7kPwx+S+tkYzoKx1IsXtxOXtqyJjCNEYirjFgNrs5SSd02zA==