fix: add bip39

apps/desktop/src/app/App.tsx

@@ -81,10 +81,10 @@ import { DesktopManageMultisigsPage } from '@tonkeeper/uikit/dist/desktop-pages/
 import { useGlobalSetup } from '@tonkeeper/uikit/dist/state/globalSetup';
 import { DesktopMultisigOrdersPage } from '@tonkeeper/uikit/dist/desktop-pages/multisig-orders/DesktopMultisigOrders';
 import { useRealtimeUpdatesInvalidation } from '@tonkeeper/uikit/dist/hooks/realtime';
-import { DesktopMobileAppBanner } from '@tonkeeper/uikit/dist/components/pro/DesktopMobileAppBanner';
 import { CryptoStrategyInstaller } from '@tonkeeper/uikit/dist/components/pro/CryptoStrategyInstaller';
 import { localesList } from '@tonkeeper/locales/localesList';
 import { useAppCountryInfo } from '@tonkeeper/uikit/dist/state/country';
+import { SecureWalletNotification } from '@tonkeeper/uikit/dist/components/desktop/SecureWalletNotification';
 
 const queryClient = new QueryClient({
     defaultOptions: {
@@ -361,11 +361,7 @@ export const Content: FC<{
     useRealtimeUpdatesInvalidation();
 
     if (lock) {
-        return (
-            <FullSizeWrapper>
-                <Unlock />
-            </FullSizeWrapper>
-        );
+        return <Unlock />;
     }
 
     if (!activeAccount || location.pathname.startsWith(AppRoute.import)) {
@@ -461,6 +457,7 @@ const BackgroundElements = () => {
             <PairSignerNotification />
             <ConnectLedgerNotification />
             <PairKeystoneNotification />
+            <SecureWalletNotification />
         </>
     );
 };

apps/desktop/src/electron/background.ts

@@ -5,13 +5,18 @@ import { mainStorage } from './storageService';
 import { cookieJar } from './cookie';
 import { tonConnectSSE } from './sseEvetns';
 import { isValidUrlProtocol } from '@tonkeeper/core/dist/utils/common';
+import * as electron from 'electron';
+import BaseWindow = Electron.BaseWindow;
 
 const service = 'tonkeeper.com';
 
 const authorizedOpenUrlProtocols = ['http:', 'https:', 'tg:', 'mailto:'];
 
 // eslint-disable-next-line complexity
-export const handleBackgroundMessage = async (message: Message): Promise<unknown> => {
+export const handleBackgroundMessage = async (
+    window: BaseWindow,
+    message: Message
+): Promise<unknown> => {
     switch (message.king) {
         case 'storage-set':
             return mainStorage.set(message.key, message.value);
@@ -102,6 +107,9 @@ export const handleBackgroundMessage = async (message: Message): Promise<unknown
             const locale = app.getLocale();
             return locale.replaceAll('_', '-').split('-')[0] || null;
         }
+        case 'show-confirm-dialog': {
+            return electron.dialog.showMessageBoxSync(window, message.options);
+        }
         default:
             throw new Error(`Unknown message: ${JSON.stringify(message)}`);
     }

apps/desktop/src/electron/mainWindow.ts

@@ -68,7 +68,7 @@ export abstract class MainWindow {
 
         ipcMain.handle('message', async (event, message: Message) => {
             try {
-                return await handleBackgroundMessage(message);
+                return await handleBackgroundMessage(this.mainWindow, message);
             } catch (e) {
                 return e;
             }

apps/desktop/src/libs/appSdk.ts

@@ -4,7 +4,8 @@ import {
     IAppSdk,
     BiometryService,
     CookieService,
-    AppCountryInfo
+    AppCountryInfo,
+    ConfirmOptions
 } from '@tonkeeper/core/dist/AppSdk';
 import copyToClipboard from 'copy-to-clipboard';
 import packageJson from '../../package.json';
@@ -63,6 +64,23 @@ export class DesktopAppSdk extends BaseApp implements IAppSdk {
         return sendBackground<void>({ king: 'open-page', url });
     };
 
+    async confirm(options: ConfirmOptions): Promise<boolean> {
+        const cancelButton = options.cancelButtonTitle || 'Cancel';
+        const okButton = options.okButtonTitle || 'OK';
+
+        return sendBackground<number>({
+            king: 'show-confirm-dialog',
+            options: {
+                message: options.message,
+                type: options.type,
+                buttons: [cancelButton, okButton],
+                defaultId: options.defaultButton === 'cancel' ? 0 : 1,
+                title: options.title,
+                cancelId: 0
+            }
+        });
+    }
+
     authorizedOpenUrlProtocols = ['http:', 'https:', 'tg:', 'mailto:'];
 
     version = packageJson.version ?? 'Unknown';

apps/desktop/src/libs/keychain.ts

@@ -4,31 +4,58 @@ import i18next from '../app/i18n';
 import { sendBackground } from './backgroudService';
 import { promptDesktopPasswordController } from '@tonkeeper/uikit/dist/components/modals/PromptDesktopPassword';
 import { BaseKeychainService } from '@tonkeeper/core/dist/base-keychain-service';
+import { KeychainGetError } from '@tonkeeper/core/dist/errors/KeychainError';
 
 export class KeychainDesktop extends BaseKeychainService implements IKeychainService {
     constructor(private biometryService: BiometryService, storage: IStorage) {
         super(storage);
     }
 
     setData = async (key: string, data: string) => {
-        return sendBackground<void>({ king: 'set-keychain', publicKey: key, mnemonic: data });
+        try {
+            await sendBackground<void>({ king: 'set-keychain', publicKey: key, mnemonic: data });
+            console.info(`[KEYCHAIN] (success) SET key "Wallet-${key}"`);
+        } catch (e) {
+            console.info(`[KEYCHAIN] (ERROR) SET key "Wallet-${key}"`, e);
+            throw e;
+        }
     };
 
     getData = async (key: string) => {
         await this.securityCheck();
-        const value = sendBackground<string | null>({ king: 'get-keychain', publicKey: key });
-        if (value === null) {
-            throw new Error('Mnemonic not found in keychain');
+        let value: string | null = null;
+        try {
+            value = await sendBackground<string | null>({ king: 'get-keychain', publicKey: key });
+        } catch (e) {
+            console.info(`[KEYCHAIN] (ERROR) GET key "Wallet-${key}"`, e);
+            throw new KeychainGetError();
+        }
+
+        if (value == null) {
+            throw new KeychainGetError();
         }
+        console.info(`[KEYCHAIN] (success) GET key "Wallet-${key}"`);
         return value;
     };
 
     removeData = async (key: string) => {
-        return sendBackground<void>({ king: 'remove-keychain', publicKey: key });
+        try {
+            await sendBackground<void>({ king: 'remove-keychain', publicKey: key });
+            console.info(`[KEYCHAIN] (success) DELETE key "Wallet-${key}"`);
+        } catch (e) {
+            console.info(`[KEYCHAIN] (ERROR) DELETE key "Wallet-${key}"`, e);
+            throw e;
+        }
     };
 
     clearStorage = async () => {
-        await sendBackground<void>({ king: 'clear-keychain' });
+        try {
+            await sendBackground<void>({ king: 'clear-keychain' });
+            console.info('[KEYCHAIN] (success) CLEAR all data');
+        } catch (e) {
+            console.info('[KEYCHAIN] (ERROR) CLEAR all data');
+            throw e;
+        }
         await this.resetSecuritySettings();
     };
 

apps/desktop/src/libs/message.ts

@@ -1,4 +1,6 @@
 import { AccountConnectionHttp } from '@tonkeeper/core/dist/service/tonConnect/connectionService';
+import { ConfirmOptions } from '@tonkeeper/core/dist/AppSdk';
+import MessageBoxSyncOptions = Electron.MessageBoxSyncOptions;
 
 export interface GetStorageMessage {
     king: 'storage-get';
@@ -80,6 +82,11 @@ export interface GetDeviceCountry {
     king: 'get-device-country';
 }
 
+export interface ConfirmDialog {
+    king: 'show-confirm-dialog';
+    options: MessageBoxSyncOptions;
+}
+
 export type Message =
     | GetStorageMessage
     | SetStorageMessage
@@ -97,4 +104,5 @@ export type Message =
     | GetPreferredSystemLanguagesMessage
     | TonConnectSendDisconnectMessage
     | CleanCookieMessage
-    | GetDeviceCountry;
+    | GetDeviceCountry
+    | ConfirmDialog;

apps/extension/src/App.tsx

@@ -317,11 +317,7 @@ export const Content: FC<{
     }
 
     if (lock) {
-        return (
-            <FullSizeWrapper standalone>
-                <Unlock />
-            </FullSizeWrapper>
-        );
+        return <Unlock />;
     }
 
     if (pageView) {

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tonkeeper/mobile",
-    "version": "4.2.8",
+    "version": "4.2.9",
     "license": "Apache-2.0",
     "description": "Your tablet wallet on The Open Network",
     "type": "module",

apps/mobile/src/app/app-content/NarrowContent.tsx

@@ -27,7 +27,7 @@ import { IonContent, IonMenu, IonModal, IonRouterOutlet } from '@ionic/react';
 import { DesktopHistoryPage } from '@tonkeeper/uikit/dist/desktop-pages/history/DesktopHistoryPage';
 import { DesktopConnectedAppsSettings } from '@tonkeeper/uikit/dist/desktop-pages/settings/DesktopConnectedAppsSettings';
 import { DesktopNftSettings } from '@tonkeeper/uikit/dist/desktop-pages/settings/DesktopNftSettings';
-import { MAMIndexesPage } from '@tonkeeper/uikit/dist/pages/settings/MamIndexes';
+import { DerivableIndexesPage } from 'packages/uikit/src/pages/settings/DerivableIndexes';
 import { BatteryPage } from '@tonkeeper/uikit/dist/pages/settings/Battery';
 import { WalletVersionPage } from '@tonkeeper/uikit/dist/pages/settings/Version';
 import { LedgerIndexesPage } from '@tonkeeper/uikit/dist/pages/settings/LedgerIndexes';
@@ -316,7 +316,7 @@ const NarrowContentAppRouting = () => {
                             />
                             <Route
                                 path={AppRoute.walletSettings + WalletSettingsRoute.derivations}
-                                component={MAMIndexesPage}
+                                component={DerivableIndexesPage}
                             />
                             <Route
                                 path={AppRoute.walletSettings + WalletSettingsRoute.battery}

apps/mobile/src/app/app-content/WideContent.tsx

@@ -36,6 +36,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import { SplashScreen } from '@capacitor/splash-screen';
 import { useRealtimeUpdatesInvalidation } from '@tonkeeper/uikit/dist/hooks/realtime';
 import DashboardPage from '@tonkeeper/uikit/dist/desktop-pages/dashboard';
+import { SecureWalletNotification } from '@tonkeeper/uikit/dist/components/desktop/SecureWalletNotification';
 
 const FullSizeWrapper = styled(Container)`
     max-width: 800px;
@@ -125,11 +126,7 @@ export const WideContent: FC<{
     }, [queryClient]);
 
     if (lock) {
-        return (
-            <FullSizeWrapper>
-                <Unlock />
-            </FullSizeWrapper>
-        );
+        return <Unlock />;
     }
 
     if (!activeAccount || location.pathname.startsWith(AppRoute.import)) {
@@ -156,6 +153,7 @@ export const WideContent: FC<{
                 </Switch>
             </WideContentStyled>
             <BackgroundElements />
+            <SecureWalletNotification />
             <PullToRefresh onRefresh={onRefresh} />
         </WideLayout>
     );

apps/mobile/src/libs/keychain.ts

@@ -7,37 +7,60 @@ import { BaseKeychainService } from '@tonkeeper/core/dist/base-keychain-service'
 import { CAPACITOR_APPLICATION_ID } from './aplication-id';
 import { promptDesktopPasswordController } from '@tonkeeper/uikit/dist/components/modals/PromptDesktopPassword';
 import { assertUnreachable } from '@tonkeeper/core/dist/utils/types';
+import { KeychainGetError } from '@tonkeeper/core/dist/errors/KeychainError';
 
 export class KeychainCapacitor extends BaseKeychainService implements IKeychainService {
     constructor(private biometryService: BiometryService, storage: IStorage) {
         super(storage);
     }
 
     setData = async (key: string, value: string) => {
-        await SecureStorage.storeData({
-            id: `Wallet-${key}`,
-            data: value
-        });
+        try {
+            await SecureStorage.storeData({
+                id: `Wallet-${key}`,
+                data: value
+            });
+            console.info(`[KEYCHAIN] (success) SET key "Wallet-${key}"`);
+        } catch (e) {
+            console.info(`[KEYCHAIN] (ERROR) SET key "Wallet-${key}"`, e);
+            throw e;
+        }
     };
 
     getData = async (key: string) => {
         await this.securityCheck();
-        const { data } = await SecureStorage.getData({
-            id: `Wallet-${key}`
-        });
-        return data;
+        try {
+            const { data } = await SecureStorage.getData({
+                id: `Wallet-${key}`
+            });
+            console.info(`[KEYCHAIN] (success) GET key "Wallet-${key}"`);
+            return data;
+        } catch (e) {
+            console.info(`[KEYCHAIN] (ERROR) GET key "Wallet-${key}"`, e);
+            throw new KeychainGetError();
+        }
     };
 
     removeData = async (key: string) => {
-        await SecureStorage.removeData({
-            id: `Wallet-${key}`
-        });
-        console.info(`Deleted password for account "${key}": Success`);
+        try {
+            await SecureStorage.removeData({
+                id: `Wallet-${key}`
+            });
+            console.info(`[KEYCHAIN] (success) DELETE key "Wallet-${key}"`);
+        } catch (e) {
+            console.info(`[KEYCHAIN] (ERROR) DELETE key "Wallet-${key}"`, e);
+            throw e;
+        }
     };
 
     clearStorage = async () => {
-        await SecureStorage.clearStorage();
-        console.info(`Clear keychain": Success`);
+        try {
+            await SecureStorage.clearStorage();
+            console.info('[KEYCHAIN] (success) CLEAR all data');
+        } catch (e) {
+            console.info('[KEYCHAIN] (ERROR) CLEAR all data');
+            throw e;
+        }
         await this.resetSecuritySettings();
     };
 

apps/web/src/AppDesktop.tsx

@@ -211,11 +211,7 @@ export const DesktopContent: FC<{
     const location = useLocation();
 
     if (lock) {
-        return (
-            <FullScreen>
-                <Unlock />
-            </FullScreen>
-        );
+        return <Unlock />;
     }
 
     if (!activeAccount || location.pathname.startsWith(AppRoute.import)) {

apps/web/src/AppMobile.tsx

@@ -136,11 +136,7 @@ export const MobileContent: FC<{
     const location = useLocation();
 
     if (lock) {
-        return (
-            <FullSizeWrapper standalone={standalone}>
-                <Unlock />
-            </FullSizeWrapper>
-        );
+        return <Unlock />;
     }
 
     if (location.pathname.startsWith(AppRoute.signer)) {

packages/core/package.json

@@ -27,7 +27,7 @@
         "@ledgerhq/hw-transport-webusb": "^6.28.6",
         "@noble/curves": "^1.9.2",
         "@noble/ed25519": "^2.3.0",
-        "@ton-community/ton-ledger": "^7.2.0-pre.3",
+        "@ton-community/ton-ledger": "^7.4.0-pre.0",
         "@ton-keychain/core": "^0.0.4",
         "@ton-keychain/trx": "^0.0.7",
         "@ton/core": "0.56.0",

packages/core/src/AppSdk.ts

@@ -237,6 +237,8 @@ export interface ConfirmOptions {
     message: string;
     okButtonTitle?: string;
     cancelButtonTitle?: string;
+    defaultButton?: 'ok' | 'cancel';
+    type?: 'none' | 'info' | 'error' | 'question' | 'warning';
 }
 
 export interface KeyboardService {