diff --git a/.eslintrc b/.eslintrc
index c547f93e..26f348aa 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -57,6 +57,7 @@
         }
       }
     ],
+    "react/jsx-key": [2, { "checkFragmentShorthand": true}],
     "arrow-body-style": "off",
     "no-else-return": "off",
     "no-plusplus": "off",
diff --git a/changelogs/1.20.19.txt b/changelogs/1.20.19.txt
new file mode 100644
index 00000000..619f4cd5
--- /dev/null
+++ b/changelogs/1.20.19.txt
@@ -0,0 +1 @@
+Bug fixes and performance improvements
diff --git a/changelogs/2.0.0.txt b/changelogs/2.0.0.txt
new file mode 100644
index 00000000..619f4cd5
--- /dev/null
+++ b/changelogs/2.0.0.txt
@@ -0,0 +1 @@
+Bug fixes and performance improvements
diff --git a/changelogs/3.0.0.txt b/changelogs/3.0.0.txt
new file mode 100644
index 00000000..05df7b87
--- /dev/null
+++ b/changelogs/3.0.0.txt
@@ -0,0 +1,8 @@
+- Significantly Improved In-App Browser Interface.
+- Manual NFT Hiding.
+- Enhanced Scam Detection.
+- Ledger v2.1 Support.
+- W5 Wallet Version Support.
+- Boosted Connection Speed & App Performance.
+- Dapp Connection Fixes.
+- Multiple Fixes and Improvements.
diff --git a/package-lock.json b/package-lock.json
index 4f645072..872c24dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mytonwallet",
-  "version": "1.20.18",
+  "version": "3.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mytonwallet",
-      "version": "1.20.18",
+      "version": "3.0.0",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@awesome-cordova-plugins/core": "^6.6.0",
diff --git a/package.json b/package.json
index 821c6796..ad772232 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mytonwallet",
-  "version": "1.20.18",
+  "version": "3.0.0",
   "description": "The most feature-rich web wallet and browser extension for TON – with support of multi-accounts, tokens (jettons), NFT, TON DNS, TON Sites, TON Proxy, and TON Magic.",
   "main": "index.js",
   "scripts": {
diff --git a/public/version.txt b/public/version.txt
index 41450c3d..4a36342f 100644
--- a/public/version.txt
+++ b/public/version.txt
@@ -1 +1 @@
-1.20.18
+3.0.0
diff --git a/src/api/blockchains/ton/transactions.ts b/src/api/blockchains/ton/transactions.ts
index 1fd82f66..afb09814 100644
--- a/src/api/blockchains/ton/transactions.ts
+++ b/src/api/blockchains/ton/transactions.ts
@@ -626,18 +626,18 @@ async function populateTransactions(network: ApiNetwork, transactions: ApiTransa
 
       if (parsedPayload?.type === 'nft:ownership-assigned') {
         const nft = nftsByAddress[parsedPayload.nftAddress];
+        transaction.nft = nft;
         if (nft?.isScam) {
           transaction.metadata = { ...transaction.metadata, isScam: true };
         } else {
-          transaction.nft = nft;
           transaction.fromAddress = addressBook[parsedPayload.prevOwner].user_friendly;
         }
       } else if (parsedPayload?.type === 'nft:transfer') {
         const nft = nftsByAddress[parsedPayload.nftAddress];
+        transaction.nft = nft;
         if (nft?.isScam) {
           transaction.metadata = { ...transaction.metadata, isScam: true };
         } else {
-          transaction.nft = nft;
           transaction.toAddress = addressBook[parsedPayload.newOwner].user_friendly;
         }
       }
diff --git a/src/api/blockchains/ton/util/tonCore.ts b/src/api/blockchains/ton/util/tonCore.ts
index 1846e27b..9de2fafa 100644
--- a/src/api/blockchains/ton/util/tonCore.ts
+++ b/src/api/blockchains/ton/util/tonCore.ts
@@ -303,10 +303,7 @@ export function buildLiquidStakingWithdrawBody(options: {
     queryId, amount, responseAddress, waitTillRoundEnd, fillOrKill,
   } = options;
 
-  const customPayload = new Builder()
-    .storeUint(Number(waitTillRoundEnd), 1)
-    .storeUint(Number(fillOrKill), 1)
-    .asCell();
+  const customPayload = buildLiquidStakingWithdrawCustomPayload(waitTillRoundEnd, fillOrKill);
 
   return new Builder()
     .storeUint(JettonOpCode.Burn, 32)
@@ -318,6 +315,13 @@ export function buildLiquidStakingWithdrawBody(options: {
     .asCell();
 }
 
+export function buildLiquidStakingWithdrawCustomPayload(waitTillRoundEnd?: boolean, fillOrKill?: boolean) {
+  return new Builder()
+    .storeUint(Number(waitTillRoundEnd), 1)
+    .storeUint(Number(fillOrKill), 1)
+    .asCell();
+}
+
 export function getTokenBalance(network: ApiNetwork, walletAddress: string) {
   const tokenWallet = getTonClient(network).open(new JettonWallet(Address.parse(walletAddress)));
   return tokenWallet.getJettonBalance();
diff --git a/src/api/common/addresses.ts b/src/api/common/addresses.ts
index 6c4f6828..904ac8d5 100644
--- a/src/api/common/addresses.ts
+++ b/src/api/common/addresses.ts
@@ -1,9 +1,7 @@
 import type { ApiAddressInfo, ApiKnownAddresses } from '../types';
 
-import {
-  RE_EMPTY_CHARS,
-  RE_FAKE_DOTS, RE_LINK_TEMPLATE, RE_SPACE_CHARS, RE_TG_BOT_MENTION,
-} from '../../config';
+import { RE_LINK_TEMPLATE, RE_TG_BOT_MENTION } from '../../config';
+import { cleanText } from '../../lib/confusables';
 import { logDebugError } from '../../util/logs';
 import { callBackendGet } from './backend';
 
@@ -51,11 +49,7 @@ export function checkIsTrustedCollection(address: string) {
 }
 
 export function checkHasScamLink(text: string) {
-  const matches = text
-    .replace(RE_EMPTY_CHARS, '')
-    .replace(RE_SPACE_CHARS, ' ')
-    .replace(RE_FAKE_DOTS, '.')
-    .matchAll(RE_LINK_TEMPLATE);
+  const matches = cleanText(text).matchAll(RE_LINK_TEMPLATE);
 
   for (const match of matches) {
     const host = match.groups?.host;
@@ -68,5 +62,5 @@ export function checkHasScamLink(text: string) {
 }
 
 export function checkHasTelegramBotMention(text: string) {
-  return RE_TG_BOT_MENTION.test(text.replace(RE_EMPTY_CHARS, '').replace(RE_SPACE_CHARS, ' '));
+  return RE_TG_BOT_MENTION.test(cleanText(text));
 }
diff --git a/src/api/common/helpers.ts b/src/api/common/helpers.ts
index bdc04e31..67984960 100644
--- a/src/api/common/helpers.ts
+++ b/src/api/common/helpers.ts
@@ -70,11 +70,11 @@ export function buildLocalTransaction(
 
 export function updateTransactionMetadata(transaction: ApiTransactionExtra): ApiTransactionExtra {
   const {
-    normalizedAddress, comment, type, isIncoming,
+    normalizedAddress, comment, type, isIncoming, nft,
   } = transaction;
   let { metadata = {} } = transaction;
 
-  const isNftTransfer = type === 'nftTransferred' || type === 'nftReceived';
+  const isNftTransfer = type === 'nftTransferred' || type === 'nftReceived' || Boolean(nft);
   const knownAddresses = getKnownAddresses();
   const hasScamMarkers = comment ? getScamMarkers().some((sm) => sm.test(comment)) : false;
   const shouldCheckComment = !hasScamMarkers && comment && isIncoming
diff --git a/src/api/methods/accounts.ts b/src/api/methods/accounts.ts
index 7ae4e9ca..39f17930 100644
--- a/src/api/methods/accounts.ts
+++ b/src/api/methods/accounts.ts
@@ -11,7 +11,6 @@ import {
   sendUpdateTokens,
   setupBalanceBasedPolling,
   setupStakingPolling,
-  setupSwapPolling,
   setupVestingPolling,
   setupWalletVersionsPolling,
 } from './polling';
@@ -33,7 +32,7 @@ export async function activateAccount(accountId: string, newestTxIds?: ApiTxIdBy
       deactivateAllDapps();
     }
 
-    callHook('onFirstLogin');
+    void callHook('onFirstLogin');
 
     onActiveDappAccountUpdated(accountId);
   }
@@ -44,7 +43,6 @@ export async function activateAccount(accountId: string, newestTxIds?: ApiTxIdBy
 
   void setupBalanceBasedPolling(accountId, newestTxIds);
   void setupStakingPolling(accountId);
-  void setupSwapPolling(accountId);
   void setupWalletVersionsPolling(accountId);
   void setupVestingPolling(accountId);
 }
@@ -55,7 +53,7 @@ export function deactivateAllAccounts() {
 
   if (IS_EXTENSION) {
     deactivateAllDapps();
-    callHook('onFullLogout');
+    void callHook('onFullLogout');
   }
 }
 
diff --git a/src/api/methods/dapps.ts b/src/api/methods/dapps.ts
index dab1666d..01666635 100644
--- a/src/api/methods/dapps.ts
+++ b/src/api/methods/dapps.ts
@@ -165,7 +165,7 @@ export async function deleteAllDapps(accountId: string) {
       accountId,
       origin,
     });
-    callHook('onDappDisconnected', accountId, origin);
+    void callHook('onDappDisconnected', accountId, origin);
   });
 
   await callHook('onDappsChanged');
@@ -208,7 +208,7 @@ export function getDappsState(): Promise<ApiDappsState | undefined> {
 export async function removeAccountDapps(accountId: string) {
   await removeAccountValue(accountId, 'dapps');
 
-  callHook('onDappsChanged');
+  void callHook('onDappsChanged');
 }
 
 export async function removeAllDapps() {
diff --git a/src/api/methods/init.ts b/src/api/methods/init.ts
index c88f7e18..556175ab 100644
--- a/src/api/methods/init.ts
+++ b/src/api/methods/init.ts
@@ -13,7 +13,6 @@ import * as methods from '.';
 addHooks({
   onDappDisconnected: tonConnectSse.sendSseDisconnect,
   onDappsChanged: tonConnectSse.resetupSseConnection,
-  onSwapCreated: methods.setupSwapPolling,
 });
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/src/api/methods/polling.ts b/src/api/methods/polling.ts
index 911c3389..a829de14 100644
--- a/src/api/methods/polling.ts
+++ b/src/api/methods/polling.ts
@@ -9,7 +9,6 @@ import type {
   ApiStakingCommonData,
   ApiStakingState,
   ApiSwapAsset,
-  ApiSwapHistoryItem,
   ApiTokenPrice,
   ApiTransactionActivity,
   ApiTxIdBySlug,
@@ -39,9 +38,7 @@ import { processNftUpdates, updateAccountNfts } from './nfts';
 import { resolveDataPreloadPromise } from './preload';
 import { getBaseCurrency } from './prices';
 import { getBackendStakingState, tryUpdateStakingCommonData } from './staking';
-import {
-  swapGetAssets, swapGetHistory, swapItemToActivity, swapReplaceTransactionsByRanges,
-} from './swap';
+import { swapGetAssets, swapReplaceTransactionsByRanges } from './swap';
 import { fetchVestings } from './vesting';
 
 type IsAccountActiveFn = (accountId: string) => boolean;
@@ -59,9 +56,6 @@ const STAKING_INTERVAL_WHEN_NOT_FOCUSED = 10 * SEC;
 const BACKEND_INTERVAL = 30 * SEC;
 const LONG_BACKEND_INTERVAL = 60 * SEC;
 const NFT_FULL_INTERVAL = 60 * SEC;
-const SWAP_POLLING_INTERVAL = 3 * SEC;
-const SWAP_POLLING_INTERVAL_WHEN_NOT_FOCUSED = 10 * SEC;
-const SWAP_FINISHED_STATUSES = new Set(['failed', 'completed', 'expired']);
 const VERSIONS_INTERVAL = 5 * 60 * SEC;
 const VERSIONS_INTERVAL_WHEN_NOT_FOCUSED = 15 * 60 * SEC;
 const VESTING_INTERVAL = 10 * SEC;
@@ -81,7 +75,7 @@ const prices: {
   baseCurrency: DEFAULT_PRICE_CURRENCY,
   bySlug: {},
 };
-let swapPollingAccountId: string | undefined;
+
 const lastBalanceCache: Record<string, AccountBalanceCache> = {};
 
 export async function initPolling(_onUpdate: OnApiUpdate, _isAccountActive: IsAccountActiveFn) {
@@ -563,100 +557,10 @@ export function sendUpdateTokens() {
   });
 }
 
-export async function setupSwapPolling(accountId: string) {
-  if (swapPollingAccountId === accountId) return; // Double launch is not allowed
-  swapPollingAccountId = accountId;
-
-  const { address, lastFinishedSwapTimestamp } = await fetchStoredAccount(accountId);
-
-  let fromTimestamp = lastFinishedSwapTimestamp ?? await getActualLastFinishedSwapTimestamp(accountId, address);
-
-  const localOnUpdate = onUpdate;
-  const swapById: Record<string, ApiSwapHistoryItem> = {};
-
-  while (isAlive(localOnUpdate, accountId)) {
-    try {
-      const swaps = await swapGetHistory(address, {
-        fromTimestamp,
-      });
-      if (!isAlive(localOnUpdate, accountId)) break;
-      if (!swaps.length) break;
-
-      swaps.reverse();
-
-      let isLastFinishedSwapUpdated = false;
-      let isPrevFinished = true;
-
-      for (const swap of swaps) {
-        if (swap.cex) {
-          if (swap.cex.status === swapById[swap.id]?.cex!.status) {
-            continue;
-          }
-        } else if (swap.status === swapById[swap.id]?.status) {
-          continue;
-        }
-
-        swapById[swap.id] = swap;
-
-        const isFinished = SWAP_FINISHED_STATUSES.has(swap.status);
-        if (isFinished && isPrevFinished) {
-          fromTimestamp = swap.timestamp;
-          isLastFinishedSwapUpdated = true;
-        }
-        isPrevFinished = isFinished;
-
-        if (swap.cex || swap.status !== 'completed') {
-          // Completed onchain swaps are processed in swapReplaceTransactions
-          onUpdate({
-            type: 'newActivities',
-            accountId,
-            activities: [swapItemToActivity(swap)],
-          });
-        }
-      }
-
-      if (isLastFinishedSwapUpdated) {
-        await updateStoredAccount(accountId, {
-          lastFinishedSwapTimestamp: fromTimestamp,
-        });
-      }
-    } catch (err) {
-      logDebugError('setupSwapPolling', err);
-    }
-
-    await pauseOrFocus(SWAP_POLLING_INTERVAL, SWAP_POLLING_INTERVAL_WHEN_NOT_FOCUSED);
-  }
-
-  if (accountId === swapPollingAccountId) {
-    swapPollingAccountId = undefined;
-  }
-}
-
 function isAlive(localOnUpdate: OnApiUpdate, accountId: string) {
   return isUpdaterAlive(localOnUpdate) && isAccountActive(accountId);
 }
 
-async function getActualLastFinishedSwapTimestamp(accountId: string, address: string) {
-  const swaps = await swapGetHistory(address, {});
-
-  swaps.reverse();
-
-  let timestamp = Date.now();
-  for (const swap of swaps) {
-    if (SWAP_FINISHED_STATUSES.has(swap.status)) {
-      timestamp = swap.timestamp;
-    } else {
-      break;
-    }
-  }
-
-  await updateStoredAccount(accountId, {
-    lastFinishedSwapTimestamp: timestamp,
-  });
-
-  return timestamp;
-}
-
 function logAndRescue(err: Error) {
   logDebugError('Polling error', err);
 
diff --git a/src/api/methods/staking.ts b/src/api/methods/staking.ts
index a834e639..12170af2 100644
--- a/src/api/methods/staking.ts
+++ b/src/api/methods/staking.ts
@@ -111,8 +111,8 @@ export async function submitUnstake(
 }
 
 export async function getBackendStakingState(accountId: string): Promise<ApiBackendStakingState> {
-  const { address, ledger } = await fetchStoredAccount(accountId);
-  const state = await fetchBackendStakingState(address, Boolean(ledger));
+  const { address } = await fetchStoredAccount(accountId);
+  const state = await fetchBackendStakingState(address);
   return {
     ...state,
     nominatorsPool: {
@@ -123,7 +123,7 @@ export async function getBackendStakingState(accountId: string): Promise<ApiBack
   };
 }
 
-export async function fetchBackendStakingState(address: string, isLedger: boolean): Promise<ApiBackendStakingState> {
+export async function fetchBackendStakingState(address: string): Promise<ApiBackendStakingState> {
   const cacheItem = backendStakingStateByAddress[address];
   if (cacheItem && cacheItem[0] > Date.now()) {
     return cacheItem[1];
@@ -136,9 +136,7 @@ export async function fetchBackendStakingState(address: string, isLedger: boolea
     'X-App-Env': APP_ENV,
   };
 
-  const stakingState = await callBackendGet(`/staking/state/${address}`, {
-    isLedger,
-  }, headers);
+  const stakingState = await callBackendGet(`/staking/state/${address}`, headers);
   stakingState.balance = fromDecimal(stakingState.balance);
   stakingState.totalProfit = fromDecimal(stakingState.totalProfit);
 
@@ -178,3 +176,11 @@ export async function tryUpdateStakingCommonData() {
     logDebugError('tryUpdateLiquidStakingState', err);
   }
 }
+
+export async function getStakingState(accountId: string) {
+  const blockchain = blockchains[resolveBlockchainKey(accountId)!];
+  const backendState = await getBackendStakingState(accountId);
+  const state = await blockchain.getStakingState(accountId, backendState);
+
+  return { backendState, state };
+}
diff --git a/src/api/methods/swap.ts b/src/api/methods/swap.ts
index f1fe781e..af0ef6e6 100644
--- a/src/api/methods/swap.ts
+++ b/src/api/methods/swap.ts
@@ -302,6 +302,18 @@ function buildSwapHistoryRange(transactions: ApiTransaction[]): SwapHistoryRange
   };
 }
 
+export async function fetchSwaps(accountId: string, ids: string[]) {
+  const address = await fetchStoredAddress(accountId);
+  const results = await Promise.allSettled(
+    ids.map((id) => swapGetHistoryItem(address, id.replace('swap:', ''))),
+  );
+
+  return results
+    .map((result) => (result.status === 'fulfilled' ? result.value : undefined))
+    .filter(Boolean)
+    .map(swapItemToActivity);
+}
+
 export function swapItemToActivity(swap: ApiSwapHistoryItem): ApiSwapActivity {
   return {
     ...swap,
@@ -355,7 +367,7 @@ export function swapGetHistoryByRanges(address: string, ranges: SwapHistoryRange
   return callBackendPost(`/swap/history-ranges/${address}`, { ranges });
 }
 
-export function swapGetHistoryItem(address: string, id: number): Promise<ApiSwapHistoryItem> {
+export function swapGetHistoryItem(address: string, id: string): Promise<ApiSwapHistoryItem> {
   return callBackendGet(`/swap/history/${address}/${id}`);
 }
 
diff --git a/src/api/tonConnect/index.ts b/src/api/tonConnect/index.ts
index f72a6846..9993c7b9 100644
--- a/src/api/tonConnect/index.ts
+++ b/src/api/tonConnect/index.ts
@@ -71,6 +71,8 @@ import * as errors from './errors';
 import { UnknownAppError } from './errors';
 import { isValidString, isValidUrl } from './utils';
 
+const BLANK_GIF_DATA_URL = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
+
 const ton = blockchains.ton;
 
 let resolveInit: AnyFunction;
@@ -613,7 +615,8 @@ export async function fetchDappMetadata(manifestUrl: string, origin?: string): P
     const data = await fetchJsonMetadata(manifestUrl);
 
     const { url, name, iconUrl } = await data;
-    if (!isValidUrl(url) || !isValidString(name) || !isValidUrl(iconUrl)) {
+    const safeIconUrl = iconUrl.startsWith('data:') ? BLANK_GIF_DATA_URL : iconUrl;
+    if (!isValidUrl(url) || !isValidString(name) || !isValidUrl(safeIconUrl)) {
       throw new Error('Invalid data');
     }
 
@@ -621,7 +624,7 @@ export async function fetchDappMetadata(manifestUrl: string, origin?: string): P
       origin: origin ?? new URL(url).origin,
       url,
       name,
-      iconUrl,
+      iconUrl: safeIconUrl,
       manifestUrl,
     };
   } catch (err) {
diff --git a/src/api/tonConnect/sse.ts b/src/api/tonConnect/sse.ts
index a0c73483..e8380c1d 100644
--- a/src/api/tonConnect/sse.ts
+++ b/src/api/tonConnect/sse.ts
@@ -148,7 +148,7 @@ export async function resetupSseConnection() {
     return result;
   }, [] as SseDapp[]);
 
-  const clientIds = extractKey(sseDapps, 'clientId');
+  const clientIds = extractKey(sseDapps, 'clientId').filter(Boolean);
   if (!clientIds.length) {
     return;
   }
diff --git a/src/api/tonConnect/utils.ts b/src/api/tonConnect/utils.ts
index 1eff120a..02bffc2b 100644
--- a/src/api/tonConnect/utils.ts
+++ b/src/api/tonConnect/utils.ts
@@ -3,7 +3,7 @@ export function isValidString(value: any, maxLength = 100) {
 }
 
 export function isValidUrl(url: string) {
-  const isString = isValidString(url, 150);
+  const isString = isValidString(url, 255);
   if (!isString) return false;
 
   try {
diff --git a/src/api/types/storage.ts b/src/api/types/storage.ts
index 13037767..6dde2639 100644
--- a/src/api/types/storage.ts
+++ b/src/api/types/storage.ts
@@ -10,7 +10,6 @@ export interface ApiAccount {
     deviceId?: string;
     deviceName?: string;
   };
-  lastFinishedSwapTimestamp?: number;
   authToken?: string;
   isInitialized?: boolean;
 }
diff --git a/src/api/types/updates.ts b/src/api/types/updates.ts
index d57981a8..fbaa1dbb 100644
--- a/src/api/types/updates.ts
+++ b/src/api/types/updates.ts
@@ -27,6 +27,7 @@ export type ApiUpdateNewActivities = {
   type: 'newActivities';
   accountId: string;
   activities: ApiActivity[];
+  noForward?: boolean; // Forbid cyclic update redirection to/from NBS
 };
 
 export type ApiUpdateNewLocalTransaction = {
diff --git a/src/components/App.tsx b/src/components/App.tsx
index 470d8eb7..7494f66e 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -40,7 +40,9 @@ import QrScannerModal from './main/modals/QrScannerModal';
 import SignatureModal from './main/modals/SignatureModal';
 import SwapActivityModal from './main/modals/SwapActivityModal';
 import TransactionModal from './main/modals/TransactionModal';
+import UnhideNftModal from './main/modals/UnhideNftModal';
 import Notifications from './main/Notifications';
+import MediaViewer from './mediaViewer/MediaViewer';
 import Settings from './settings/Settings';
 import SettingsModal from './settings/SettingsModal';
 import SwapModal from './swap/SwapModal';
@@ -60,6 +62,7 @@ interface StateProps {
   isQrScannerOpen?: boolean;
   isHardwareModalOpen?: boolean;
   areSettingsOpen?: boolean;
+  isMediaViewerOpen?: boolean;
 }
 
 const APP_UPDATE_INTERVAL = (IS_ELECTRON && !IS_LINUX) || IS_ANDROID_DIRECT
@@ -75,6 +78,7 @@ function App({
   isHardwareModalOpen,
   isQrScannerOpen,
   areSettingsOpen,
+  isMediaViewerOpen,
 }: StateProps) {
   // return <Test />;
   const {
@@ -176,7 +180,7 @@ function App({
       <Transition
         name={isPortrait ? (IS_ANDROID ? 'slideFadeAndroid' : IS_IOS ? 'slideLayers' : 'slideFade') : 'semiFade'}
         activeKey={renderingKey}
-        shouldCleanup={renderingKey !== AppState.Settings}
+        shouldCleanup={renderingKey !== AppState.Settings && !isMediaViewerOpen}
         className={styles.transitionContainer}
         slideClassName={buildClassName(styles.appSlide, 'custom-scroll')}
       >
@@ -191,6 +195,7 @@ function App({
           <Settings isInsideModal />
         </SettingsModal>
       )}
+      <MediaViewer />
       {!isInactive && (
         <>
           <LedgerModal isOpen={isHardwareModalOpen} onClose={closeHardwareWalletModal} />
@@ -207,6 +212,7 @@ function App({
           <DappTransferModal />
           <AddAccountModal />
           <OnRampWidgetModal />
+          <UnhideNftModal />
           {!IS_DELEGATED_BOTTOM_SHEET && <Notifications />}
           {IS_CAPACITOR && (
             <QrScannerModal
@@ -231,6 +237,7 @@ export default memo(withGlobal((global): StateProps => {
     isBackupWalletModalOpen: global.isBackupWalletModalOpen,
     isHardwareModalOpen: global.isHardwareModalOpen,
     areSettingsOpen: global.areSettingsOpen,
+    isMediaViewerOpen: Boolean(global.mediaViewer.mediaId),
     isQrScannerOpen: global.isQrScannerOpen,
   };
 })(App));
diff --git a/src/components/dapps/Dapp.module.scss b/src/components/dapps/Dapp.module.scss
index 3ff252b4..5635e00a 100644
--- a/src/components/dapps/Dapp.module.scss
+++ b/src/components/dapps/Dapp.module.scss
@@ -269,10 +269,15 @@
   line-height: 0.5rem;
 }
 
+.iconLedger,
 .accountAddress {
   color: var(--color-card-second-text);
 }
 
+.iconLedger {
+  margin-inline-end: 0.25rem;
+}
+
 .description {
   font-size: 0.9375rem;
 }
diff --git a/src/components/dapps/DappConnectModal.tsx b/src/components/dapps/DappConnectModal.tsx
index 958a88cb..6b5b1752 100644
--- a/src/components/dapps/DappConnectModal.tsx
+++ b/src/components/dapps/DappConnectModal.tsx
@@ -44,6 +44,7 @@ interface StateProps {
   isTonAppConnected?: boolean;
 }
 
+const HARDWARE_ACCOUNT_ADDRESS_SHIFT = 3;
 const ACCOUNT_ADDRESS_SHIFT = 4;
 const ACCOUNT_ADDRESS_SHIFT_END = 4;
 
@@ -91,16 +92,18 @@ function DappConnectModal({
 
   const handleSubmit = useLastCallback(() => {
     closeConfirm();
+    const { isHardware } = accounts![selectedAccount];
+    const { isPasswordRequired, isAddressRequired } = requiredPermissions || {};
 
-    if (!requiredProof) {
+    if (!requiredProof || (!isHardware && isAddressRequired && !isPasswordRequired)) {
       submitDappConnectRequestConfirm({
         accountId: selectedAccount,
       });
 
       cancelDappConnectRequestConfirm();
-    } else if (accounts![currentAccountId].isHardware && requiredProof) {
+    } else if (isHardware) {
       setDappConnectRequestState({ state: DappConnectState.ConnectHardware });
-    } else if (requiredPermissions?.isPasswordRequired) {
+    } else {
       // The confirmation window must be closed before the password screen is displayed
       requestAnimationFrame(() => {
         setDappConnectRequestState({ state: DappConnectState.Password });
@@ -127,7 +130,7 @@ function DappConnectModal({
 
   function renderAccount(accountId: string, address: string, title?: string, isHardware?: boolean) {
     const isActive = accountId === selectedAccount;
-    const onClick = isActive || isLoading || isHardware ? undefined : () => setSelectedAccount(accountId);
+    const onClick = isActive || isLoading ? undefined : () => setSelectedAccount(accountId);
     const fullClassName = buildClassName(
       styles.account,
       isActive && styles.account_current,
@@ -143,8 +146,13 @@ function DappConnectModal({
       >
         {title && <span className={styles.accountName}>{title}</span>}
         <div className={styles.accountFooter}>
+          {isHardware && <i className={buildClassName('icon-ledger', isHardware && styles.iconLedger)} aria-hidden />}
           <span className={styles.accountAddress}>
-            {shortenAddress(address, ACCOUNT_ADDRESS_SHIFT, ACCOUNT_ADDRESS_SHIFT_END)}
+            {shortenAddress(
+              address,
+              isHardware ? HARDWARE_ACCOUNT_ADDRESS_SHIFT : ACCOUNT_ADDRESS_SHIFT,
+              ACCOUNT_ADDRESS_SHIFT_END,
+            )}
           </span>
         </div>
       </div>
diff --git a/src/components/dapps/DappTransferModal.tsx b/src/components/dapps/DappTransferModal.tsx
index a418e1e2..984ef360 100644
--- a/src/components/dapps/DappTransferModal.tsx
+++ b/src/components/dapps/DappTransferModal.tsx
@@ -38,6 +38,7 @@ interface StateProps {
   hardwareState?: HardwareConnectState;
   isLedgerConnected?: boolean;
   isTonAppConnected?: boolean;
+  isMediaViewerOpen?: boolean;
 }
 
 function DappTransferModal({
@@ -53,6 +54,7 @@ function DappTransferModal({
   hardwareState,
   isLedgerConnected,
   isTonAppConnected,
+  isMediaViewerOpen,
 }: StateProps) {
   const {
     setDappTransferScreen,
@@ -133,7 +135,7 @@ function DappTransferModal({
   function renderPassword(isActive: boolean) {
     return (
       <>
-        {!IS_CAPACITOR && <ModalHeader title={lang('Confirm Operation')} onClose={closeDappTransfer} />}
+        {!IS_CAPACITOR && <ModalHeader title={lang('Confirm Action')} onClose={closeDappTransfer} />}
         <PasswordForm
           isActive={isActive}
           isLoading={isLoading}
@@ -237,7 +239,7 @@ function DappTransferModal({
   return (
     <Modal
       hasCloseButton
-      isOpen={isOpen}
+      isOpen={isOpen && !isMediaViewerOpen}
       noBackdropClose
       dialogClassName={buildClassName(styles.modalDialog, withPayloadWarning && styles.modalDialogExtraHeight)}
       nativeBottomSheetKey="dapp-transfer"
@@ -272,5 +274,6 @@ export default memo(withGlobal((global): StateProps => {
     hardwareState,
     isLedgerConnected,
     isTonAppConnected,
+    isMediaViewerOpen: Boolean(global.mediaViewer.mediaId),
   };
 })(DappTransferModal));
diff --git a/src/components/main/Main.tsx b/src/components/main/Main.tsx
index d26831be..9a293d07 100644
--- a/src/components/main/Main.tsx
+++ b/src/components/main/Main.tsx
@@ -14,14 +14,16 @@ import { setStatusBarStyle } from '../../util/switchTheme';
 import { IS_DELEGATED_BOTTOM_SHEET, IS_TOUCH_ENV, REM } from '../../util/windowEnvironment';
 import windowSize from '../../util/windowSize';
 
+import useBackgroundMode, { isBackgroundModeActive } from '../../hooks/useBackgroundMode';
 import { useOpenFromMainBottomSheet } from '../../hooks/useDelegatedBottomSheet';
 import { useDeviceScreen } from '../../hooks/useDeviceScreen';
 import useEffectOnce from '../../hooks/useEffectOnce';
+import useFlag from '../../hooks/useFlag';
+import useInterval from '../../hooks/useInterval';
 import useLastCallback from '../../hooks/useLastCallback';
 import usePreventPinchZoomGesture from '../../hooks/usePreventPinchZoomGesture';
 import useShowTransition from '../../hooks/useShowTransition';
 
-import MediaViewer from '../mediaViewer/MediaViewer';
 import ReceiveModal from '../receive/ReceiveModal';
 import StakeModal from '../staking/StakeModal';
 import StakingInfoModal from '../staking/StakingInfoModal';
@@ -54,6 +56,8 @@ type StateProps = {
 };
 
 const STICKY_CARD_INTERSECTION_THRESHOLD = -3.75 * REM;
+const UPDATE_SWAPS_INTERVAL_NOT_FOCUSED = 15000; // 15 sec
+const UPDATE_SWAPS_INTERVAL = 3000; // 3 sec
 
 function Main({
   isActive,
@@ -77,6 +81,7 @@ function Main({
     setLandscapeActionsActiveTabIndex,
     loadExploreSites,
     openReceiveModal,
+    updatePendingSwaps,
   } = getActions();
 
   // eslint-disable-next-line no-null/no-null
@@ -86,6 +91,9 @@ function Main({
   const [canRenderStickyCard, setCanRenderStickyCard] = useState(false);
   const [shouldRenderDarkStatusBar, setShouldRenderDarkStatusBar] = useState(false);
   const safeAreaTop = IS_CAPACITOR ? getStatusBarHeight() : windowSize.get().safeAreaTop;
+  const [isFocused, markIsFocused, unmarkIsFocused] = useFlag(!isBackgroundModeActive());
+
+  useBackgroundMode(unmarkIsFocused, markIsFocused);
 
   useOpenFromMainBottomSheet('receive', openReceiveModal);
   usePreventPinchZoomGesture(isMediaViewerOpen);
@@ -102,6 +110,8 @@ function Main({
     setStatusBarStyle(shouldRenderDarkStatusBar);
   }, [shouldRenderDarkStatusBar]);
 
+  useInterval(updatePendingSwaps, isFocused ? UPDATE_SWAPS_INTERVAL : UPDATE_SWAPS_INTERVAL_NOT_FOCUSED);
+
   useEffect(() => {
     if (!isPortrait || !isActive) {
       setCanRenderStickyCard(false);
@@ -229,7 +239,6 @@ function Main({
       <StakingInfoModal isOpen={isStakingInfoModalOpen} onClose={closeStakingInfo} />
       <ReceiveModal />
       <UnstakeModal />
-      <MediaViewer />
       {IS_ANDROID_DIRECT && <UpdateAvailable />}
       <VestingModal />
       <VestingPasswordModal />
diff --git a/src/components/main/modals/TransactionModal.tsx b/src/components/main/modals/TransactionModal.tsx
index 4ad85486..a1fe4fdc 100644
--- a/src/components/main/modals/TransactionModal.tsx
+++ b/src/components/main/modals/TransactionModal.tsx
@@ -60,6 +60,7 @@ type StateProps = {
   isUnstakeRequested?: boolean;
   isLongUnstakeRequested?: boolean;
   stakingStatus?: StakingStatus;
+  isMediaViewerOpen?: boolean;
 };
 const enum SLIDES {
   initial,
@@ -76,6 +77,7 @@ function TransactionModal({
   isUnstakeRequested,
   isLongUnstakeRequested,
   stakingStatus,
+  isMediaViewerOpen,
 }: StateProps) {
   const {
     startTransfer,
@@ -113,7 +115,11 @@ function TransactionModal({
   const [, transactionHash] = (id || '').split(':');
   const isStaking = renderedTransaction?.type === 'stake' || renderedTransaction?.type === 'unstake';
   const isUnstaking = renderedTransaction?.type === 'unstake';
-  const isNftTransfer = renderedTransaction?.type === 'nftTransferred' || renderedTransaction?.type === 'nftReceived';
+  const isNftTransfer = (
+    renderedTransaction?.type === 'nftTransferred'
+    || renderedTransaction?.type === 'nftReceived'
+    || Boolean(renderedTransaction?.nft)
+  );
 
   const token = slug ? tokensBySlug?.[slug] : undefined;
   const address = isIncoming ? fromAddress : toAddress;
@@ -443,7 +449,6 @@ function TransactionModal({
               isActive={isActive}
               error={passwordError}
               withCloseButton={IS_CAPACITOR}
-              operationType="transfer"
               containerClassName={IS_CAPACITOR ? styles.passwordFormContent : styles.passwordFormContentInModal}
               submitLabel={lang('Send')}
               onSubmit={handlePasswordSubmit}
@@ -457,7 +462,7 @@ function TransactionModal({
 
   return (
     <Modal
-      isOpen={Boolean(transaction)}
+      isOpen={Boolean(transaction) && !isMediaViewerOpen}
       hasCloseButton
       nativeBottomSheetKey="transaction-info"
       forceFullNative={currentSlide === SLIDES.password}
@@ -501,6 +506,7 @@ export default memo(
       isUnstakeRequested: accountState?.staking?.isUnstakeRequested,
       isLongUnstakeRequested: accountState?.isLongUnstakeRequested,
       stakingStatus,
+      isMediaViewerOpen: Boolean(global.mediaViewer.mediaId),
     };
   })(TransactionModal),
 );
diff --git a/src/components/main/modals/UnhideNftModal.tsx b/src/components/main/modals/UnhideNftModal.tsx
index 4e944267..5420f807 100644
--- a/src/components/main/modals/UnhideNftModal.tsx
+++ b/src/components/main/modals/UnhideNftModal.tsx
@@ -1,5 +1,7 @@
 import React, { memo } from '../../../lib/teact/teact';
-import { getActions } from '../../../global';
+import { getActions, withGlobal } from '../../../global';
+
+import { selectCurrentAccountState } from '../../../global/selectors';
 
 import useLang from '../../../hooks/useLang';
 import useLastCallback from '../../../hooks/useLastCallback';
@@ -9,40 +11,38 @@ import Modal from '../../ui/Modal';
 
 import modalStyles from '../../ui/Modal.module.scss';
 
-interface OwnProps {
+interface StateProps {
   isOpen?: boolean;
   nftAddress?: string;
   nftName?: string;
-  onClose: NoneToVoidFunction;
 }
 
 function UnhideNftModal({
   isOpen,
   nftAddress,
   nftName,
-  onClose,
-}: OwnProps) {
-  const { addNftsToWhitelist } = getActions();
+}: StateProps) {
+  const { addNftsToWhitelist, closeUnhideNftModal } = getActions();
 
   const lang = useLang();
 
   const handleUnhide = useLastCallback(() => {
     addNftsToWhitelist({ addresses: [nftAddress!] });
-    onClose();
+    closeUnhideNftModal();
   });
 
   return (
     <Modal
       isOpen={isOpen}
       isCompact
-      onClose={onClose}
+      onClose={closeUnhideNftModal}
       title={lang('Unhide NFT')}
     >
       <p className={modalStyles.text}>
         {lang('$unhide_nft_warning', { name: <b>{nftName}</b> })}
       </p>
       <div className={modalStyles.buttons}>
-        <Button onClick={onClose} className={modalStyles.button}>{lang('Cancel')}</Button>
+        <Button onClick={closeUnhideNftModal} className={modalStyles.button}>{lang('Cancel')}</Button>
         <Button isDestructive onClick={handleUnhide} className={modalStyles.button}>
           {lang('Unhide')}
         </Button>
@@ -51,4 +51,15 @@ function UnhideNftModal({
   );
 }
 
-export default memo(UnhideNftModal);
+export default memo(withGlobal((global): StateProps => {
+  const {
+    isUnhideNftModalOpen,
+    selectedNftToUnhide,
+  } = selectCurrentAccountState(global) ?? {};
+
+  return {
+    isOpen: isUnhideNftModalOpen,
+    nftAddress: selectedNftToUnhide?.address,
+    nftName: selectedNftToUnhide?.name,
+  };
+})(UnhideNftModal));
diff --git a/src/components/main/sections/Content/Activities.tsx b/src/components/main/sections/Content/Activities.tsx
index 7da0a42c..81f3a9a3 100644
--- a/src/components/main/sections/Content/Activities.tsx
+++ b/src/components/main/sections/Content/Activities.tsx
@@ -8,7 +8,7 @@ import type { ApiActivity, ApiSwapAsset, ApiToken } from '../../../../api/types'
 import { ContentTab } from '../../../../global/types';
 
 import { ANIMATED_STICKER_BIG_SIZE_PX, MIN_ASSETS_TAB_VIEW, TONCOIN_SLUG } from '../../../../config';
-import { getIsSwapId, getIsTinyTransaction, getIsTxIdLocal } from '../../../../global/helpers';
+import { getIsSwapId, getIsTinyOrScamTransaction, getIsTxIdLocal } from '../../../../global/helpers';
 import {
   selectAccountSettings,
   selectCurrentAccountState,
@@ -161,7 +161,7 @@ function Activities({
             && (!slug || activity.slug === slug)
             && (
               !areTinyTransfersHidden
-              || !getIsTinyTransaction(activity, tokensBySlug![activity.slug])
+              || !getIsTinyOrScamTransaction(activity, tokensBySlug![activity.slug])
               || exceptionSlugs?.includes(activity.slug)
             ),
           );
@@ -236,14 +236,18 @@ function Activities({
       const activityDayStart = getDayStartAt(activity.timestamp);
       const isNewDay = lastActivityDayStart !== activityDayStart;
       const isNftTransfer = activity.kind === 'transaction'
-        && (activity.type === 'nftTransferred' || activity.type === 'nftReceived');
+        && (
+          activity.type === 'nftTransferred'
+          || activity.type === 'nftReceived'
+          || Boolean(activity.nft)
+        );
       const canCountComment = activity.kind === 'transaction' && (!activity.type || isNftTransfer);
       if (isNewDay) {
         lastActivityDayStart = activityDayStart;
         dateCount += 1;
       }
 
-      if (canCountComment && (activity.comment || activity.encryptedComment)) {
+      if (canCountComment && (activity.comment || activity.encryptedComment) && !activity.metadata?.isScam) {
         commentCount += 1;
       }
 
diff --git a/src/components/main/sections/Content/Content.module.scss b/src/components/main/sections/Content/Content.module.scss
index 28833311..46f1a6f4 100644
--- a/src/components/main/sections/Content/Content.module.scss
+++ b/src/components/main/sections/Content/Content.module.scss
@@ -41,7 +41,22 @@
     top: 3.75rem;
 
     width: 100%;
+    max-width: 27rem;
     margin: 0 auto;
+
+    :global(html.with-safe-area-top) & {
+      top: 2.625rem;
+    }
+
+    // Fix for opera, dead zone of 37 pixels in extension window on windows
+    :global(html.is-windows.is-opera.is-extension) & {
+      top: 4.75rem;
+    }
+
+    // Sticky header height - electron header height
+    :global(html.is-electron) & {
+      top: 0.75rem;
+    }
   }
 }
 
@@ -49,51 +64,27 @@
   height: 2.75rem;
   padding: 0 1.5rem;
 
-  .landscapeContainer & {
-    justify-content: flex-start;
+  &::after {
+    content: '';
 
-    padding: 0 0.75rem;
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translate(-50%, -0.03125rem);
+
+    width: 100vw;
+    height: 0.0625rem;
 
-    border-radius: var(--border-radius-default) var(--border-radius-default) 0 0;
     /* stylelint-disable-next-line plugin/whole-pixel */
     box-shadow: 0 0.025rem 0 0 var(--color-separator);
   }
 
-  .portraitContainer & {
-    position: sticky;
-    top: 3.75rem;
-
-    width: 100%;
-    max-width: 27rem;
-
-    &::after {
-      content: '';
-
-      position: absolute;
-      bottom: 0;
-      left: 50%;
-      transform: translate(-50%, -0.015625rem);
-
-      width: 100vw;
-      height: 0.0625rem;
-
-      /* stylelint-disable-next-line plugin/whole-pixel */
-      box-shadow: 0 0.025rem 0 0 var(--color-separator);
-    }
-
-    :global(html.with-safe-area-top) & {
-      top: 2.625rem;
-    }
+  .landscapeContainer & {
+    justify-content: flex-start;
 
-    // Fix for opera, dead zone of 37 pixels in extension window on windows
-    :global(html.is-windows.is-opera.is-extension) & {
-      top: 4.75rem;
-    }
+    padding: 0 0.75rem;
 
-    // Sticky header height - electron header height
-    :global(html.is-electron) & {
-      top: 0.75rem;
-    }
+    border-radius: var(--border-radius-default) var(--border-radius-default) 0 0;
   }
 }
 
diff --git a/src/components/main/sections/Content/NftCollectionHeader.module.scss b/src/components/main/sections/Content/NftCollectionHeader.module.scss
index 2b35bbb0..31dc817c 100644
--- a/src/components/main/sections/Content/NftCollectionHeader.module.scss
+++ b/src/components/main/sections/Content/NftCollectionHeader.module.scss
@@ -7,8 +7,21 @@
 
   background: var(--color-background-first);
   border-radius: var(--border-radius-default) var(--border-radius-default) 0 0;
-  /* stylelint-disable-next-line plugin/whole-pixel */
-  box-shadow: 0 0.025rem 0 0 var(--color-separator);
+
+  &::after {
+    content: '';
+
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translate(-50%, -0.03125rem);
+
+    width: 100vw;
+    height: 0.0625rem;
+
+    /* stylelint-disable-next-line plugin/whole-pixel */
+    box-shadow: 0 0.025rem 0 0 var(--color-separator);
+  }
 }
 
 .backButton {
diff --git a/src/components/main/sections/Content/NftMenu.tsx b/src/components/main/sections/Content/NftMenu.tsx
index 2361398e..702afe1a 100644
--- a/src/components/main/sections/Content/NftMenu.tsx
+++ b/src/components/main/sections/Content/NftMenu.tsx
@@ -1,8 +1,10 @@
-import React, { memo, useRef } from '../../../../lib/teact/teact';
+import React, { memo, useMemo, useRef } from '../../../../lib/teact/teact';
+import { withGlobal } from '../../../../global';
 
 import type { ApiNft } from '../../../../api/types';
 import type { IAnchorPosition } from '../../../../global/types';
 
+import { selectCurrentAccountState } from '../../../../global/selectors';
 import buildClassName from '../../../../util/buildClassName';
 import stopEvent from '../../../../util/stopEvent';
 
@@ -21,10 +23,22 @@ interface OwnProps {
   onClose: NoneToVoidFunction;
 }
 
+interface StateProps {
+  blacklistedNftAddresses?: string[];
+  whitelistedNftAddresses?: string[];
+}
+
 function NftMenu({
-  nft, menuPosition, onOpen, onClose,
-}: OwnProps) {
-  const { menuItems, handleMenuItemSelect } = useNftMenu(nft);
+  nft, menuPosition, onOpen, onClose, blacklistedNftAddresses, whitelistedNftAddresses,
+}: OwnProps & StateProps) {
+  const isNftBlackListed = useMemo(() => {
+    return blacklistedNftAddresses?.includes(nft.address);
+  }, [nft, blacklistedNftAddresses]);
+  const isNftWhiteListed = useMemo(() => {
+    return whitelistedNftAddresses?.includes(nft.address);
+  }, [nft, whitelistedNftAddresses]);
+
+  const { menuItems, handleMenuItemSelect } = useNftMenu(nft, isNftBlackListed, isNftWhiteListed);
   // eslint-disable-next-line no-null/no-null
   const ref = useRef<HTMLButtonElement>(null);
   const isOpen = Boolean(menuPosition);
@@ -78,4 +92,11 @@ function NftMenu({
   );
 }
 
-export default memo(NftMenu);
+export default memo(withGlobal((global): StateProps => {
+  const accountState = selectCurrentAccountState(global) || {};
+  const { blacklistedNftAddresses, whitelistedNftAddresses } = accountState;
+  return {
+    blacklistedNftAddresses,
+    whitelistedNftAddresses,
+  };
+})(NftMenu));
diff --git a/src/components/main/sections/Content/Transaction.tsx b/src/components/main/sections/Content/Transaction.tsx
index 7ff66154..254c67a9 100644
--- a/src/components/main/sections/Content/Transaction.tsx
+++ b/src/components/main/sections/Content/Transaction.tsx
@@ -1,7 +1,9 @@
 import type { Ref, RefObject } from 'react';
 import React, { memo } from '../../../../lib/teact/teact';
+import { getActions } from '../../../../global';
 
 import type { ApiToken, ApiTransactionActivity } from '../../../../api/types';
+import { MediaType } from '../../../../global/types';
 
 import { TON_SYMBOL } from '../../../../config';
 import { getIsTxIdLocal } from '../../../../global/helpers';
@@ -42,6 +44,7 @@ function Transaction({
   isLast,
   onClick,
 }: OwnProps) {
+  const { openMediaViewer } = getActions();
   const lang = useLang();
 
   const {
@@ -63,7 +66,7 @@ function Transaction({
   const isUnstake = type === 'unstake';
   const isUnstakeRequest = type === 'unstakeRequest';
   const isStaking = isStake || isUnstake || isUnstakeRequest;
-  const isNftTransfer = type === 'nftTransferred' || type === 'nftReceived';
+  const isNftTransfer = type === 'nftTransferred' || type === 'nftReceived' || Boolean(nft);
 
   const token = tokensBySlug?.[slug];
   const address = isIncoming ? fromAddress : toAddress;
@@ -75,6 +78,11 @@ function Transaction({
     onClick(txId);
   });
 
+  const handleNftClick = useLastCallback((event: React.MouseEvent) => {
+    event.stopPropagation();
+    openMediaViewer({ mediaId: nft!.address, mediaType: MediaType.Nft, txId });
+  });
+
   function getOperationName() {
     if (isStake) {
       return 'Staked';
@@ -93,7 +101,17 @@ function Transaction({
 
   function renderNft() {
     return (
-      <div className={buildClassName(styles.nft, isIncoming && styles.received, comment && styles.nftWithComment)}>
+      <div
+        className={buildClassName(
+          styles.nft,
+          isIncoming && styles.received,
+          comment && styles.nftWithComment,
+          'transaction-nft',
+        )}
+        onClick={handleNftClick}
+        data-nft-address={nft?.address}
+        data-tx-id={txId}
+      >
         <img src={nft!.thumbnail} alt={nft!.name} className={styles.nftImage} />
         <div className={styles.nftData}>
           <div className={styles.nftName}>{nft!.name}</div>
diff --git a/src/components/mediaViewer/Actions.tsx b/src/components/mediaViewer/Actions.tsx
index ca228d6c..6d86d4d5 100644
--- a/src/components/mediaViewer/Actions.tsx
+++ b/src/components/mediaViewer/Actions.tsx
@@ -1,4 +1,4 @@
-import React, { memo } from '../../lib/teact/teact';
+import React, { memo, useMemo } from '../../lib/teact/teact';
 import { withGlobal } from '../../global';
 
 import type { ApiNft } from '../../api/types';
@@ -24,13 +24,24 @@ type OwnProps = {
 
 type StateProps = {
   nft?: ApiNft;
+  blacklistedNftAddresses?: string[];
+  whitelistedNftAddresses?: string[];
 };
 
-function Actions({ onClose, nft }: StateProps & OwnProps) {
+function Actions({
+  onClose, nft, blacklistedNftAddresses, whitelistedNftAddresses,
+}: StateProps & OwnProps) {
   const lang = useLang();
   const [isMenuOpen, openMenu, closeMenu] = useFlag();
 
-  const { menuItems, handleMenuItemSelect } = useNftMenu(nft);
+  const isNftBlackListed = useMemo(() => {
+    return blacklistedNftAddresses?.includes(nft!.address);
+  }, [nft, blacklistedNftAddresses]);
+  const isNftWhiteListed = useMemo(() => {
+    return whitelistedNftAddresses?.includes(nft!.address);
+  }, [nft, whitelistedNftAddresses]);
+
+  const { menuItems, handleMenuItemSelect } = useNftMenu(nft, isNftBlackListed, isNftWhiteListed);
 
   const handleSelect = useLastCallback((value: string) => {
     if (value === 'send') {
@@ -83,7 +94,9 @@ export default memo(withGlobal<OwnProps>((global, { mediaId }): StateProps => {
   const nft = byAddress?.[mediaId];
   if (!nft) return {};
 
+  const { blacklistedNftAddresses, whitelistedNftAddresses } = selectCurrentAccountState(global) || {};
+
   return {
-    nft,
+    nft, blacklistedNftAddresses, whitelistedNftAddresses,
   };
 })(Actions));
diff --git a/src/components/mediaViewer/Media.tsx b/src/components/mediaViewer/Media.tsx
index 069b9429..de3e644b 100644
--- a/src/components/mediaViewer/Media.tsx
+++ b/src/components/mediaViewer/Media.tsx
@@ -1,4 +1,6 @@
-import React, { memo, useEffect, useRef } from '../../lib/teact/teact';
+import React, {
+  memo, useEffect, useMemo, useRef,
+} from '../../lib/teact/teact';
 import { withGlobal } from '../../global';
 
 import { MediaType } from '../../global/types';
@@ -8,9 +10,12 @@ import { selectCurrentAccountState } from '../../global/selectors';
 import buildClassName from '../../util/buildClassName';
 
 import { useDeviceScreen } from '../../hooks/useDeviceScreen';
+import useLang from '../../hooks/useLang';
 
 import styles from './MediaViewer.module.scss';
 
+import scamImg from '../../assets/scam.svg';
+
 interface OwnProps {
   // eslint-disable-next-line react/no-unused-prop-types
   mediaId: string;
@@ -21,11 +26,14 @@ interface StateProps {
   thumbnail?: string;
   image?: string;
   description?: string;
+  isScam?: boolean;
+  whitelistedMediaIds?: string[];
 }
 
 function Media({
-  alt, thumbnail, image, description,
+  mediaId, alt, thumbnail, image, description, isScam, whitelistedMediaIds,
 }: OwnProps & StateProps) {
+  const lang = useLang();
   const src = image || thumbnail;
   // eslint-disable-next-line no-null/no-null
   const ref = useRef<HTMLDivElement | null>(null);
@@ -40,6 +48,10 @@ function Media({
     });
   }, [isPortrait]);
 
+  const isNftWhiteListed = useMemo(() => {
+    return whitelistedMediaIds?.includes(mediaId);
+  }, [mediaId, whitelistedMediaIds]);
+
   return (
     <div className={styles.content}>
       <img src={src} alt={alt} className={styles.image} />
@@ -47,6 +59,7 @@ function Media({
         {description && (
           <div className={styles.contentTextWrapper}>
             <div className={buildClassName(styles.contentText, 'custom-scroll')} dir="auto">
+              {isScam && !isNftWhiteListed && <img src={scamImg} alt={lang('Scam')} className={styles.scamImage} />}
               {description}
             </div>
           </div>
@@ -65,10 +78,14 @@ export default memo(withGlobal<OwnProps>((global, { mediaId }): StateProps => {
   const nft = byAddress?.[mediaId];
   if (!nft) return {};
 
+  const { whitelistedNftAddresses } = selectCurrentAccountState(global) || {};
+
   return {
     alt: nft.name,
     thumbnail: nft.thumbnail,
     image: nft.image,
     description: nft.description,
+    isScam: nft.isScam,
+    whitelistedMediaIds: whitelistedNftAddresses,
   };
 })(Media));
diff --git a/src/components/mediaViewer/MediaViewer.module.scss b/src/components/mediaViewer/MediaViewer.module.scss
index 69e9b13d..dbeb2f4c 100644
--- a/src/components/mediaViewer/MediaViewer.module.scss
+++ b/src/components/mediaViewer/MediaViewer.module.scss
@@ -480,3 +480,8 @@
 
   object-fit: cover;
 }
+
+.scamImage {
+  width: 2.375rem;
+  margin-right: 0.25rem;
+}
diff --git a/src/components/mediaViewer/MediaViewer.tsx b/src/components/mediaViewer/MediaViewer.tsx
index 03396947..ee23a955 100644
--- a/src/components/mediaViewer/MediaViewer.tsx
+++ b/src/components/mediaViewer/MediaViewer.tsx
@@ -28,6 +28,9 @@ import styles from './MediaViewer.module.scss';
 
 interface StateProps {
   mediaId?: string;
+  txId?: string;
+  hiddenNfts?: 'user' | 'scam';
+  noGhostAnimation?: boolean;
   mediaIds: string[];
   mediaUrl?: string;
   mediaType: MediaType;
@@ -37,16 +40,19 @@ interface StateProps {
 }
 
 function MediaViewer({
-  mediaId, mediaIds, mediaType, mediaUrl, withAnimation, mediaByIds, blacklistedIds,
+  mediaId, mediaIds, mediaType, mediaUrl, withAnimation, mediaByIds, blacklistedIds, txId, hiddenNfts, noGhostAnimation,
 }: StateProps) {
   const { closeMediaViewer, openMediaViewer } = getActions();
 
   const isOpen = Boolean(mediaId);
   const lang = useLang();
   const prevMediaId = usePrevious(mediaId);
+  const prevTxId = usePrevious(txId);
+  const prevHiddenNfts = usePrevious(hiddenNfts);
+  const prevNoGhostAnimation = usePrevious(noGhostAnimation);
   const headerAnimation = withAnimation ? 'slideFade' : 'none';
-  const shouldAnimateOpening = withAnimation && isOpen && !prevMediaId;
-  const shouldAnimateClosing = withAnimation && !isOpen && !!prevMediaId;
+  const shouldAnimateOpening = withAnimation && isOpen && !prevMediaId && !noGhostAnimation;
+  const shouldAnimateClosing = withAnimation && !isOpen && !!prevMediaId && !prevNoGhostAnimation;
 
   const handleClose = useLastCallback(() => closeMediaViewer());
 
@@ -80,13 +86,24 @@ function MediaViewer({
   useEffect(() => {
     if (shouldAnimateOpening) {
       dispatchHeavyAnimationEvent(ANIMATION_DURATION + ANIMATION_END_DELAY);
-      animateOpening(mediaType, mediaId, mediaUrl);
+      animateOpening(mediaType, mediaId, mediaUrl, txId, hiddenNfts);
     }
     if (shouldAnimateClosing) {
       dispatchHeavyAnimationEvent(ANIMATION_DURATION + ANIMATION_END_DELAY);
-      animateClosing(mediaType, prevMediaId);
+      animateClosing(mediaType, prevMediaId, prevTxId, prevHiddenNfts);
     }
-  }, [shouldAnimateOpening, shouldAnimateClosing, mediaId, mediaType, mediaUrl, prevMediaId]);
+  }, [
+    shouldAnimateOpening,
+    shouldAnimateClosing,
+    mediaId,
+    mediaType,
+    mediaUrl,
+    prevMediaId,
+    txId,
+    prevTxId,
+    hiddenNfts,
+    prevHiddenNfts,
+  ]);
 
   return (
     <ShowTransition
@@ -114,7 +131,9 @@ function MediaViewer({
 }
 
 export default memo(withGlobal((global): StateProps => {
-  const { mediaId, mediaType = MediaType.Nft } = global.mediaViewer || {};
+  const {
+    mediaId, mediaType = MediaType.Nft, txId, hiddenNfts, noGhostAnimation,
+  } = global.mediaViewer || {};
   const animationLevel = global.settings?.animationLevel;
   const accountState = selectCurrentAccountState(global);
 
@@ -137,6 +156,9 @@ export default memo(withGlobal((global): StateProps => {
 
   return {
     mediaId,
+    txId,
+    hiddenNfts,
+    noGhostAnimation,
     mediaIds,
     mediaType,
     mediaUrl,
diff --git a/src/components/mediaViewer/helpers/ghostAnimation.ts b/src/components/mediaViewer/helpers/ghostAnimation.ts
index f02614f9..718196cd 100644
--- a/src/components/mediaViewer/helpers/ghostAnimation.ts
+++ b/src/components/mediaViewer/helpers/ghostAnimation.ts
@@ -15,8 +15,10 @@ export const ANIMATION_DURATION = 200;
 // Header height + bottom padding, keep in sync with styles.image max-height
 const OCCUPIED_HEIGHT = 14 * REM;
 
-export function animateOpening(type: MediaType, mediaId: string, mediaUrl?: string) {
-  const { image: fromImage } = getNode(type, mediaId);
+export function animateOpening(
+  type: MediaType, mediaId: string, mediaUrl?: string, txId?: string, hiddenNfts?: 'user' | 'scam',
+) {
+  const { image: fromImage } = getNode(type, mediaId, txId, hiddenNfts);
   if (!fromImage || !mediaUrl) {
     return;
   }
@@ -79,8 +81,8 @@ export function animateOpening(type: MediaType, mediaId: string, mediaUrl?: stri
   });
 }
 
-export function animateClosing(type: MediaType, mediaId: string) {
-  const { container, image: toImage } = getNode(type, mediaId);
+export function animateClosing(type: MediaType, mediaId: string, txId?: string, hiddenNfts?: 'user' | 'scam') {
+  const { container, image: toImage } = getNode(type, mediaId, txId, hiddenNfts);
   const fromImage = document.querySelector<HTMLImageElement>(`.${styles.slide_active} img`);
   if (!fromImage || !toImage) {
     return;
@@ -165,12 +167,16 @@ export function animateClosing(type: MediaType, mediaId: string) {
   });
 }
 
-function getNode(type: MediaType, mediaId: string) {
+function getNode(type: MediaType, mediaId: string, txId?: string, hiddenNfts?: 'user' | 'scam') {
   let image: HTMLImageElement | undefined;
   let container: HTMLElement | undefined;
   if (type === MediaType.Nft) {
     container = document.querySelector(
-      `.nfts-container > .Transition_slide-active [data-nft-address="${mediaId}"]`,
+      txId
+        ? `.transaction-nft[data-tx-id="${txId}"][data-nft-address="${mediaId}"]`
+        : hiddenNfts
+          ? `.hidden-nfts-${hiddenNfts} [data-nft-address="${mediaId}"]`
+          : `.nfts-container > .Transition_slide-active [data-nft-address="${mediaId}"]`,
     ) as HTMLElement;
     image = container?.querySelector('img') as HTMLImageElement;
   }
diff --git a/src/components/mediaViewer/hooks/useNftMenu.ts b/src/components/mediaViewer/hooks/useNftMenu.ts
index 84e0fae1..af658548 100644
--- a/src/components/mediaViewer/hooks/useNftMenu.ts
+++ b/src/components/mediaViewer/hooks/useNftMenu.ts
@@ -54,6 +54,14 @@ const HIDE_ITEM: DropdownItem = {
   name: 'Hide',
   value: 'hide',
 };
+const NOT_A_SCAM: DropdownItem = {
+  name: 'Not a Scam',
+  value: 'not_a_scam',
+};
+const UNHIDE: DropdownItem = {
+  name: 'Unhide',
+  value: 'unhide',
+};
 const BURN_ITEM: DropdownItem = {
   name: 'Burn',
   value: 'burn',
@@ -65,9 +73,16 @@ const SELECT_ITEM: DropdownItem = {
   withSeparator: true,
 };
 
-export default function useNftMenu(nft?: ApiNft) {
+export default function useNftMenu(nft?: ApiNft, isNftBlacklisted?: boolean, isNftWhitelisted?: boolean) {
   const {
-    startTransfer, selectNfts, openNftCollection, burnNfts, addNftsToBlacklist,
+    startTransfer,
+    selectNfts,
+    openNftCollection,
+    burnNfts,
+    addNftsToBlacklist,
+    addNftsToWhitelist,
+    closeMediaViewer,
+    openUnhideNftModal,
   } = getActions();
 
   const handleMenuItemSelect = useLastCallback((value: string) => {
@@ -78,6 +93,8 @@ export default function useNftMenu(nft?: ApiNft) {
           isPortrait: getIsPortrait(),
           nfts: [nft!],
         });
+        closeMediaViewer();
+
         break;
       }
 
@@ -125,12 +142,27 @@ export default function useNftMenu(nft?: ApiNft) {
 
       case 'hide': {
         addNftsToBlacklist({ addresses: [nft!.address] });
+        closeMediaViewer();
+
+        break;
+      }
+
+      case 'not_a_scam': {
+        openUnhideNftModal({ address: nft!.address, name: nft!.name });
+
+        break;
+      }
+
+      case 'unhide': {
+        addNftsToWhitelist({ addresses: [nft!.address] });
+        closeMediaViewer();
 
         break;
       }
 
       case 'burn': {
         burnNfts({ nfts: [nft!] });
+        closeMediaViewer();
 
         break;
       }
@@ -152,13 +184,15 @@ export default function useNftMenu(nft?: ApiNft) {
       GETGEMS_ITEM,
       TON_EXPLORER_ITEM,
       ...(nft.collectionAddress ? [COLLECTION_ITEM] : []),
-      HIDE_ITEM,
+      ...((!nft.isScam && !isNftBlacklisted) || isNftWhitelisted ? [HIDE_ITEM] : []),
+      ...(nft.isScam && !isNftWhitelisted ? [NOT_A_SCAM] : []),
+      ...(!nft.isScam && isNftBlacklisted ? [UNHIDE] : []),
       ...(!nft.isOnSale ? [
         BURN_ITEM,
         SELECT_ITEM,
       ] : []),
     ];
-  }, [nft]);
+  }, [nft, isNftBlacklisted, isNftWhitelisted]);
 
   return { menuItems, handleMenuItemSelect };
 }
diff --git a/src/components/settings/SettingsAssets.tsx b/src/components/settings/SettingsAssets.tsx
index d2c8832c..51323b29 100644
--- a/src/components/settings/SettingsAssets.tsx
+++ b/src/components/settings/SettingsAssets.tsx
@@ -118,12 +118,11 @@ function SettingsAssets({
   } = useMemo(() => {
     const nfts = Object.values(nftsByAddress || {});
     const blacklistedNftAddressesSet = new Set(blacklistedNftAddresses);
-    const hiddenByUserNfts = nfts.filter((nft) => blacklistedNftAddressesSet.has(nft.address));
-    const probablyScamNfts = nfts.filter((nft) => nft.isHidden);
+    const hiddenNfts = new Set(nfts.filter((nft) => blacklistedNftAddressesSet.has(nft.address) || nft.isHidden));
 
     return {
-      shouldRenderHiddenNftsSection: hiddenByUserNfts.length > 0 || probablyScamNfts.length > 0,
-      hiddenNftsCount: hiddenByUserNfts.length,
+      shouldRenderHiddenNftsSection: Boolean(hiddenNfts.size),
+      hiddenNftsCount: hiddenNfts.size,
     };
   }, [nftsByAddress, blacklistedNftAddresses]);
 
diff --git a/src/components/settings/SettingsHiddenNfts.tsx b/src/components/settings/SettingsHiddenNfts.tsx
index 62b0dc33..347fbd11 100644
--- a/src/components/settings/SettingsHiddenNfts.tsx
+++ b/src/components/settings/SettingsHiddenNfts.tsx
@@ -1,20 +1,21 @@
-import React, { memo, useMemo, useState } from '../../lib/teact/teact';
-import { getActions, withGlobal } from '../../global';
+import React, { memo, useMemo } from '../../lib/teact/teact';
+import { withGlobal } from '../../global';
 
 import type { ApiNft } from '../../api/types';
 
 import { selectCurrentAccountState } from '../../global/selectors';
 import buildClassName from '../../util/buildClassName';
+import { IS_DELEGATED_BOTTOM_SHEET, IS_DELEGATING_BOTTOM_SHEET, IS_ELECTRON } from '../../util/windowEnvironment';
 
+import { useDeviceScreen } from '../../hooks/useDeviceScreen';
 import useHistoryBack from '../../hooks/useHistoryBack';
 import useLang from '../../hooks/useLang';
-import useLastCallback from '../../hooks/useLastCallback';
 import useScrolledState from '../../hooks/useScrolledState';
 
-import UnhideNftModal from '../main/modals/UnhideNftModal';
 import Button from '../ui/Button';
 import ModalHeader from '../ui/ModalHeader';
-import Switcher from '../ui/Switcher';
+import HiddenByUserNft from './nfts/HiddenByUserNft';
+import ProbablyScamNft from './nfts/ProbablyScamNft';
 
 import styles from './Settings.module.scss';
 
@@ -29,7 +30,6 @@ interface StateProps {
   whitelistedNftAddresses?: string[];
   orderedAddresses?: string[];
   byAddress?: Record<string, ApiNft>;
-  isUnhideNftModalOpen?: boolean;
 }
 
 function SettingsHiddenNfts({
@@ -40,14 +40,7 @@ function SettingsHiddenNfts({
   whitelistedNftAddresses,
   orderedAddresses,
   byAddress,
-  isUnhideNftModalOpen,
 }: OwnProps & StateProps) {
-  const {
-    openUnhideNftModal,
-    removeNftSpecialStatus,
-    closeUnhideNftModal,
-  } = getActions();
-
   const lang = useLang();
 
   useHistoryBack({
@@ -85,44 +78,15 @@ function SettingsHiddenNfts({
     return new Set(whitelistedNftAddresses);
   }, [whitelistedNftAddresses]);
 
-  const [selectedNft, setSelectedNft] = useState<{ address: string; name: string } | undefined>();
-
-  const handleProbablyScamNftClick = useLastCallback((nft: ApiNft) => {
-    const isWhitelisted = whitelistedNftAddressesSet?.has(nft.address);
-    if (isWhitelisted) {
-      removeNftSpecialStatus({ address: nft.address });
-    } else {
-      setSelectedNft({ address: nft.address, name: nft.name! });
-      openUnhideNftModal();
-    }
-  });
+  const { isPortrait } = useDeviceScreen();
+  const areSettingsInModal = !isPortrait || IS_ELECTRON || IS_DELEGATING_BOTTOM_SHEET || IS_DELEGATED_BOTTOM_SHEET;
 
   function renderHiddenByUserNfts() {
     return (
       <>
         <p className={styles.blockTitle}>{lang('Hidden By Me')}</p>
-        <div className={styles.block}>
-          {
-            hiddenByUserNfts!.map((nft) => {
-              return (
-                <div
-                  className={styles.item}
-                  onClick={() => removeNftSpecialStatus({ address: nft.address })}
-                  key={nft.address}
-                >
-                  <img className={styles.nftImage} src={nft.image} alt={nft.name} />
-                  <div className={styles.nftPrimaryCell}>
-                    <span className={styles.nftName}>{nft.name}</span>
-                    {
-                      nft.collectionName && <span className={styles.nftCollection}>{nft.collectionName}</span>
-                    }
-                  </div>
-
-                  <Button isSmall isPrimary isText className={styles.nftButtonUnhide}>{lang('Unhide')}</Button>
-                </div>
-              );
-            })
-          }
+        <div className={buildClassName(styles.block, !areSettingsInModal && 'hidden-nfts-user')}>
+          {hiddenByUserNfts!.map((nft) => <HiddenByUserNft key={nft.address} nft={nft} />)}
         </div>
       </>
     );
@@ -132,32 +96,20 @@ function SettingsHiddenNfts({
     return (
       <>
         <p className={styles.blockTitle}>{lang('Probably Scam')}</p>
-        <div className={buildClassName(styles.block, styles.settingsBlockWithDescription)}>
+        <div className={
+          buildClassName(styles.block, styles.settingsBlockWithDescription, !areSettingsInModal && 'hidden-nfts-scam')
+        }
+        >
           {
-            probablyScamNfts!.map((nft) => {
-              const isWhitelisted = whitelistedNftAddressesSet?.has(nft.address);
-              return (
-                <div
-                  className={styles.item}
-                  onClick={() => handleProbablyScamNftClick(nft)}
+            probablyScamNfts!.map(
+              (nft) => (
+                <ProbablyScamNft
                   key={nft.address}
-                >
-                  <img className={styles.nftImage} src={nft.image} alt={nft.name} />
-                  <div className={styles.nftPrimaryCell}>
-                    <span className={styles.nftName}>{nft.name}</span>
-                    {
-                      nft.collectionName && <span className={styles.nftCollection}>{nft.collectionName}</span>
-                    }
-                  </div>
-
-                  <Switcher
-                    className={styles.menuSwitcher}
-                    label={lang('Show')}
-                    checked={isWhitelisted}
-                  />
-                </div>
-              );
-            })
+                  nft={nft}
+                  isWhitelisted={whitelistedNftAddressesSet.has(nft.address)}
+                />
+              ),
+            )
           }
         </div>
         <p className={styles.blockDescription}>
@@ -193,13 +145,6 @@ function SettingsHiddenNfts({
         {Boolean(hiddenByUserNfts?.length) && renderHiddenByUserNfts()}
         {Boolean(probablyScamNfts?.length) && renderProbablyScamNfts()}
       </div>
-
-      <UnhideNftModal
-        isOpen={isUnhideNftModalOpen}
-        onClose={closeUnhideNftModal}
-        nftAddress={selectedNft?.address}
-        nftName={selectedNft?.name}
-      />
     </div>
   );
 }
@@ -208,7 +153,6 @@ export default memo(withGlobal<OwnProps>((global): StateProps => {
   const {
     blacklistedNftAddresses,
     whitelistedNftAddresses,
-    isUnhideNftModalOpen,
   } = selectCurrentAccountState(global) ?? {};
   const {
     orderedAddresses,
@@ -219,6 +163,5 @@ export default memo(withGlobal<OwnProps>((global): StateProps => {
     whitelistedNftAddresses,
     orderedAddresses,
     byAddress,
-    isUnhideNftModalOpen,
   };
 })(SettingsHiddenNfts));
diff --git a/src/components/settings/SettingsModal.tsx b/src/components/settings/SettingsModal.tsx
index 65367ae8..d0167989 100644
--- a/src/components/settings/SettingsModal.tsx
+++ b/src/components/settings/SettingsModal.tsx
@@ -1,4 +1,5 @@
 import React, { memo } from '../../lib/teact/teact';
+import { withGlobal } from '../../global';
 
 import { IS_EXTENSION } from '../../config';
 import buildClassName from '../../util/buildClassName';
@@ -8,13 +9,19 @@ import Modal from '../ui/Modal';
 
 import styles from './Settings.module.scss';
 
-type OwnProps = {
+interface OwnProps {
   children: React.ReactNode;
   isOpen?: boolean;
   onClose: () => void;
-};
+}
+
+interface StateProps {
+  isMediaViewerOpen?: boolean;
+}
 
-function SettingsModal({ children, isOpen, onClose }: OwnProps) {
+function SettingsModal({
+  children, isOpen, onClose, isMediaViewerOpen,
+}: OwnProps & StateProps) {
   const fullDialogClassName = buildClassName(
     styles.modalDialog,
     !(IS_ELECTRON || IS_EXTENSION) && styles.modalDialogWeb,
@@ -23,7 +30,7 @@ function SettingsModal({ children, isOpen, onClose }: OwnProps) {
   return (
     <Modal
       hasCloseButton
-      isOpen={isOpen}
+      isOpen={isOpen && !isMediaViewerOpen}
       dialogClassName={fullDialogClassName}
       contentClassName={styles.modalContent}
       nativeBottomSheetKey="settings"
@@ -35,4 +42,8 @@ function SettingsModal({ children, isOpen, onClose }: OwnProps) {
   );
 }
 
-export default memo(SettingsModal);
+export default memo(withGlobal((global): StateProps => {
+  return {
+    isMediaViewerOpen: Boolean(global.mediaViewer.mediaId),
+  };
+})(SettingsModal));
diff --git a/src/components/settings/nfts/HiddenByUserNft.tsx b/src/components/settings/nfts/HiddenByUserNft.tsx
new file mode 100644
index 00000000..525a9bfe
--- /dev/null
+++ b/src/components/settings/nfts/HiddenByUserNft.tsx
@@ -0,0 +1,79 @@
+import { memo } from '../../../lib/teact/teact';
+import React from '../../../lib/teact/teactn';
+import { getActions } from '../../../global';
+
+import { type ApiNft } from '../../../api/types';
+import { MediaType } from '../../../global/types';
+
+import buildClassName from '../../../util/buildClassName';
+import { IS_DELEGATED_BOTTOM_SHEET, IS_DELEGATING_BOTTOM_SHEET, IS_ELECTRON } from '../../../util/windowEnvironment';
+
+import { useDeviceScreen } from '../../../hooks/useDeviceScreen';
+import useFlag from '../../../hooks/useFlag';
+import useLang from '../../../hooks/useLang';
+import useLastCallback from '../../../hooks/useLastCallback';
+import useShowTransition from '../../../hooks/useShowTransition';
+
+import Button from '../../ui/Button';
+
+import styles from '../Settings.module.scss';
+
+interface OwnProps {
+  nft: ApiNft;
+}
+
+function HiddenByUserNft({ nft }: OwnProps) {
+  const { openMediaViewer, removeNftSpecialStatus } = getActions();
+  const lang = useLang();
+
+  const [isNftHidden, , unmarkNftHidden] = useFlag(true);
+
+  const handleUnhide = useLastCallback(() => {
+    removeNftSpecialStatus({ address: nft.address });
+  });
+
+  const {
+    transitionClassNames,
+  } = useShowTransition(isNftHidden, handleUnhide);
+
+  const { isPortrait } = useDeviceScreen();
+  const areSettingsInModal = !isPortrait || IS_ELECTRON || IS_DELEGATING_BOTTOM_SHEET || IS_DELEGATED_BOTTOM_SHEET;
+
+  function handleNftClick() {
+    openMediaViewer({
+      mediaId: nft.address, mediaType: MediaType.Nft, noGhostAnimation: areSettingsInModal, hiddenNfts: 'user',
+    });
+  }
+
+  return (
+    <div
+      className={buildClassName(styles.item, transitionClassNames)}
+      onClick={handleNftClick}
+      key={nft.address}
+      role="button"
+      tabIndex={0}
+      data-nft-address={!areSettingsInModal && nft.address}
+    >
+      <img className={styles.nftImage} src={nft.image} alt={nft.name} />
+      <div className={styles.nftPrimaryCell}>
+        <span className={styles.nftName}>{nft.name || lang('Untitled')}</span>
+        {
+          nft.collectionName && <span className={styles.nftCollection}>{nft.collectionName}</span>
+        }
+      </div>
+
+      <Button
+        isSmall
+        isPrimary
+        isText
+        className={styles.nftButtonUnhide}
+        onClick={unmarkNftHidden}
+        shouldStopPropagation
+      >
+        {lang('Unhide')}
+      </Button>
+    </div>
+  );
+}
+
+export default memo(HiddenByUserNft);
diff --git a/src/components/settings/nfts/ProbablyScamNft.tsx b/src/components/settings/nfts/ProbablyScamNft.tsx
new file mode 100644
index 00000000..142c267e
--- /dev/null
+++ b/src/components/settings/nfts/ProbablyScamNft.tsx
@@ -0,0 +1,73 @@
+import { memo } from '../../../lib/teact/teact';
+import React from '../../../lib/teact/teactn';
+import { getActions } from '../../../global';
+
+import { type ApiNft } from '../../../api/types';
+import { MediaType } from '../../../global/types';
+
+import { IS_DELEGATED_BOTTOM_SHEET, IS_DELEGATING_BOTTOM_SHEET, IS_ELECTRON } from '../../../util/windowEnvironment';
+
+import { useDeviceScreen } from '../../../hooks/useDeviceScreen';
+import useLang from '../../../hooks/useLang';
+import useLastCallback from '../../../hooks/useLastCallback';
+
+import Switcher from '../../ui/Switcher';
+
+import styles from '../Settings.module.scss';
+
+interface OwnProps {
+  nft: ApiNft;
+  isWhitelisted?: boolean;
+}
+
+function ProbablyScamNft({ nft, isWhitelisted }: OwnProps) {
+  const { openMediaViewer, removeNftSpecialStatus, openUnhideNftModal } = getActions();
+  const lang = useLang();
+
+  const { isPortrait } = useDeviceScreen();
+  const areSettingsInModal = !isPortrait || IS_ELECTRON || IS_DELEGATING_BOTTOM_SHEET || IS_DELEGATED_BOTTOM_SHEET;
+
+  const handleNftClick = useLastCallback(() => {
+    openMediaViewer({
+      mediaId: nft.address, mediaType: MediaType.Nft, noGhostAnimation: areSettingsInModal, hiddenNfts: 'scam',
+    });
+  });
+
+  const handleSwitcherClick = useLastCallback((e: React.ChangeEvent) => {
+    e.stopPropagation();
+    if (isWhitelisted) {
+      removeNftSpecialStatus({ address: nft.address });
+    } else {
+      openUnhideNftModal({ address: nft.address, name: nft.name! });
+    }
+  });
+
+  return (
+    <div
+      className={styles.item}
+      onClick={handleNftClick}
+      key={nft.address}
+      role="button"
+      tabIndex={0}
+      data-nft-address={!areSettingsInModal && nft.address}
+    >
+      <img className={styles.nftImage} src={nft.image} alt={nft.name} />
+      <div className={styles.nftPrimaryCell}>
+        <span className={styles.nftName}>{nft.name}</span>
+        {
+          nft.collectionName && <span className={styles.nftCollection}>{nft.collectionName}</span>
+        }
+      </div>
+
+      <Switcher
+        className={styles.menuSwitcher}
+        label={lang('Show')}
+        checked={isWhitelisted}
+        onChange={handleSwitcherClick}
+        shouldStopPropagation
+      />
+    </div>
+  );
+}
+
+export default memo(ProbablyScamNft);
diff --git a/src/components/staking/StakeModal.tsx b/src/components/staking/StakeModal.tsx
index e8453656..c9f37047 100644
--- a/src/components/staking/StakeModal.tsx
+++ b/src/components/staking/StakeModal.tsx
@@ -79,6 +79,7 @@ function StakeModal({
   });
 
   const handleLedgerConnect = useLastCallback(() => {
+    setRenderedStakingAmount(amount);
     submitStakingHardware();
   });
 
diff --git a/src/components/staking/UnstakeModal.tsx b/src/components/staking/UnstakeModal.tsx
index 0159491a..70a52697 100644
--- a/src/components/staking/UnstakeModal.tsx
+++ b/src/components/staking/UnstakeModal.tsx
@@ -97,6 +97,7 @@ function UnstakeModal({
   hardwareState,
   isLedgerConnected,
   isTonAppConnected,
+  amount,
 }: StateProps) {
   const {
     setStakingScreen,
@@ -122,6 +123,7 @@ function UnstakeModal({
   const [isInsufficientBalance, setIsInsufficientBalance] = useState(false);
 
   const [unstakeAmount, setUnstakeAmount] = useState(shouldUseNominators ? stakingBalance : undefined);
+  const [successUnstakeAmount, setSuccessUnstakeAmount] = useState<bigint | undefined>(undefined);
 
   const shortBaseSymbol = getShortCurrencySymbol(baseCurrency);
 
@@ -184,12 +186,14 @@ function UnstakeModal({
   });
 
   const handleTransferSubmit = useLastCallback((password: string) => {
+    setSuccessUnstakeAmount(amount);
     setRenderedBalance(tonToken?.amount);
 
     submitStakingPassword({ password, isUnstaking: true });
   });
 
   const handleLedgerConnect = useLastCallback(() => {
+    setSuccessUnstakeAmount(amount);
     submitStakingHardware({ isUnstaking: true });
   });
 
@@ -481,10 +485,10 @@ function UnstakeModal({
           <TransferResult
             color="green"
             playAnimation={isActive}
-            amount={unstakeAmount}
+            amount={successUnstakeAmount}
             noSign
             balance={renderedBalance}
-            operationAmount={unstakeAmount}
+            operationAmount={successUnstakeAmount}
           />
 
           {isLongUnstake && renderUnstakeTimer()}
diff --git a/src/components/swap/Swap.module.scss b/src/components/swap/Swap.module.scss
index 1c883bf2..7fa495c2 100644
--- a/src/components/swap/Swap.module.scss
+++ b/src/components/swap/Swap.module.scss
@@ -31,6 +31,10 @@
   margin-bottom: 0.8125rem;
 }
 
+.amountInputBuy {
+  margin-bottom: 0;
+}
+
 .inputLabel {
   margin-bottom: 0.3125rem;
 }
@@ -193,7 +197,7 @@
   z-index: 1;
   top: 50%;
   left: 50%;
-  transform: translate(-50%, -45%);
+  transform: translate(-50%, -31%);
 
   display: flex;
   align-items: center;
diff --git a/src/components/swap/SwapInitial.tsx b/src/components/swap/SwapInitial.tsx
index 6af2349f..cf29316d 100644
--- a/src/components/swap/SwapInitial.tsx
+++ b/src/components/swap/SwapInitial.tsx
@@ -534,7 +534,7 @@ function SwapInitial({
             <RichNumberInput
               id="swap-buy"
               labelText={lang('You buy')}
-              className={styles.amountInput}
+              className={styles.amountInputBuy}
               value={amountOut?.toString()}
               isLoading={isEstimating && inputSource === SwapInputSource.In}
               disabled={isReverseProhibited}
diff --git a/src/components/transfer/NftInfo.module.scss b/src/components/transfer/NftInfo.module.scss
index c5fcd7e7..81c639d3 100644
--- a/src/components/transfer/NftInfo.module.scss
+++ b/src/components/transfer/NftInfo.module.scss
@@ -1,4 +1,6 @@
 .root {
+  cursor: var(--custom-cursor, pointer);
+
   display: flex;
 
   max-width: 100%;
@@ -13,6 +15,11 @@
   border-radius: var(--border-radius-default);
 
   appearance: none !important;
+
+  & .icon:focus-visible,
+  & .icon:hover {
+    color: var(--color-blue);
+  }
 }
 
 .rootStatic {
@@ -22,17 +29,6 @@
   border: 1px solid var(--color-separator-input-stroke);
 }
 
-.interactive {
-  cursor: var(--custom-cursor, pointer);
-
-  &:focus-visible,
-  &:hover {
-    .icon {
-      color: var(--color-blue);
-    }
-  }
-}
-
 .thumbnail {
   width: 4.5rem;
   height: 4.5rem;
diff --git a/src/components/transfer/NftInfo.tsx b/src/components/transfer/NftInfo.tsx
index dbc56ab8..8fc4a629 100644
--- a/src/components/transfer/NftInfo.tsx
+++ b/src/components/transfer/NftInfo.tsx
@@ -1,7 +1,7 @@
 import React, { memo, type TeactNode, useMemo } from '../../lib/teact/teact';
-import { getGlobal } from '../../global';
+import { getActions, getGlobal } from '../../global';
 
-import type { NftTransfer } from '../../global/types';
+import { MediaType, type NftTransfer } from '../../global/types';
 
 import { ANIMATED_STICKER_TINY_SIZE_PX, TON_EXPLORER_NAME } from '../../config';
 import buildClassName from '../../util/buildClassName';
@@ -11,6 +11,7 @@ import { getTonExplorerNftUrl } from '../../util/url';
 import { ANIMATED_STICKERS_PATHS } from '../ui/helpers/animatedAssets';
 
 import useLang from '../../hooks/useLang';
+import useLastCallback from '../../hooks/useLastCallback';
 
 import AnimatedIconWithPreview from '../ui/AnimatedIconWithPreview';
 
@@ -22,7 +23,10 @@ interface OwnProps {
   withTonExplorer?: boolean;
 }
 
-function NftInfo({ nft, isStatic, withTonExplorer }: OwnProps) {
+function NftInfo({
+  nft, isStatic, withTonExplorer,
+}: OwnProps) {
+  const { openMediaViewer } = getActions();
   const lang = useLang();
 
   const tonExplorerTitle = useMemo(() => {
@@ -32,12 +36,17 @@ function NftInfo({ nft, isStatic, withTonExplorer }: OwnProps) {
     ).join('');
   }, [lang]);
 
-  const handleClick = () => {
+  const handleClickInfo = (event: React.MouseEvent) => {
+    event.stopPropagation();
     const url = getTonExplorerNftUrl(nft!.address, getGlobal().settings.isTestnet)!;
 
     openUrl(url);
   };
 
+  const handleClick = useLastCallback(() => {
+    openMediaViewer({ mediaId: nft!.address, mediaType: MediaType.Nft });
+  });
+
   if (!nft) {
     return (
       <div className={buildClassName(styles.root, isStatic && styles.rootStatic)}>
@@ -71,7 +80,18 @@ function NftInfo({ nft, isStatic, withTonExplorer }: OwnProps) {
         <div className={styles.info}>
           <div className={styles.title}>
             {name}
-            {withTonExplorer && <i className={buildClassName(styles.icon, 'icon-tonexplorer-small')} aria-hidden />}
+            {
+              withTonExplorer && (
+                <i
+                  className={buildClassName(styles.icon, 'icon-tonexplorer-small')}
+                  onClick={handleClickInfo}
+                  title={tonExplorerTitle}
+                  aria-label={tonExplorerTitle}
+                  role="button"
+                  tabIndex={0}
+                />
+              )
+            }
           </div>
           <div className={styles.description}>{nft!.collectionName}</div>
         </div>
@@ -79,21 +99,14 @@ function NftInfo({ nft, isStatic, withTonExplorer }: OwnProps) {
     );
   }
 
-  if (withTonExplorer) {
-    return (
-      <button
-        type="button"
-        className={buildClassName(styles.root, isStatic && styles.rootStatic, styles.interactive)}
-        title={tonExplorerTitle}
-        onClick={handleClick}
-      >
-        {renderContent()}
-      </button>
-    );
-  }
-
   return (
-    <div className={buildClassName(styles.root, isStatic && styles.rootStatic)}>
+    <div
+      role="button"
+      tabIndex={0}
+      aria-label={lang('NFT')}
+      className={buildClassName(styles.root, isStatic && styles.rootStatic)}
+      onClick={handleClick}
+    >
       {renderContent()}
     </div>
   );
diff --git a/src/components/transfer/TransferModal.tsx b/src/components/transfer/TransferModal.tsx
index 122e8127..ca8883ba 100644
--- a/src/components/transfer/TransferModal.tsx
+++ b/src/components/transfer/TransferModal.tsx
@@ -44,6 +44,7 @@ interface StateProps {
   hardwareState?: HardwareConnectState;
   isLedgerConnected?: boolean;
   isTonAppConnected?: boolean;
+  isMediaViewerOpen?: boolean;
 }
 
 const SCREEN_HEIGHT_FOR_FORCE_FULLSIZE_NBS = 762; // Computed empirically
@@ -61,7 +62,7 @@ function TransferModal({
     tokenSlug,
     nfts,
     sentNftsCount,
-  }, tokens, savedAddresses, hardwareState, isLedgerConnected, isTonAppConnected,
+  }, tokens, savedAddresses, hardwareState, isLedgerConnected, isTonAppConnected, isMediaViewerOpen,
 }: StateProps) {
   const {
     submitTransferConfirm,
@@ -243,7 +244,7 @@ function TransferModal({
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen={isOpen && !isMediaViewerOpen}
       noBackdropClose
       dialogClassName={styles.modalDialog}
       nativeBottomSheetKey="transfer"
@@ -281,5 +282,6 @@ export default memo(withGlobal((global): StateProps => {
     hardwareState,
     isLedgerConnected,
     isTonAppConnected,
+    isMediaViewerOpen: Boolean(global.mediaViewer.mediaId),
   };
 })(TransferModal));
diff --git a/src/components/ui/Button.tsx b/src/components/ui/Button.tsx
index e66f89d1..6a8f8ff4 100644
--- a/src/components/ui/Button.tsx
+++ b/src/components/ui/Button.tsx
@@ -28,6 +28,7 @@ type OwnProps = {
   isSmall?: boolean;
   isDestructive?: boolean;
   onClick?: NoneToVoidFunction;
+  shouldStopPropagation?: boolean;
 };
 
 // Longest animation duration
@@ -52,11 +53,15 @@ function Button({
   isSmall,
   isDestructive,
   onClick,
+  shouldStopPropagation,
 }: OwnProps) {
   const [isClicked, setIsClicked] = useState(false);
 
-  const handleClick = useLastCallback(() => {
+  const handleClick = useLastCallback((event: React.MouseEvent) => {
     if (!isDisabled && onClick) {
+      if (shouldStopPropagation) {
+        event.stopPropagation();
+      }
       onClick();
     }
 
diff --git a/src/components/ui/Modal.module.scss b/src/components/ui/Modal.module.scss
index 45d97bb0..b3fafb4c 100644
--- a/src/components/ui/Modal.module.scss
+++ b/src/components/ui/Modal.module.scss
@@ -336,7 +336,7 @@
 
   font-size: 1.0625rem;
   font-weight: 700;
-  line-height: 1;
+  line-height: 1.875rem;
   text-align: center;
   text-overflow: ellipsis;
   white-space: nowrap;
diff --git a/src/components/ui/PasswordForm.tsx b/src/components/ui/PasswordForm.tsx
index b3c028c4..6e7275fb 100644
--- a/src/components/ui/PasswordForm.tsx
+++ b/src/components/ui/PasswordForm.tsx
@@ -165,7 +165,7 @@ function PasswordForm({
       case 'swap':
         return 'Confirm Swap';
       default:
-        return 'Confirm Operation';
+        return 'Confirm Action';
     }
   }
 
diff --git a/src/components/ui/Switcher.tsx b/src/components/ui/Switcher.tsx
index c6768123..069d6f63 100644
--- a/src/components/ui/Switcher.tsx
+++ b/src/components/ui/Switcher.tsx
@@ -14,6 +14,7 @@ type OwnProps = {
   className?: string;
   onChange?: (e: ChangeEvent<HTMLInputElement>) => void;
   onCheck?: (isChecked: boolean) => void;
+  shouldStopPropagation?: boolean;
 };
 
 function Switcher({
@@ -25,6 +26,7 @@ function Switcher({
   className,
   onChange,
   onCheck,
+  shouldStopPropagation,
 }: OwnProps) {
   function handleChange(e: ChangeEvent<HTMLInputElement>) {
     if (onChange) {
@@ -37,7 +39,13 @@ function Switcher({
   }
 
   return (
-    <label className={buildClassName(styles.container, className)} title={label}>
+    <label
+      className={buildClassName(styles.container, className)}
+      title={label}
+      onClick={shouldStopPropagation ? (e) => e.stopPropagation() : undefined}
+      tabIndex={0}
+      role="button"
+    >
       <input
         type="checkbox"
         id={id}
@@ -46,7 +54,7 @@ function Switcher({
         checked={checked}
         className={styles.input}
         onChange={handleChange}
-        teactExperimentControlled={!onChange && !onCheck}
+        teactExperimentControlled={shouldStopPropagation || (!onChange && !onCheck)}
       />
       <span className={styles.widget} />
     </label>
diff --git a/src/components/ui/TabList.module.scss b/src/components/ui/TabList.module.scss
index 8892d7e8..d14ca055 100644
--- a/src/components/ui/TabList.module.scss
+++ b/src/components/ui/TabList.module.scss
@@ -3,6 +3,7 @@
 
   z-index: 1;
 
+  overflow: auto;
   display: flex;
   flex-shrink: 0;
   flex-wrap: nowrap;
diff --git a/src/config.ts b/src/config.ts
index bc948505..59b6791e 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -116,14 +116,14 @@ export const CHANGELLY_AML_KYC = 'https://changelly.com/aml-kyc';
 export const CHANGELLY_WAITING_DEADLINE = 3 * 60 * 60 * 1000; // 3 hour
 
 export const TONCOIN_SLUG = 'toncoin';
-export const DEFAULT_SWAP_SECOND_TOKEN_SLUG = 'ton-eqc47093ox'; // To be updated with the most popular token, according to https://ton.app/jettons
+export const DEFAULT_SWAP_SECOND_TOKEN_SLUG = 'ton-eqcxe6mutq'; // USD₮
 export const DEFAULT_CEX_SWAP_SECOND_TOKEN_SLUG = 'usdtrx';
 
 export const PROXY_HOSTS = process.env.PROXY_HOSTS;
 
 export const TINY_TRANSFER_MAX_COST = 0.01;
 
-export const LANG_CACHE_NAME = 'mtw-lang-120';
+export const LANG_CACHE_NAME = 'mtw-lang-122';
 
 export const LANG_LIST: LangItem[] = [{
   langCode: 'en',
@@ -233,15 +233,15 @@ export const INIT_SWAP_ASSETS: Record<string, ApiSwapAsset> = {
     priceUsd: 0,
     isPopular: true,
   },
-  'ton-eqc47093ox': {
-    name: 'Gram',
-    symbol: 'GRAM',
+  'ton-eqcxe6mutq': {
+    name: 'Tether USD',
+    symbol: 'USD₮',
     blockchain: TON_BLOCKCHAIN,
-    slug: 'ton-eqc47093ox',
+    slug: 'ton-eqcxe6mutq',
     decimals: 9,
     // eslint-disable-next-line max-len
-    image: 'https://cache.tonapi.io/imgproxy/lNoY3YdNeBug53ixjK6hxT6XIX3_xoIYNqv-ykIQ1Aw/rs:fill:200:200:1/g:no/aHR0cHM6Ly9ncmFtY29pbi5vcmcvaW1nL2ljb24ucG5n.webp',
-    contract: 'EQC47093oX5Xhb0xuk2lCr2RhS8rj-vul61u4W2UH5ORmG_O',
+    image: 'https://cache.tonapi.io/imgproxy/T3PB4s7oprNVaJkwqbGg54nexKE0zzKhcrPv8jcWYzU/rs:fill:200:200:1/g:no/aHR0cHM6Ly90ZXRoZXIudG8vaW1hZ2VzL2xvZ29DaXJjbGUucG5n.webp',
+    contract: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
     price: 0,
     priceUsd: 0,
     isPopular: true,
@@ -331,8 +331,5 @@ export const CLAIM_COMMENT = 'claim';
 export const RE_LINK_TEMPLATE = /((ftp|https?):\/\/)?(?<host>(www\\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z][-a-zA-Z0-9]{1,62})\b([-a-zA-Z0-9()@:%_+.,~#?&/=]*)/g;
 // eslint-disable-next-line max-len
 export const RE_TG_BOT_MENTION = /telegram[:\s-]*((@[a-z0-9_]+)|(https:\/\/)?(t\.me|telegram\.me|telegram\.dog)\/[a-z0-9_]+)/mig;
-export const RE_EMPTY_CHARS = /[\u200B-\u200D\uFEFF]/g;
-export const RE_SPACE_CHARS = /[\n\r]/g;
-export const RE_FAKE_DOTS = /[\u0702\u0701\u2024\u00B7\u02D9\u0971\u1427\u18DF\u22C5\u2027]/g;
 
 export const DIESEL_ADDRESS = process.env.DIESEL_ADDRESS || 'EQDUkQbpTVIgt7v66-JTFR-3-eXRFz_4V66F-Ufn6vOg0D5s';
diff --git a/src/global/actions/api/dapps.ts b/src/global/actions/api/dapps.ts
index 65c2f3c0..090d029c 100644
--- a/src/global/actions/api/dapps.ts
+++ b/src/global/actions/api/dapps.ts
@@ -23,7 +23,7 @@ import {
   updateCurrentDappTransfer,
   updateDappConnectRequest,
 } from '../../reducers';
-import { selectAccount, selectIsHardwareAccount, selectNewestTxIds } from '../../selectors';
+import { selectIsHardwareAccount, selectNewestTxIds } from '../../selectors';
 
 import { getIsPortrait } from '../../../hooks/useDeviceScreen';
 
@@ -78,7 +78,7 @@ addActionHandler(
   'submitDappConnectRequestConfirmHardware',
   async (global, actions, { accountId: connectAccountId }) => {
     const {
-      accountId, promiseId, proof,
+      promiseId, proof,
     } = global.dappConnectRequest!;
 
     global = getGlobal();
@@ -91,7 +91,7 @@ addActionHandler(
     const ledgerApi = await import('../../../util/ledger');
 
     try {
-      const signature = await ledgerApi.signLedgerProof(accountId!, proof!);
+      const signature = await ledgerApi.signLedgerProof(connectAccountId!, proof!);
       actions.switchAccount({ accountId: connectAccountId });
       await callApi('confirmDappRequestConnect', promiseId!, {
         accountId: connectAccountId,
@@ -306,8 +306,6 @@ addActionHandler('apiUpdateDappConnect', async (global, actions, {
     global = getGlobal();
   }
 
-  const { isHardware } = selectAccount(global, accountId)!;
-
   global = updateDappConnectRequest(global, {
     state: DappConnectState.Info,
     promiseId,
@@ -315,7 +313,7 @@ addActionHandler('apiUpdateDappConnect', async (global, actions, {
     dapp,
     permissions: {
       isAddressRequired: permissions.address,
-      isPasswordRequired: permissions.proof && !isHardware,
+      isPasswordRequired: permissions.proof,
     },
     proof,
   });
diff --git a/src/global/actions/api/nfts.ts b/src/global/actions/api/nfts.ts
index a52dfa8b..49817740 100644
--- a/src/global/actions/api/nfts.ts
+++ b/src/global/actions/api/nfts.ts
@@ -67,15 +67,17 @@ addActionHandler('removeNftSpecialStatus', (global, actions, { address: nftAddre
   });
 });
 
-addActionHandler('openUnhideNftModal', (global) => {
+addActionHandler('openUnhideNftModal', (global, actions, { address, name }) => {
   return updateCurrentAccountState(global, {
     isUnhideNftModalOpen: true,
+    selectedNftToUnhide: { address, name },
   });
 });
 
 addActionHandler('closeUnhideNftModal', (global) => {
   return updateCurrentAccountState(global, {
     isUnhideNftModalOpen: undefined,
+    selectedNftToUnhide: undefined,
   });
 });
 
diff --git a/src/global/actions/api/staking.ts b/src/global/actions/api/staking.ts
index 78a5bef5..521852ca 100644
--- a/src/global/actions/api/staking.ts
+++ b/src/global/actions/api/staking.ts
@@ -241,7 +241,13 @@ addActionHandler('submitStakingPassword', async (global, actions, payload) => {
 
 addActionHandler('submitStakingHardware', async (global, actions, payload) => {
   const { isUnstaking } = payload || {};
-  const { fee, amount } = global.staking;
+  const {
+    fee,
+    amount,
+    type,
+    tokenAmount,
+  } = global.staking;
+  const { currentAccountId } = global;
 
   global = updateStaking(global, {
     isLoading: true,
@@ -257,11 +263,24 @@ addActionHandler('submitStakingHardware', async (global, actions, payload) => {
   const accountId = global.currentAccountId!;
 
   if (isUnstaking) {
-    result = await ledgerApi.submitLedgerUnstake(accountId);
+    const { instantAvailable } = global.stakingInfo.liquid ?? {};
+    const stakingBalance = selectAccountState(global, currentAccountId!)!.staking!.balance;
+    const unstakeAmount = type === 'nominators' ? stakingBalance : tokenAmount!;
+
+    result = await ledgerApi.submitLedgerUnstake(accountId, type!, unstakeAmount);
+
+    const isLongUnstakeRequested = Boolean(
+      type === 'nominators' || (type === 'liquid' && instantAvailable && instantAvailable < stakingBalance),
+    );
+
+    global = getGlobal();
+    global = updateAccountState(global, currentAccountId!, { isLongUnstakeRequested });
+    setGlobal(global);
   } else {
     result = await ledgerApi.submitLedgerStake(
       accountId,
       amount!,
+      type!,
       fee,
     );
   }
diff --git a/src/global/actions/api/swap.ts b/src/global/actions/api/swap.ts
index 525f7171..2b1e0c54 100644
--- a/src/global/actions/api/swap.ts
+++ b/src/global/actions/api/swap.ts
@@ -17,7 +17,8 @@ import { vibrateOnError, vibrateOnSuccess } from '../../../util/capacitor';
 import {
   fromDecimal, getIsPositiveDecimal, roundDecimal, toDecimal,
 } from '../../../util/decimals';
-import { pick } from '../../../util/iteratees';
+import generateUniqueId from '../../../util/generateUniqueId';
+import { buildCollectionByKey, pick } from '../../../util/iteratees';
 import { callActionInMain, callActionInNative } from '../../../util/multitab';
 import { pause } from '../../../util/schedulers';
 import { buildSwapId } from '../../../util/swap/buildSwapId';
@@ -28,9 +29,15 @@ import {
   clearCurrentSwap,
   clearIsPinAccepted,
   setIsPinAccepted,
+  updateAccountState,
   updateCurrentSwap,
 } from '../../reducers';
-import { selectAccount, selectCurrentAccount, selectCurrentToncoinBalance } from '../../selectors';
+import {
+  selectAccount,
+  selectAccountState,
+  selectCurrentAccount,
+  selectCurrentToncoinBalance,
+} from '../../selectors';
 
 import { getIsPortrait } from '../../../hooks/useDeviceScreen';
 
@@ -124,6 +131,7 @@ addActionHandler('startSwap', async (global, actions, payload) => {
 
   global = updateCurrentSwap(global, {
     state: requiredState,
+    swapId: generateUniqueId(),
   });
   setGlobal(global);
 
@@ -178,6 +186,7 @@ addActionHandler('cancelSwap', (global, actions, { shouldReset } = {}) => {
   }
   global = updateCurrentSwap(global, {
     state: SwapState.None,
+    swapId: undefined,
   });
   setGlobal(global);
 });
@@ -193,6 +202,7 @@ addActionHandler('submitSwap', async (global, actions, { password }) => {
   }
 
   global = getGlobal();
+  const currentSwapId = global.currentSwap.swapId;
   if (IS_CAPACITOR) {
     global = setIsPinAccepted(global);
   }
@@ -262,6 +272,11 @@ addActionHandler('submitSwap', async (global, actions, { password }) => {
     return;
   }
 
+  if (currentSwapId !== global.currentSwap.swapId) {
+    setGlobal(global);
+    return;
+  }
+
   global = updateCurrentSwap(global, {
     tokenInSlug: undefined,
     tokenOutSlug: undefined,
@@ -833,6 +848,9 @@ addActionHandler('estimateSwapCex', async (global, actions, { shouldBlock }) =>
 });
 
 addActionHandler('setSwapScreen', (global, actions, { state }) => {
+  if (state === SwapState.Initial) {
+    global = updateCurrentSwap(global, { swapId: generateUniqueId() });
+  }
   global = updateCurrentSwap(global, { state });
   setGlobal(global);
 });
@@ -902,3 +920,36 @@ addActionHandler('setSwapCexAddress', (global, actions, { toAddress }) => {
   global = updateCurrentSwap(global, { toAddress });
   setGlobal(global);
 });
+
+addActionHandler('updatePendingSwaps', async (global) => {
+  const accountId = global.currentAccountId;
+  if (!accountId) return;
+
+  let { activities } = selectAccountState(global, accountId) ?? {};
+  if (!activities) return;
+
+  const ids = Object.values(activities.byId)
+    .filter((activity) => activity.kind === 'swap' && activity.status === 'pending')
+    .map(({ id }) => id);
+  if (!ids.length) return;
+
+  const swaps = await callApi('fetchSwaps', accountId, ids);
+  if (!swaps?.length) return;
+
+  global = getGlobal();
+  if (global.currentAccountId !== accountId) return;
+
+  ({ activities } = selectAccountState(global, accountId) ?? {});
+
+  global = updateAccountState(global, accountId, {
+    activities: {
+      ...activities,
+      byId: {
+        ...activities?.byId,
+        ...buildCollectionByKey(swaps, 'id'),
+      },
+    },
+  });
+
+  setGlobal(global);
+});
diff --git a/src/global/actions/api/wallet.ts b/src/global/actions/api/wallet.ts
index 1b17235e..64eb8f0c 100644
--- a/src/global/actions/api/wallet.ts
+++ b/src/global/actions/api/wallet.ts
@@ -28,7 +28,7 @@ import { onTickEnd, pause } from '../../../util/schedulers';
 import { IS_DELEGATED_BOTTOM_SHEET, IS_DELEGATING_BOTTOM_SHEET } from '../../../util/windowEnvironment';
 import { callApi } from '../../../api';
 import { ApiHardwareBlindSigningNotEnabled, ApiUserRejectsError } from '../../../api/errors';
-import { getIsSwapId, getIsTinyTransaction, getIsTxIdLocal } from '../../helpers';
+import { getIsSwapId, getIsTinyOrScamTransaction, getIsTxIdLocal } from '../../helpers';
 import { addActionHandler, getGlobal, setGlobal } from '../../index';
 import {
   clearCurrentTransfer,
@@ -563,7 +563,7 @@ addActionHandler('fetchTokenTransactions', async (global, actions, { limit, slug
     }
 
     const filteredResult = global.settings.areTinyTransfersHidden
-      ? result.filter((tx) => tx.kind === 'transaction' && !getIsTinyTransaction(tx))
+      ? result.filter((tx) => tx.kind === 'transaction' && !getIsTinyOrScamTransaction(tx))
       : result;
 
     fetchedActivities = fetchedActivities.concat(result);
@@ -629,7 +629,7 @@ addActionHandler('fetchAllTransactions', async (global, actions, { limit, should
     }
 
     const filteredResult = global.settings.areTinyTransfersHidden
-      ? result.filter((tx) => tx.kind === 'transaction' && !getIsTinyTransaction(tx))
+      ? result.filter((tx) => tx.kind === 'transaction' && !getIsTinyOrScamTransaction(tx))
       : result;
 
     fetchedActivities = fetchedActivities.concat(result);
diff --git a/src/global/actions/apiUpdates/activities.ts b/src/global/actions/apiUpdates/activities.ts
index 92ed8a39..84bec1ab 100644
--- a/src/global/actions/apiUpdates/activities.ts
+++ b/src/global/actions/apiUpdates/activities.ts
@@ -3,10 +3,10 @@ import { TransferState } from '../../types';
 
 import { IS_CAPACITOR, TONCOIN_SLUG } from '../../../config';
 import { groupBy } from '../../../util/iteratees';
-import { callActionInNative } from '../../../util/multitab';
+import { callActionInMain, callActionInNative } from '../../../util/multitab';
 import { playIncomingTransactionSound } from '../../../util/notificationSound';
-import { IS_DELEGATING_BOTTOM_SHEET } from '../../../util/windowEnvironment';
-import { getIsTinyTransaction } from '../../helpers';
+import { IS_DELEGATED_BOTTOM_SHEET, IS_DELEGATING_BOTTOM_SHEET } from '../../../util/windowEnvironment';
+import { getIsTinyOrScamTransaction } from '../../helpers';
 import { addActionHandler, setGlobal } from '../../index';
 import {
   addLocalTransaction,
@@ -56,8 +56,13 @@ addActionHandler('apiUpdate', (global, actions, update) => {
     }
 
     case 'newActivities': {
-      if (IS_DELEGATING_BOTTOM_SHEET) {
-        callActionInNative('apiUpdate', update);
+      if (IS_DELEGATING_BOTTOM_SHEET && !update.noForward) {
+        // Local transaction in NBS was not updated after nft/transfer sending was completed
+        callActionInNative('apiUpdate', { ...update, noForward: true });
+      }
+      if (IS_DELEGATED_BOTTOM_SHEET && !update.noForward) {
+        // A local swap transaction is not created if the NBS is closed before the exchange is completed
+        callActionInMain('apiUpdate', { ...update, noForward: true });
       }
       const { accountId, activities } = update;
 
@@ -116,7 +121,7 @@ addActionHandler('apiUpdate', (global, actions, update) => {
             && (Date.now() - activity.timestamp < TX_AGE_TO_PLAY_SOUND)
             && !(
               global.settings.areTinyTransfersHidden
-              && getIsTinyTransaction(activity, global.tokenInfo?.bySlug[activity.slug!])
+              && getIsTinyOrScamTransaction(activity, global.tokenInfo?.bySlug[activity.slug!])
             );
         });
 
@@ -126,7 +131,6 @@ addActionHandler('apiUpdate', (global, actions, update) => {
       }
 
       setGlobal(global);
-
       break;
     }
   }
diff --git a/src/global/actions/ui/misc.ts b/src/global/actions/ui/misc.ts
index 480f7294..68123801 100644
--- a/src/global/actions/ui/misc.ts
+++ b/src/global/actions/ui/misc.ts
@@ -692,12 +692,17 @@ addActionHandler('closeOnRampWidgetModal', (global) => {
   setGlobal({ ...global, isOnRampWidgetModalOpen: undefined });
 });
 
-addActionHandler('openMediaViewer', (global, actions, { mediaId, mediaType }) => {
+addActionHandler('openMediaViewer', (global, actions, {
+  mediaId, mediaType, txId, hiddenNfts, noGhostAnimation,
+}) => {
   return {
     ...global,
     mediaViewer: {
       mediaId,
       mediaType,
+      txId,
+      hiddenNfts,
+      noGhostAnimation,
     },
   };
 });
diff --git a/src/global/helpers/index.ts b/src/global/helpers/index.ts
index 88ea4d55..2254414d 100644
--- a/src/global/helpers/index.ts
+++ b/src/global/helpers/index.ts
@@ -3,7 +3,8 @@ import type { ApiToken, ApiTransaction } from '../../api/types';
 import { TINY_TRANSFER_MAX_COST } from '../../config';
 import { toBig } from '../../util/decimals';
 
-export function getIsTinyTransaction(transaction: ApiTransaction, token?: ApiToken) {
+export function getIsTinyOrScamTransaction(transaction: ApiTransaction, token?: ApiToken) {
+  if (transaction.metadata?.isScam) return true;
   if (!token || transaction.type === 'nftTransferred' || transaction.type === 'nftReceived') return false;
 
   const decimals = token.decimals;
diff --git a/src/global/types.ts b/src/global/types.ts
index 9897ac53..fd9cde37 100644
--- a/src/global/types.ts
+++ b/src/global/types.ts
@@ -306,6 +306,10 @@ export interface AccountState {
     isCollection: boolean;
   };
   isUnhideNftModalOpen?: boolean;
+  selectedNftToUnhide?: {
+    address: ApiNft['address'];
+    name: ApiNft['name'];
+  };
   isBackupRequired?: boolean;
   activeDappOrigin?: string;
   currentTokenSlug?: string;
@@ -425,6 +429,7 @@ export type GlobalState = {
 
   currentSwap: {
     state: SwapState;
+    swapId?: string;
     slippage: number;
     tokenInSlug?: string;
     tokenOutSlug?: string;
@@ -603,6 +608,9 @@ export type GlobalState = {
   mediaViewer: {
     mediaId?: string;
     mediaType?: MediaType;
+    txId?: string;
+    hiddenNfts?: 'user' | 'scam';
+    noGhostAnimation?: boolean;
   };
 
   isLoadingOverlayOpen?: boolean;
@@ -737,7 +745,10 @@ export interface ActionPayloads {
   addNftsToBlacklist: { addresses: ApiNft['address'][] };
   addNftsToWhitelist: { addresses: ApiNft['address'][] };
   removeNftSpecialStatus: { address: ApiNft['address'] };
-  openUnhideNftModal: undefined;
+  openUnhideNftModal: {
+    address: ApiNft['address'];
+    name: ApiNft['name'];
+  };
   closeUnhideNftModal: undefined;
   openHideNftModal: {
     addresses: ApiNft['address'][];
@@ -877,12 +888,19 @@ export interface ActionPayloads {
   setSwapCexAddress: { toAddress: string };
   addSwapToken: { token: UserSwapToken };
   toggleSwapSettingsModal: { isOpen: boolean };
+  updatePendingSwaps: undefined;
 
   openOnRampWidgetModal: undefined;
   closeOnRampWidgetModal: undefined;
 
   // MediaViewer
-  openMediaViewer: { mediaId: string; mediaType: MediaType };
+  openMediaViewer: {
+    mediaId: string;
+    mediaType: MediaType;
+    txId?: string;
+    hiddenNfts?: 'user' | 'scam';
+    noGhostAnimation?: boolean;
+  };
   closeMediaViewer: undefined;
 
   openReceiveModal: undefined;
diff --git a/src/i18n/de.yaml b/src/i18n/de.yaml
index c4dfdc5f..553a25fa 100644
--- a/src/i18n/de.yaml
+++ b/src/i18n/de.yaml
@@ -491,7 +491,7 @@ Wrong code, please try again: Falscher Code, bitte versuchen Sie es erneut.
 Scan your fingerprint: Legen Sie Ihren Fingerabdruck auf.
 Incorrect code, please try again.: Falscher Code, bitte versuchen Sie es erneut.
 Correct: Korrekt
-Confirm Operation: Operation bestätigen
+Confirm Action: Aktion bestätigen
 Confirm Swap: Swap bestätigen
 "%amount% to %address%": "%amount% zu %address%"
 "%amount_from% to %amount_to%": "%amount_from% zu %amount_to%"
@@ -647,3 +647,5 @@ $hardware_blind_sign_not_enabled: |
 
   Um fortzufahren, aktivieren Sie die Option „Blindsignatur“ in den Einstellungen der TON App auf dem Ledger.
 Switch to W5: Zu W5 wechseln
+Not a Scam: Kein Betrug
+Untitled: Unbenannt
diff --git a/src/i18n/en.yaml b/src/i18n/en.yaml
index 62483323..923e5e07 100644
--- a/src/i18n/en.yaml
+++ b/src/i18n/en.yaml
@@ -489,7 +489,7 @@ Wrong code, please try again: Wrong code, please try again
 Scan your fingerprint: Scan your fingerprint
 Incorrect code, please try again.: Incorrect code, please try again.
 Correct: Correct
-Confirm Operation: Confirm Operation
+Confirm Action: Confirm Action
 Confirm Swap: Confirm Swap
 "%amount% to %address%": "%amount% to %address%"
 "%amount_from% to %amount_to%": "%amount_from% to %amount_to%"
@@ -647,3 +647,5 @@ $hardware_blind_sign_not_enabled: |
 
   To continue, enable the "Blind Signing" option in the settings of the TON App on Ledger.
 Switch to W5: Switch to W5
+Not a Scam: Not a Scam
+Untitled: Untitled
diff --git a/src/i18n/es.yaml b/src/i18n/es.yaml
index 2c049b98..69cb404c 100644
--- a/src/i18n/es.yaml
+++ b/src/i18n/es.yaml
@@ -487,7 +487,7 @@ Wrong code, please try again: Código incorrecto, inténtalo de nuevo.
 Scan your fingerprint: Escanea tu huella digital
 Incorrect code, please try again.: Codigo Incorrecto, por favor intenta de nuevo.
 Correct: Correcto
-Confirm Operation: Confirmar operación
+Confirm Action: Confirmar acción
 Confirm Swap: Confirmar intercambio
 "%amount% to %address%": "%amount% a %address%"
 "%amount_from% to %amount_to%": "%amount_from% a %amount_to%"
@@ -643,3 +643,5 @@ $hardware_blind_sign_not_enabled: |
 
   Para continuar, habilite la opción "Firma Ciega" en la configuración de la aplicación TON en Ledger.
 Switch to W5: Cambiar a W5
+Not a Scam: No es una estafa
+Untitled: Sin título
diff --git a/src/i18n/pl.yaml b/src/i18n/pl.yaml
index 141db47f..edd3d5d4 100644
--- a/src/i18n/pl.yaml
+++ b/src/i18n/pl.yaml
@@ -491,7 +491,7 @@ Wrong code, please try again: Nieprawidłowy kod, spróbuj ponownie
 Scan your fingerprint: Zeskanuj swój odcisk palca
 Incorrect code, please try again.: Nieprawidłowy kod, spróbuj ponownie.
 Correct: Poprawny
-Confirm Operation: Potwierdź operację
+Confirm Action: Potwierdź działanie
 Confirm Swap: Potwierdź wymianę
 "%amount% to %address%": "%amount% do %address%"
 "%amount_from% to %amount_to%": "%amount_from% do %amount_to%"
@@ -649,3 +649,5 @@ $hardware_blind_sign_not_enabled: |
 
   Aby kontynuować, włącz opcję „Ślepe Podpisywanie” w ustawieniach aplikacji TON na Ledgerze.
 Switch to W5: Przełącz na W5
+Not a Scam: Nie oszustwo
+Untitled: Bez tytułu
diff --git a/src/i18n/ru.yaml b/src/i18n/ru.yaml
index caa08401..76756249 100644
--- a/src/i18n/ru.yaml
+++ b/src/i18n/ru.yaml
@@ -488,7 +488,7 @@ Wrong code, please try again: Неверный код, попробуйте ещ
 Scan your fingerprint: Отсканируйте свой отпечаток пальца
 Incorrect code, please try again.: Неверный код, пожалуйста, попробуйте снова.
 Correct: Правильно
-Confirm Operation: Подтвердите операцию
+Confirm Action: Подтвердите действие
 Confirm Swap: Подтвердите обмен
 "%amount% to %address%": "%amount% на %address%"
 "%amount_from% to %amount_to%": "%amount_from% на %amount_to%"
@@ -604,7 +604,7 @@ until %date%: до %date%
 "%volume% in %amount% parts": "%volume% в %amount% частях"
 Unfreeze: Разморозить
 Claim: Заклеймить
-Confirm Unfreezing: Подтвердите размораживание
+Confirm Unfreezing: Подтвердите разморозку
 Insufficient Balance for Fee.: Недостаточный баланс для комиссии.
 $fee_value_bold: "**Комиссия:** %fee%"
 MyTonWallet Features: Функции MyTonWallet
@@ -615,7 +615,7 @@ WrongNetwork: Приложение запрашивает транзакцию 
 Hide: Скрыть
 Hidden NFTs: Скрытые NFT
 Hidden By Me: Скрыто мной
-Probably Scam: Вероятно, мошеннические NFT
+Probably Scam: Вероятно, скам
 $settings_nft_probably_scam_description: Эти NFT были автоматически отключены Защитой от мошенничества. Вы можете вернуть нужные на Главную страницу, если считаете, что они были включены в этот список по ошибке.
 Unhide: Показать
 Hide All: Скрыть всё
@@ -641,3 +641,5 @@ $hardware_blind_sign_not_enabled: |
 
   Чтобы продолжить, включите опцию «Слепое подписание» в настройках TON App на Ledger.
 Switch to W5: Версия W5
+Not a Scam: Не скам
+Untitled: Без названия
diff --git a/src/i18n/th.yaml b/src/i18n/th.yaml
index e5538e60..5ac67b46 100644
--- a/src/i18n/th.yaml
+++ b/src/i18n/th.yaml
@@ -80,7 +80,7 @@ Is it open source?: สิ่งนี้เป็นโอเพนซอร์
 $about_wallet_github: ใช่, เราเป็นโอเพนซอร์ส. สามารถสำรวจเราได้ที่ %github_link%.
 $about_github_link_text: "**GitHub repository**"
 Is there a community?: แล้วมีกลุ่มชุมชนหรือไม่?
-$about_wallet_community: แน่นอน, สามารถสื่อสารกับเราได้ที่ %telegram_link%.
+$about_wallet_community: แน่นอน, สามารถสื่อสารกับเราได้ที่ %community_link%.
 $about_community_link_text: "**Telegram channel**"
 Currency History: ประวัติทางการเงิน
 $add_account_description1: |
@@ -303,7 +303,7 @@ Try Again: ลองอีกครั้ง
 Driver: ไดรเวอร์
 Connect your Ledger to PC: เชื่อมต่อ Ledger ของคุณเข้ากับคอมพิวเตอร์
 Unlock it and open the TON App: ปิดล็อกและเปิดแอป TON
-Maybe you need to check the password or change the driver.: บางทีคุณอาจต้องตรวจสอบรหัสผ่านหรือเปลี่ยนเวอร์ชั่นของไดรเวอร์.
+Maybe you need to check the password or change the driver.: บางทีคุณอาจต้องตรวจสอบรหัสผ่านหรือเปลี่ยนเวอร์ชันของไดรเวอร์.
 Or import from...: หรือนำเข้าด้วย...
 Confirm via Ledger: ยืนยันด้วย Ledger
 Please confirm transaction on your Ledger: โปรดยืนยันการทำรายการบน Ledger ของคุณ
@@ -490,7 +490,7 @@ Wrong code, please try again: รหัสผ่านไม่ถูกต้
 Scan your fingerprint: สแกนลายนิ้วมือของคุณ
 Incorrect code, please try again.:  รหัสผ่านไม่ถูกต้อง, โปรดลองใหม่อีกครั้ง.
 Correct: ถูกต้อง
-Confirm Operation: ยืนยันการทำรายการ
+Confirm Action: ยืนยันการดำเนินการ
 Confirm Swap: ยืนยันการสับเปลี่ยน
 "%amount% to %address%": "%amount% ไปที่ %address%"
 "%amount_from% to %amount_to%": "%amount_from% ไปที่ %amount_to%"
@@ -648,3 +648,5 @@ $hardware_blind_sign_not_enabled: |
 
   ในการดำเนินการต่อ ให้เปิดใช้งานตัวเลือก "การลงนามแบบบอด" ในการตั้งค่าแอป TON บน Ledger
 Switch to W5: เปลี่ยนเป็น W5
+Not a Scam: ไม่ใช่การหลอกลวง
+Untitled: ไม่มีชื่อ
diff --git a/src/i18n/tr.yaml b/src/i18n/tr.yaml
index da37a61d..c97f3d32 100644
--- a/src/i18n/tr.yaml
+++ b/src/i18n/tr.yaml
@@ -490,7 +490,7 @@ Wrong code, please try again: Hatalı kod, lütfen tekrar deneyin
 Scan your fingerprint: Parmak izinizi tarayın
 Incorrect code, please try again.: Hatalı kod, lütfen tekrar deneyin.
 Correct: Doğru
-Confirm Operation: İşlemi Onaylayın
+Confirm Action: Eylemi Onayla
 Confirm Swap: Takası onaylayın
 "%amount% to %address%": "%address% numaralı adrese %amount%"
 "%amount_from% to %amount_to%": "%amount_from%'den' %amount_to%'e"
@@ -646,3 +646,5 @@ $hardware_blind_sign_not_enabled: |
 
   Devam etmek için, Ledger üzerindeki TON Uygulamasının ayarlarında "Kör İmzalama" seçeneğini etkinleştirin.
 Switch to W5: W5'e Geç
+Not a Scam: Dolandırıcılık Değil
+Untitled: Başlıksız
diff --git a/src/i18n/uk.yaml b/src/i18n/uk.yaml
index 22cccf42..d9b00339 100644
--- a/src/i18n/uk.yaml
+++ b/src/i18n/uk.yaml
@@ -490,7 +490,7 @@ Wrong code, please try again: Неправильний код, спробуйт
 Scan your fingerprint: Відскануйте свій відбиток пальця
 Incorrect code, please try again.: Неправильний код, будь ласка, спробуйте знову.
 Correct: Правильно
-Confirm Operation: Підтвердіть операцію
+Confirm Action: Підтвердити дію
 Confirm Swap: Підтвердити обмін
 "%amount% to %address%": "%amount% на %address%"
 "%amount_from% to %amount_to%": "%amount_from% на %amount_to%"
@@ -646,3 +646,5 @@ $hardware_blind_sign_not_enabled: |
 
   Щоб продовжити, увімкніть опцію «Сліпе підписання» в налаштуваннях TON App на Ledger.
 Switch to W5: Версія W5
+Not a Scam: Не шахрайство
+Untitled: Без назви
diff --git a/src/i18n/zh-Hans.yaml b/src/i18n/zh-Hans.yaml
index 9c1307c9..730b979f 100644
--- a/src/i18n/zh-Hans.yaml
+++ b/src/i18n/zh-Hans.yaml
@@ -475,7 +475,7 @@ Wrong code, please try again: 代码错误，请重试
 Scan your fingerprint: 扫描您的指纹
 Incorrect code, please try again.: 不正确的代码，请重试。
 Correct: 正确
-Confirm Operation: 确认操作
+Confirm Action: 确认操作
 Confirm Swap: 确认兑换
 "%amount% to %address%": "%amount% 至 %address%"
 "%amount_from% to %amount_to%": "%amount_from% 至 %amount_to%"
@@ -630,3 +630,5 @@ $hardware_blind_sign_not_enabled: |
 
   要继续，请在 Ledger 的 TON 应用程序设置中启用“盲签名”选项。
 Switch to W5: 切换到 W5
+Not a Scam: 不是骗局
+Untitled: 未命名
diff --git a/src/i18n/zh-Hant.yaml b/src/i18n/zh-Hant.yaml
index eb407863..4783aa17 100644
--- a/src/i18n/zh-Hant.yaml
+++ b/src/i18n/zh-Hant.yaml
@@ -475,7 +475,7 @@ Wrong code, please try again: 程式碼錯誤，請重試
 Scan your fingerprint: 掃描您的指紋
 Incorrect code, please try again.: 不正確的代碼，請重試。
 Correct: 不錯
-Confirm Operation: 確認操作
+Confirm Action: 確認操作
 Confirm Swap: 確認兌換
 "%amount% to %address%": "%amount% 至 %address%"
 "%amount_from% to %amount_to%": "%amount_from% 至 %amount_to%"
@@ -630,3 +630,5 @@ $hardware_blind_sign_not_enabled: |
 
   要繼續，請在 Ledger 的 TON 應用程序設置中啟用“盲簽名”選項。
 Switch to W5: 切換到 W5
+Not a Scam: 不是騙局
+Untitled: 未命名
diff --git a/src/lib/confusables/LICENSE.md b/src/lib/confusables/LICENSE.md
new file mode 100644
index 00000000..24652fb4
--- /dev/null
+++ b/src/lib/confusables/LICENSE.md
@@ -0,0 +1,24 @@
+# The MIT License (MIT)
+
+Copyright © `2019` `https://github.com/gc/`
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/lib/confusables/characters.ts b/src/lib/confusables/characters.ts
new file mode 100644
index 00000000..3500be3f
--- /dev/null
+++ b/src/lib/confusables/characters.ts
@@ -0,0 +1,90 @@
+export const characters = new Map<string, string>([
+  [' ', ' '],
+  ['0', '⓿'],
+  ['1', '11⓵➊⑴¹𝟏𝟙１𝟷𝟣⒈𝟭1➀₁①❶⥠'],
+  ['2', '⓶⒉⑵➋ƻ²ᒿ𝟚２𝟮𝟤ᒾ𝟸Ƨ𝟐②ᴤ₂➁❷ᘝƨ'],
+  ['3', '³ȝჳⳌꞫ𝟑ℨ𝟛𝟯𝟥Ꝫ➌ЗȜ⓷ӠƷ３𝟹⑶⒊ʒʓǯǮƺ𝕴ᶾзᦡ➂③₃ᶚᴣᴟ❸ҘҙӬӡӭӟӞ'],
+  ['4', '𝟰𝟺𝟦𝟒➍ҶᏎ𝟜ҷ⓸ҸҹӴӵᶣ４чㄩ⁴➃₄④❹Ӌ⑷⒋'],
+  ['5', '𝟱⓹➎Ƽ𝟓𝟻𝟝𝟧５➄₅⑤⁵❺ƽ⑸⒌'],
+  ['6', 'Ⳓ🄇𝟼Ꮾ𝟲𝟞𝟨𝟔➏⓺Ϭϭ⁶б６ᧈ⑥➅₆❻⑹⒍'],
+  ['7', '𝟕𝟟𝟩𝟳𝟽🄈⓻𐓒➐７⁷⑦₇❼➆⑺⒎'],
+  ['8', '𐌚🄉➑⓼８𝟠𝟪৪⁸₈𝟴➇⑧❽𝟾𝟖⑻⒏'],
+  ['9', '൭Ꝯ𝝑𝞋𝟅🄊𝟡𝟵Ⳋ⓽➒੧৭୨９𝟫𝟿𝟗⁹₉Գ➈⑨❾⑼⒐'],
+  ['10', '⓾❿➉➓🔟⑩⑽⒑'],
+  ['11', '⑪⑾⒒⓫'],
+  ['12', '⑫⑿⒓⓬'],
+  ['13', '⑬⒀⒔⓭'],
+  ['14', '⑭⒁⒕⓮'],
+  ['15', '⑮⒂⒖⓯'],
+  ['16', '⑯⒃⒗⓰'],
+  ['17', '⑰⒄⒘⓱'],
+  ['18', '⑱⒅⒙⓲'],
+  ['19', '⑲⒆⒚⓳'],
+  ['20', '⑳⒇⒛⓴'],
+  ['ae', 'æ'],
+  ['OE', 'Œ'],
+  ['oe', 'œ'],
+  ['pi', 'ᒆ'],
+  ['Nj', 'Nj'],
+  ['AE', 'ᴁ'],
+  ['A', '𝑨𝔄ᗄ𝖠𝗔ꓯ𝞐🄐🄰Ꭿ𐊠𝕬𝜜𝐴ꓮᎪ𝚨ꭺ𝝖🅐Å∀🇦₳🅰𝒜𝘈𝐀𝔸дǺᗅⒶＡΑᾋᗩĂÃÅǍȀȂĀȺĄʌΛλƛᴀᴬДАልÄₐᕱªǞӒΆẠẢẦẨẬẮẰẲẴẶᾸᾹᾺΆᾼᾈᾉᾊᾌᾍᾎᾏἈἉἊἋἌἍἎἏḀȦǠӐÀÁÂẤẪ𝛢𝓐𝙰𝘼ᗩ'],
+  ['a', '∂⍺ⓐձǟᵃᶏ⒜аɒａαȃȁคǎმäɑāɐąᾄẚạảǡầẵḁȧӑӓãåάὰάăẩằẳặᾀᾁᾂᾃᾅᾆᾰᾱᾲᾳᾴᶐᾶᾷἀἁἂἃἄἅἆἇᾇậắàáâấẫǻⱥ𝐚𝑎𝒂𝒶𝓪𝔞𝕒𝖆𝖺𝗮𝘢𝙖𝚊𝛂𝛼𝜶𝝰𝞪⍶'],
+  ['B', '🄑𝔙𝖁ꞵ𝛃𝛽𝜷𝝱𝞫Ᏸ𐌁𝑩𝕭🄱𐊡𝖡𝘽ꓐ𝗕𝘉𝜝𐊂𝚩𝐁𝛣𝝗𝐵𝙱𝔹Ᏼᏼ𝞑Ꞵ𝔅🅑฿𝓑ᗿᗾᗽ🅱ⒷＢвϐᗷƁ乃ßცჩ๖βɮБՅ๒ᙖʙᴮᵇጌḄℬΒВẞḂḆɃദᗹᗸᵝᙞᙟᙝᛒᙗᙘᴃ🇧'],
+  ['b', 'ꮟᏏ𝐛𝘣𝒷𝔟𝓫𝖇𝖻𝑏𝙗𝕓𝒃𝗯𝚋♭ᑳᒈｂᖚᕹᕺⓑḃḅҍъḇƃɓƅᖯƄЬᑲþƂ⒝ЪᶀᑿᒀᒂᒁᑾьƀҌѢѣᔎ'],
+  ['C', 'ꞆႠ℃🄒ᏟⲤ🄲ꓚ𐊢𐌂🅲𐐕🅒☾ČÇⒸＣↃƇᑕㄈ¢८↻ĈϾՇȻᙅᶜ⒞ĆҀĊ©टƆℂℭϹС匚ḈҪʗᑖᑡᑢᑣᑤᑥⅭ𝐂𝐶𝑪𝒞𝓒𝕮𝖢𝗖𝘊𝘾ᔍ'],
+  ['c', '🝌ｃⅽ𝐜𝑐𝒄𝒸𝓬𝔠𝕔𝖈𝖼𝗰𝘤𝙘𝚌ᴄϲⲥсꮯ𐐽ⲥ𐐽ꮯĉｃⓒćčċçҁƈḉȼↄсርᴄϲҫ꒝ςɽϛ𝙲ᑦ᧚𝐜𝑐𝒄𝒸𝓬𝔠𝕔𝖈𝖼𝗰𝘤𝙘𝚌₵🇨ᥴᒼⅽ'],
+  ['D', '🄓Ꭰ🄳𝔡𝖉𝔻𝗗𝘋𝙳𝐷𝓓𝐃𝑫𝕯𝖣𝔇𝘿ꭰⅅ𝒟ꓓ🅳🅓ⒹＤƉᗪƊÐԺᴅᴰↁḊĐÞⅮᗞᑯĎḌḐḒḎᗫᗬᗟᗠᶛᴆ🇩'],
+  ['d', 'Ꮷ𝔡𝖉ᑯꓒ𝓭ᵭ₫ԃⓓｄḋďḍḑḓḏđƌɖɗᵈ⒟ԁⅾᶁԀᑺᑻᑼᑽᒄᑰᑱᶑ𝕕𝖽𝑑𝘥𝒅𝙙𝐝𝗱𝚍ⅆ𝒹ʠժ'],
+  ['E', '£ᙓ⋿∃ⴺꓱ𝐄𝐸𝔈𝕰𝖤𝘌𝙴𝛦𝜠ꭼ🄔🄴𝙀𝔼𐊆𝚬ꓰ𝝚𝞔𝓔𝑬𝗘🅴🅔ⒺΈＥƎἝᕮƐモЄᴇᴱᵉÉ乇ЁɆꂅ€ÈℰΕЕⴹᎬĒĔĖĘĚÊËԐỀẾỄỂẼḔḖẺȄȆẸỆȨḜḘḚἘἙἚἛἜῈΈӖὲέЀϵ🇪'],
+  ['e', 'əәⅇꬲꞓ⋴𝛆𝛜𝜀𝜖𝜺𝝐𝝴𝞊𝞮𝟄ⲉꮛ𐐩ꞒⲈ⍷𝑒𝓮𝕖𝖊𝘦𝗲𝚎𝙚𝒆𝔢𝖾𝐞Ҿҿⓔｅ⒠èᧉéᶒêɘἔềếễ૯ǝєεēҽɛểẽḕḗĕėëẻěȅȇẹệȩɇₑęḝḙḛ℮еԑѐӗᥱёἐἑἒἓἕℯ'],
+  ['F', 'ᖵꘘꓞꟻᖷ𝐅𝐹𝑭𝔽𝕱𝖥𝗙𝙁𝙵𝟊℉🄕🄵𐊇𝔉𝘍𐊥ꓝꞘ🅵🅕𝓕ⒻＦғҒᖴƑԲϝቻḞℱϜ₣🇫Ⅎ'],
+  ['f', '𝐟ᵮ𝑓𝒇𝒻𝓯𝔣𝕗𝖿𝗳𝙛𝚏ꬵꞙẝ𝖋ⓕｆƒḟʃբᶠ⒡ſꊰʄ∱ᶂ𝘧'],
+  ['G', '𝗚𝘎🄖ꓖᏳ🄶Ꮐᏻ𝔾𝓖𝑮𝕲ꮐ𝒢𝙂𝖦𝙶𝔊𝐺𝐆🅶🅖ⒼＧɢƓʛĢᘜᴳǴĠԌĜḠĞǦǤԍ₲🇬⅁'],
+  ['g', 'ᶃᶢⓖｇǵĝḡğġǧģց૭ǥɠﻭﻮᵍ⒢ℊɡᧁ𝐠𝑔𝒈𝓰𝔤𝕘𝖌𝗀𝗴𝘨𝙜𝚐'],
+  ['H', 'Ἤ🄗𝆦🄷𝜢ꓧ𝘏𝐻𝝜𝖧𐋏𝗛ꮋℍᎻℌⲎ𝑯𝞖🅷🅗ዞǶԋⒽＨĤᚺḢḦȞḤḨḪĦⱧҢңҤῊΉῌἨἩἪἫἭἮἯᾘᾙᾚᾛᾜᾝᾞᾟӉӈҥΉн卄♓𝓗ℋН𝐇𝙃𝙷ʜ𝛨Η𝚮ᕼӇᴴᵸ🇭'],
+  ['h', 'ꞕ৸𝕳ꚕᏲℏӊԊꜧᏂҺ⒣ђⓗｈĥḣḧȟḥḩḫẖħⱨհһከኩኪካɦℎ𝐡𝒉𝒽𝓱𝔥𝕙𝖍𝗁𝗵𝘩𝙝𝚑իʰᑋᗁɧんɥ'],
+  ['I', 'ⲒἿ🄘🄸ЇꀤᏆ🅸🅘إﺇٳأﺃٲٵⒾＩ៸ÌÍÎĨĪĬİÏḮỈǏȈȊỊĮḬƗェエῘῙῚΊἸἹἺἻἼἽἾⅠΪΊɪᶦᑊᥣ𝛪𝐈𝙄𝙸𝓵𝙡𝐼ᴵ𝚰𝑰🇮'],
+  ['i', '⍳ℹⅈ𝑖𝒊𝒾ı𝚤ɩιιͺ𝛊𝜄𝜾𝞲ꙇӏꭵᎥⓘｉìíîĩīĭïḯỉǐȉȋịḭῐῑῒΐῖῗἰἱἲⅰⅼ∣ⵏ￨׀ا١۱ߊᛁἳἴἵɨіὶίᶖ𝔦𝚒𝝸𝗂𝐢𝕚𝖎𝗶𝘪𝙞ίⁱᵢ𝓲⒤'],
+  ['J', '𝐉𝐽𝑱𝒥𝓙𝔍𝕁𝕵𝖩𝗝𝘑𝙅𝙹ꞲͿꓙ🄙🄹🅹🅙ⒿＪЈʝᒍנﾌĴʆวلյʖᴊᴶﻝጋɈⱼՂๅႱįᎫȷ丿ℐℑᒘᒙᒚᒛᒴᒵᒎᒏ🇯'],
+  ['j', '𝚥ꭻⅉⓙｊϳʲ⒥ɉĵǰјڶᶨ𝒿𝘫𝗷𝑗𝙟𝔧𝒋𝗃𝓳𝕛𝚓𝖏𝐣'],
+  ['K', '𝐊ꝄꝀ𝐾𝑲𝓚𝕶𝖪𝙺𝚱𝝟🄚𝗞🄺𝜥𝘒ꓗ𝙆𝕂Ⲕ𝔎𝛫Ꮶ𝞙𝒦🅺🅚₭ⓀＫĸḰќƘкҠκқҟӄʞҚКҡᴋᴷᵏ⒦ᛕЌጕḲΚKҜҝҞĶḴǨⱩϗӃ🇰'],
+  ['k', 'ⓚꝁｋḱǩḳķḵƙⱪᶄ𝐤𝘬𝗄𝕜𝜅𝜘𝜿𝝒𝝹𝞌𝞳𝙠𝚔𝑘𝒌ϰ𝛋𝛞𝟆𝗸𝓴𝓀'],
+  ['L', '𝐋𝐿𝔏𝕃𝕷𝖫𝗟𝘓𝙇ﴼ🄛🄻𐐛Ⳑ𝑳𝙻𐑃𝓛ⳑꮮᏞꓡ🅻🅛ﺈ└ⓁւＬĿᒪ乚ՆʟꓶιԼᴸˡĹረḶₗΓլĻᄂⅬℒⱢᥧᥨᒻᒶᒷᶫﺎᒺᒹᒸᒫ⎳ㄥŁⱠﺄȽ🇱'],
+  ['l', 'ⓛｌŀĺľḷḹļӀℓḽḻłﾚɭƚɫⱡ|Ɩ⒧ʅǀוןΙІ｜ᶩӏ𝓘𝕀𝖨𝗜𝘐𝐥𝑙𝒍𝓁𝔩𝕝𝖑𝗅𝗹𝘭𝚕𝜤𝝞ı𝚤ɩι𝛊𝜄𝜾𝞲'],
+  ['M', 'ꮇ🄜🄼𐌑𐊰ꓟⲘᎷ🅼🅜ⓂＭмṂ൱ᗰ州ᘻო๓♏ʍᙏᴍᴹᵐ⒨ḾМṀ௱ⅯℳΜϺᛖӍӎ𝐌𝑀𝑴𝓜𝔐𝕄𝕸𝖬𝗠𝘔𝙈𝙼𝚳𝛭𝜧𝝡𝞛🇲'],
+  ['m', '₥ᵯ𝖒𝐦𝗆𝔪𝕞𝓂ⓜｍനᙢ൩ḿṁⅿϻṃጠɱ៳ᶆ𝙢𝓶𝚖𝑚𝗺᧕᧗'],
+  ['N', '𝇙𝇚𝇜🄝𝆧𝙉🄽ℕꓠ𝛮𝝢𝙽𝚴𝑵𝑁Ⲛ𝐍𝒩𝞜𝗡𝘕𝜨𝓝𝖭🅽₦🅝ЙЍⓃҋ៷ＮᴎɴƝᑎ几иՈռИהЛπᴺᶰŃ刀ክṄⁿÑПΝᴨոϖǸŇṆŅṊṈทŊӢӣӤӥћѝйᥢҊᴻ🇳'],
+  ['n', 'ոռח𝒏𝓷𝙣𝑛𝖓𝔫𝗇𝚗𝗻ᥒⓝήｎǹᴒńñᾗηṅňṇɲņṋṉղຖՌƞŋ⒩ภกɳпʼnлԉȠἠἡῃդᾐᾑᾒᾓᾔᾕᾖῄῆῇῂἢἣἤἥἦἧὴήበቡቢባቤብቦȵ𝛈𝜂𝜼𝝶𝞰𝕟𝘯𝐧𝓃ᶇᵰᥥ∩'],
+  [
+    'O',
+    // eslint-disable-next-line max-len
+    '𝜽⭘🔿ꭴ⭕⏺🄁🄀Ꭴ𝚯𝚹𝛩𝛳𝜣𝜭𝝝𝝧𝞗𝞡ⴱᎾᏫ⍬𝞱𝝷𝛉𝟎𝜃θ𝟘𝑂𝑶𝓞𝔒𝕆𝕺𝗢𝘖𝙊𝛰㈇ꄲ🄞🔾🄾𐊒𝟬ꓳⲞ𐐄𐊫𐓂𝞞🅞⍥◯ⵁ⊖０⊝𝝤Ѳϴ𝚶𝜪ѺӦӨӪΌʘ𝐎ǑÒŎÓÔÕȌȎㇿ❍ⓄＯὋロ❤૦⊕ØФԾΘƠᴼᵒ⒪ŐÖₒ¤◊Φ〇ΟОՕଠഠ௦סỒỐỖỔṌȬṎŌṐṒȮȰȪỎỜỚỠỞỢỌỘǪǬǾƟⵔ߀៰⍜⎔⎕⦰⦱⦲⦳⦴⦵⦶⦷⦸⦹⦺⦻⦼⦽⦾⦿⧀⧁⧂⧃ὈὉὊὌὍ',
+  ],
+  [
+    'o',
+    // eslint-disable-next-line max-len
+    'ంಂംං૦௦۵ℴ𝑜𝒐𝖔ꬽ𝝄𝛔𝜎𝝈𝞂ჿ𝚘০୦ዐ𝛐𝗈𝞼ဝⲟ𝙤၀𐐬𝔬𐓪𝓸🇴⍤○ϙ🅾𝒪𝖮𝟢𝟶𝙾𝘰𝗼𝕠𝜊𝐨𝝾𝞸ᐤⓞѳ᧐ᥲðｏఠᦞՓòөӧóºōôǒȏŏồốȍỗổõσṍȭṏὄṑṓȯȫ๏ᴏőöѻоዐǭȱ০୦٥౦೦൦๐໐οօᴑ०੦ỏơờớỡởợọộǫøǿɵծὀὁόὸόὂὃὅ',
+  ],
+  ['P', '🄟🄿ꓑ𝚸𝙿𝞠𝙋ꮲⲢ𝒫𝝦𝑃𝑷𝗣𝐏𐊕𝜬𝘗𝓟𝖯𝛲Ꮲ🅟Ҏ🅿ⓅＰƤᑭ尸Ṗրφքᴘᴾᵖ⒫ṔｱקРየᴩⱣℙΡῬᑸᑶᑷᑹᑬᑮ🇵₱'],
+  ['p', 'ⲣҏ℗ⓟｐṕṗƥᵽῥρрƿǷῤ⍴𝓹𝓅𝐩𝑝𝒑𝔭𝕡𝖕𝗉𝗽𝘱𝙥𝚙𝛒𝝆𝞺𝜌𝞀'],
+  ['Q', '🅀🄠Ꝗ🆀🅠ⓆＱℚⵕԚ𝐐𝑄𝑸𝒬𝓠𝚀𝘘𝙌𝖰𝕼𝔔𝗤🇶'],
+  ['q', '𝓆ꝗ𝗾ⓠｑգ⒬۹զᑫɋɊԛ𝗊𝑞𝘲𝕢𝚚𝒒𝖖𝐪𝔮𝓺𝙦'],
+  ['R', '℞🄡℟ꭱᏒ𐒴ꮢᎡꓣ🆁🅡ⓇＲᴙȒʀᖇя尺ŔЯરƦᴿዪṚɌʁℛℜℝṘŘȐṜŖṞⱤ𝐑𝑅𝑹𝓡𝕽𝖱𝗥𝘙𝙍𝚁ᚱ🇷ᴚ'],
+  ['r', '𝚛ꭇᣴℾ𝚪𝛤𝜞𝝘𝞒ⲄГᎱᒥꭈⲅꮁⓡｒŕṙřȑȓṛṝŗгՐɾᥬṟɍʳ⒭ɼѓᴦᶉ𝐫𝑟𝒓𝓇𝓻𝔯𝕣𝖗𝗋𝗿𝘳𝙧ᵲґᵣ'],
+  ['S', '🅂🄪🄢ꇙ𝓢𝗦Ꮪ𝒮Ꮥ𝚂𝐒ꓢ𝖲𝔖𝙎𐊖𝕾𐐠𝘚𝕊𝑆𝑺🆂🅢ⓈＳṨŞֆՏȘˢ⒮ЅṠŠŚṤŜṦṢടᔕᔖᔢᔡᔣᔤ'],
+  ['s', 'ᣵⓢꜱ𐑈ꮪｓśṥŝṡšṧʂṣṩѕşșȿᶊక𝐬𝑠𝒔𝓈𝓼𝔰𝕤𝖘𝗌𝘀𝘴𝙨𝚜ގ🇸'],
+  ['T', '🅃🄣七ፒ𝜯🆃𐌕𝚻𝛵𝕋𝕿𝑻𐊱𐊗𝖳𝙏🝨𝝩𝞣𝚃𝘛𝑇ꓔ⟙𝐓Ⲧ𝗧⊤𝔗Ꭲꭲ𝒯🅣⏇⏉ⓉＴтҬҭƬイŦԵτᴛᵀｲፕϮŤ⊥ƮΤТ下ṪṬȚŢṰṮ丅丁ᐪ𝛕𝜏𝝉𝞃𝞽𝓣ㄒ🇹ጥ'],
+  ['t', 'ⓣｔṫẗťṭțȶ੮էʇ†ţṱṯƭŧᵗ⒯ʈեƫ𝐭𝑡𝒕𝓉𝓽𝔱𝕥𝖙𝗍𝘁𝘵𝙩𝚝ナ'],
+  ['U', '🅄Џ🄤ሀꓴ𐓎꒤🆄🅤ŨŬŮᑗᑘǓǕǗǙⓊＵȖᑌ凵ƱմԱꓵЦŪՄƲᙀᵁᵘ⒰ŰપÜՍÙÚÛṸṺǛỦȔƯỪỨỮỬỰỤṲŲṶṴɄᥩᑧ∪ᘮ⋃𝐔𝑈𝑼𝒰𝓤𝔘𝕌𝖀𝖴𝗨𝘜𝙐𝚄🇺'],
+  ['u', '𝘂𝘶𝙪𝚞ꞟꭎꭒ𝛖𝜐𝝊𝞄𝞾𐓶ὺύⓤｕùũūừṷṹŭǖữᥙǚǜὗυΰนսʊǘǔúůᴜűųยûṻцሁüᵾᵤµʋủȕȗưứửựụṳṵʉῠῡῢΰῦῧὐὑϋύὒὓὔὕὖᥔ𝐮𝑢𝒖𝓊𝓾𝔲𝕦𝖚𝗎ᶙ'],
+  ['V', '𝑉𝒱𝕍𝗩🄥🅅ꓦ𝑽𝖵𝘝Ꮩ𝚅𝙑𝐕🆅🅥ⓋＶᐯѴᵛ⒱۷ṾⅴⅤṼ٧ⴸѶᐺᐻ🇻𝓥'],
+  ['v', '∨⌄⋁ⅴ𝐯𝑣𝒗𝓋𝔳𝕧𝖛𝗏ꮩሀⓥｖ𝜐𝝊ṽṿ౮งѵעᴠνטᵥѷ៴ᘁ𝙫𝚟𝛎𝜈𝝂𝝼𝞶𝘷𝘃𝓿'],
+  ['W', '𝐖𝑊𝓦𝔚𝕎𝖂𝖶𝗪𝙒𝚆🄦🅆ᏔᎳ𝑾ꓪ𝒲𝘞🆆Ⓦ🅦ｗＷẂᾧᗯᥕ山ѠຟచաЩШώщฬшᙎᵂʷ⒲ฝሠẄԜẀŴẆẈധᘺѿᙡƜ₩🇼'],
+  ['w', '𝐰ꝡ𝑤𝒘𝓌𝔀𝔴𝕨𝖜𝗐𝘄𝘸𝙬𝚠աẁꮃẃⓦ⍵ŵẇẅẘẉⱳὼὠὡὢὣωὤὥὦὧῲῳῴῶῷⱲѡԝᴡώᾠᾡᾢᾣᾤᾥᾦɯ𝝕𝟉𝞏'],
+  ['X', 'ꭓꭕ𝛘𝜒𝝌𝞆𝟀ⲭ🞨𝑿𝛸🄧🞩🞪🅇🞫🞬𐌗Ⲭꓫ𝖃𝞦𝘟𐊐𝚾𝝬𝜲Ꭓ𐌢𝖷𝑋𝕏𝔛𐊴𝗫🆇🅧❌Ⓧ𝓧ＸẊ᙭χㄨ𝒳ӾჯӼҳЖΧҲᵡˣ⒳אሸẌꊼⅩХ╳᙮ᕁᕽⅹᚷⵝ𝙓𝚇乂𝐗🇽'],
+  ['x', '᙮ⅹ𝑥𝒙𝓍𝔵𝕩𝖝𝗑𝘅ᕁᕽⓧｘхẋ×ₓ⤫⤬⨯ẍᶍ𝙭ӽ𝘹𝐱𝚡⨰ﾒ𝔁'],
+  ['Y', '𝒴🄨𝓨𝔜𝖄𝖸𝘠𝙔𝚼𝛶𝝪𝞤УᎩᎽⲨ𝚈𝑌𝗬𝐘ꓬ𝒀𝜰𐊲🆈🅨ⓎＹὛƳㄚʏ⅄ϔ￥¥ՎϓγץӲЧЎሃŸɎϤΥϒҮỲÝŶỸȲẎỶỴῨῩῪΎὙὝὟΫΎӮӰҰұ𝕐🇾'],
+  ['y', '𝐲𝑦𝒚𝓎𝔂𝔶𝕪𝖞𝗒𝘆𝘺𝙮𝚢ʏỿꭚγℽ𝛄𝛾𝜸𝝲𝞬🅈ᎽᎩⓨｙỳýŷỹȳẏÿỷуყẙỵƴɏᵞɣʸᶌү⒴ӳӱӯўУʎ'],
+  ['Z', '🄩🅉ꓜ𝗭𝐙☡Ꮓ𝘡🆉🅩ⓏＺẔƵ乙ẐȤᶻ⒵ŹℤΖŻŽẒⱫ🇿'],
+  ['z', '𝑍𝒁𝒵𝓩𝖹𝙕𝚉𝚭𝛧𝜡𝝛𝞕ᵶꮓ𝐳𝑧𝒛𝓏𝔃𝔷𝕫𝖟𝗓𝘇𝘻𝙯𝚣ⓩｚźẑżžẓẕƶȥɀᴢጊʐⱬᶎʑᙆ'],
+]);
diff --git a/src/lib/confusables/index.ts b/src/lib/confusables/index.ts
new file mode 100644
index 00000000..c1966f89
--- /dev/null
+++ b/src/lib/confusables/index.ts
@@ -0,0 +1,27 @@
+// Original repo: https://github.com/gc/confusables
+
+import { checkLNP, clean } from './util';
+import { characters } from './characters';
+
+const alphabetMap = new Map<string, string[]>();
+const confusablesMap = new Map<string, string>();
+
+for (const [base, alts] of characters.entries()) {
+  alphabetMap.set(base, [...alts]);
+
+  for (const char of alts) {
+    confusablesMap.set(char, base);
+  }
+}
+
+export function cleanText(str: string) {
+  if (checkLNP(str)) return str;
+
+  let newStr = '';
+
+  for (const char of clean(str)) {
+    newStr += confusablesMap.get(char) || char;
+  }
+
+  return newStr;
+}
diff --git a/src/lib/confusables/util.ts b/src/lib/confusables/util.ts
new file mode 100644
index 00000000..490fe1fb
--- /dev/null
+++ b/src/lib/confusables/util.ts
@@ -0,0 +1,31 @@
+/* eslint-disable max-len, no-misleading-character-class, no-control-regex, operator-linebreak */
+/** @copyright Mathias Bynens <https://mathiasbynens.be/>. MIT license. */
+const RE_SYMBOL_WITH_COMBINING_MARKS =
+  /([\0-\u02FF\u0370-\u1AAF\u1B00-\u1DBF\u1E00-\u20CF\u2100-\uD7FF\uE000-\uFE1F\uFE30-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])([\u0300-\u036F\u1AB0-\u1AFF\u1DC0-\u1DFF\u20D0-\u20FF\uFE20-\uFE2F]+)/g;
+/** @copyright Mathias Bynens <https://mathiasbynens.be/>. MIT license. */
+const RE_LINEBREAK_COMBINING_MARKS =
+  /[\0-\x08\x0E-\x1F\x7F-\x84\x86-\x9F\u0300-\u034E\u0350-\u035B\u0363-\u036F\u0483-\u0489\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u0610-\u061A\u061C\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08D4-\u08E1\u08E3-\u0903\u093A-\u093C\u093E-\u094F\u0951-\u0957\u0962\u0963\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7\u09C8\u09CB-\u09CD\u09D7\u09E2\u09E3\u0A01-\u0A03\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A70\u0A71\u0A75\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AE2\u0AE3\u0B01-\u0B03\u0B3C\u0B3E-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B62\u0B63\u0B82\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C00-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0C81-\u0C83\u0CBC\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CE2\u0CE3\u0D01-\u0D03\u0D3E-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D62\u0D63\u0D82\u0D83\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2\u0DF3\u0F18\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F7E\u0F80-\u0F84\u0F86\u0F87\u0F8D-\u0F97\u0F99-\u0FBC\u0FC6\u135D-\u135F\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u180B-\u180D\u1885\u1886\u18A9\u1920-\u192B\u1930-\u193B\u1A17-\u1A1B\u1A7F\u1AB0-\u1ABE\u1B00-\u1B04\u1B34-\u1B44\u1B6B-\u1B73\u1B80-\u1B82\u1BA1-\u1BAD\u1BE6-\u1BF3\u1C24-\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE8\u1CED\u1CF2-\u1CF4\u1CF8\u1CF9\u1DC0-\u1DF5\u1DFB-\u1DFF\u200C\u200E\u200F\u202A-\u202E\u2066-\u206F\u20D0-\u20F0\u2CEF-\u2CF1\u2D7F\u2DE0-\u2DFF\u302A-\u302F\u3035\u3099\u309A\uA66F-\uA672\uA674-\uA67D\uA69E\uA69F\uA6F0\uA6F1\uA802\uA806\uA80B\uA823-\uA827\uA880\uA881\uA8B4-\uA8C5\uA8E0-\uA8F1\uA926-\uA92D\uA947-\uA953\uA980-\uA983\uA9B3-\uA9C0\uAA29-\uAA36\uAA43\uAA4C\uAA4D\uAAEB-\uAAEF\uAAF5\uAAF6\uABE3-\uABEA\uABEC\uABED\uFB1E\uFE00-\uFE0F\uFE20-\uFE2F\uFFF9-\uFFFB]|\uD800[\uDDFD\uDEE0\uDF76-\uDF7A]|\uD802[\uDE01-\uDE03\uDE05\uDE06\uDE0C-\uDE0F\uDE38-\uDE3A\uDE3F\uDEE5\uDEE6]|\uD804[\uDC00-\uDC02\uDC38-\uDC46\uDC7F-\uDC82\uDCB0-\uDCBA\uDD00-\uDD02\uDD27-\uDD34\uDD73\uDD80-\uDD82\uDDB3-\uDDC0\uDDCA-\uDDCC\uDE2C-\uDE37\uDE3E\uDEDF-\uDEEA\uDF00-\uDF03\uDF3C\uDF3E-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF57\uDF62\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC35-\uDC46\uDCB0-\uDCC3\uDDAF-\uDDB5\uDDB8-\uDDC0\uDDDC\uDDDD\uDE30-\uDE40\uDEAB-\uDEB7]|\uD807[\uDC2F-\uDC36\uDC38-\uDC3F\uDC92-\uDCA7\uDCA9-\uDCB6]|\uD81A[\uDEF0-\uDEF4\uDF30-\uDF36]|\uD81B[\uDF51-\uDF7E\uDF8F-\uDF92]|\uD82F[\uDC9D\uDC9E\uDCA0-\uDCA3]|\uD834[\uDD65-\uDD69\uDD6D-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD838[\uDC00-\uDC06\uDC08-\uDC18\uDC1B-\uDC21\uDC23\uDC24\uDC26-\uDC2A]|\uD83A[\uDCD0-\uDCD6\uDD44-\uDD4A]|\uDB40[\uDC01\uDC20-\uDC7F\uDD00-\uDDEF]/g;
+const RE_SPACE_CHARS = /[\n\r]/g;
+const RE_FAKE_DOTS = /[\u0702\u0701\u2024\u00B7\u02D9\u0971\u1427\u18DF\u22C5\u2027]/g;
+const RE_EMPTY_CHARS = /[\u200B-\u200D\uFEFF\u2063]/g;
+/* eslint-enable max-len, no-misleading-character-class, no-control-regex, operator-linebreak */
+
+/** Skippable characters that are not confusables */
+export const checkLNPRegex = /^(?:[~`!@#%^&*(){}[\];:"'<,.>?/\\|_+=-]|[a-zA-Z0-9\s])+$/;
+
+export function checkLNP(str: string) {
+  return checkLNPRegex.test(str);
+}
+
+/**
+ * Utility function to call 2 other functions which remove Combining Marks/Invisible characters
+ * @param str The text to clean.
+ */
+export function clean(str: string) {
+  return str
+    .replace(RE_LINEBREAK_COMBINING_MARKS, '')
+    .replace(RE_SYMBOL_WITH_COMBINING_MARKS, '$1')
+    .replace(RE_SPACE_CHARS, ' ')
+    .replace(RE_FAKE_DOTS, '.')
+    .replace(RE_EMPTY_CHARS, '');
+}
diff --git a/src/util/fetch.ts b/src/util/fetch.ts
index e0e9b5d5..6dbd6c44 100644
--- a/src/util/fetch.ts
+++ b/src/util/fetch.ts
@@ -106,5 +106,5 @@ export async function handleFetchErrors(response: Response, ignoreHttpCodes?: nu
 }
 
 function isNotTemporaryError(message?: string, statusCode?: number) {
-  return statusCode === 400;
+  return statusCode && [400, 404].includes(statusCode);
 }
diff --git a/src/util/formatNumber.ts b/src/util/formatNumber.ts
index a4c6e667..0232092c 100644
--- a/src/util/formatNumber.ts
+++ b/src/util/formatNumber.ts
@@ -19,8 +19,12 @@ export const formatInteger = withCache((
   noFloor?: boolean,
 ) => {
   value = Big(value);
-  const dp = value.gte(1) ? fractionDigits : DEFAULT_DECIMAL_PLACES;
-  const fixed = value.round(dp, noFloor ? Big.roundHalfUp : undefined).toString();
+  const dp = value.gte(1) || noFloor ? fractionDigits : DEFAULT_DECIMAL_PLACES;
+  let fixed = value.round(dp, noFloor ? Big.roundHalfUp : undefined).toString();
+
+  if (fixed === '0') {
+    fixed = value.toString();
+  }
 
   let [wholePart, fractionPart = ''] = fixed.split('.');
 
diff --git a/src/util/ledger/index.ts b/src/util/ledger/index.ts
index 0752d7ed..586c0055 100644
--- a/src/util/ledger/index.ts
+++ b/src/util/ledger/index.ts
@@ -16,14 +16,15 @@ import type {
   ApiLocalTransactionParams,
   ApiNetwork, ApiNft,
   ApiSignedTransfer,
+  ApiStakingType,
   ApiSubmitTransferOptions,
   Workchain,
 } from '../../api/types';
 import type { LedgerWalletInfo } from './types';
-import { ApiTransactionError } from '../../api/types';
+import { ApiLiquidUnstakeMode, ApiTransactionError } from '../../api/types';
 
 import {
-  BURN_ADDRESS,
+  BURN_ADDRESS, LIQUID_JETTON, LIQUID_POOL,
   NOTCOIN_EXCHANGERS, NOTCOIN_VOUCHERS_ADDRESS, ONE_TON, TONCOIN_SLUG,
 } from '../../config';
 import { callApi } from '../../api';
@@ -40,6 +41,7 @@ import {
   WORKCHAIN,
 } from '../../api/blockchains/ton/constants';
 import {
+  buildLiquidStakingWithdrawCustomPayload,
   commentToBytes,
   packBytesAsSnakeCell,
   toBase64Address,
@@ -199,22 +201,43 @@ async function connectUSB() {
 export async function submitLedgerStake(
   accountId: string,
   amount: bigint,
+  type: ApiStakingType,
   fee?: bigint,
 ) {
   const { network } = parseAccountId(accountId);
   const address = await callApi('fetchAddress', accountId);
-  const backendState = await callApi('fetchBackendStakingState', address!, true);
 
-  const poolAddress = toBase64Address(backendState!.nominatorsPool.address, true, network);
+  let result: string | { error: ApiTransactionError } | undefined;
 
-  const result = await submitLedgerTransfer({
-    accountId,
-    password: '',
-    toAddress: poolAddress,
-    amount,
-    comment: STAKE_COMMENT,
-    fee,
-  }, TONCOIN_SLUG, { type: 'stake' });
+  if (type === 'liquid') {
+    amount += ONE_TON;
+
+    const payload: TonPayloadFormat = {
+      type: 'tonstakers-deposit',
+      queryId: 0n,
+      // eslint-disable-next-line no-null/no-null
+      appId: null,
+    };
+
+    result = await submitLedgerTransfer({
+      accountId,
+      password: '',
+      toAddress: LIQUID_POOL,
+      amount,
+    }, TONCOIN_SLUG, { type: 'stake' }, payload);
+  } else {
+    const backendState = await callApi('fetchBackendStakingState', address!);
+    const poolAddress = toBase64Address(backendState!.nominatorsPool.address, true, network);
+
+    result = await submitLedgerTransfer({
+      accountId,
+      password: '',
+      toAddress: poolAddress,
+      amount,
+      comment: STAKE_COMMENT,
+      fee,
+    }, TONCOIN_SLUG, { type: 'stake' });
+  }
 
   if (result) {
     await callApi('updateAccountMemoryCache', accountId, address!, { stakedAt: Date.now() });
@@ -225,19 +248,46 @@ export async function submitLedgerStake(
   return result;
 }
 
-export async function submitLedgerUnstake(accountId: string) {
+export async function submitLedgerUnstake(accountId: string, type: ApiStakingType, amount: bigint) {
   const { network } = parseAccountId(accountId);
-  const address = await callApi('fetchAddress', accountId);
-  const backendState = await callApi('fetchBackendStakingState', address!, true);
+  const address = (await callApi('fetchAddress', accountId))!;
+  const { backendState, state: stakingState } = (await callApi('getStakingState', accountId))!;
 
-  const poolAddress = toBase64Address(backendState!.nominatorsPool.address, true, network);
-  const result = await submitLedgerTransfer({
-    accountId,
-    password: '',
-    toAddress: poolAddress,
-    amount: ONE_TON,
-    comment: UNSTAKE_COMMENT,
-  }, TONCOIN_SLUG, { type: 'unstakeRequest' });
+  let result: string | { error: ApiTransactionError } | undefined;
+
+  if (type === 'liquid') {
+    const tokenWalletAddress = await callApi('resolveTokenWalletAddress', network, address, LIQUID_JETTON);
+    const mode = stakingState.type === 'liquid' && !stakingState.instantAvailable
+      ? ApiLiquidUnstakeMode.BestRate
+      : ApiLiquidUnstakeMode.Default;
+
+    const fillOrKill = false;
+    const waitTillRoundEnd = mode === ApiLiquidUnstakeMode.BestRate;
+
+    const payload: TonPayloadFormat = {
+      type: 'jetton-burn',
+      queryId: 0n,
+      amount,
+      responseDestination: Address.parse(address),
+      customPayload: buildLiquidStakingWithdrawCustomPayload(fillOrKill, waitTillRoundEnd),
+    };
+
+    result = await submitLedgerTransfer({
+      accountId,
+      password: '',
+      toAddress: tokenWalletAddress!,
+      amount: ONE_TON,
+    }, TONCOIN_SLUG, { type: 'unstakeRequest' }, payload);
+  } else {
+    const poolAddress = toBase64Address(backendState!.nominatorsPool.address, true, network);
+    result = await submitLedgerTransfer({
+      accountId,
+      password: '',
+      toAddress: poolAddress,
+      amount: ONE_TON,
+      comment: UNSTAKE_COMMENT,
+    }, TONCOIN_SLUG, { type: 'unstakeRequest' });
+  }
 
   await callApi('onStakingChangeExpected');
 
@@ -248,6 +298,7 @@ export async function submitLedgerTransfer(
   options: ApiSubmitTransferOptions,
   slug: string,
   localTransactionParams?: Partial<ApiLocalTransactionParams>,
+  payload?: TonPayloadFormat,
 ) {
   const {
     accountId, tokenAddress, comment, fee,
@@ -267,7 +318,6 @@ export async function submitLedgerTransfer(
 
   const { seqno, balance } = walletInfo!;
 
-  let payload: TonPayloadFormat | undefined;
   const parsedAddress = Address.parseFriendly(toAddress);
   let isBounceable = parsedAddress.isBounceable;
   const normalizedAddress = parsedAddress.address.toString({ urlSafe: true, bounceable: DEFAULT_IS_BOUNCEABLE });