Merge pull request #319 from tonkeeper/feature/testnet3

Update testnet accounts
tonkeeper · Nov 28, 2024 · 3679ebb · 3679ebb
2 parents 7bc6ffe + 9425a26
commit 3679ebb
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 19 deletions.
diff --git a/packages/core/src/service/tonConnect/connectService.ts b/packages/core/src/service/tonConnect/connectService.ts
@@ -385,21 +385,36 @@ export const tonDisconnectRequest = async (options: { storage: IStorage; webView
     await disconnectAccountConnection({ ...options, wallet: connection.wallet });
 };
 
+const getMaxMessages = (account: Account) => {
+    if (account.type === 'ledger') {
+        return 1;
+    }
+
+    const wallet = account.activeTonWallet;
+
+    return isStandardTonWallet(wallet) && wallet.version === WalletVersion.V5R1 ? 255 : 4;
+};
+
 export const saveWalletTonConnect = async (options: {
     storage: IStorage;
-    wallet: TonContract;
+    account: Account;
     manifest: DAppManifest;
     params: TonConnectParams;
     replyItems: ConnectItemReply[];
     appVersion: string;
     webViewUrl?: string;
 }): Promise<ConnectEvent> => {
-    await saveAccountConnection(options);
+    const wallet = options.account.activeTonWallet;
+    await saveAccountConnection({
+        storage: options.storage,
+        wallet,
+        manifest: options.manifest,
+        params: options.params,
+        webViewUrl: options.webViewUrl
+    });
+
+    const maxMessages = getMaxMessages(options.account);
 
-    const maxMessages =
-        isStandardTonWallet(options.wallet) && options.wallet.version === WalletVersion.V5R1
-            ? 255
-            : 4;
     return {
         id: Date.now(),
         event: 'connect',

diff --git a/packages/uikit/src/components/account/AccountBadge.tsx b/packages/uikit/src/components/account/AccountBadge.tsx
@@ -168,7 +168,10 @@ export const AccountAndWalletBadgesGroup: FC<{
         return <AccountBadge className={className} size={size} accountType={account.type} />;
     }
 
-    if (account.type === 'mnemonic' && account.tonWallets.length > 1) {
+    if (
+        (account.type === 'mnemonic' || account.type === 'testnet') &&
+        account.tonWallets.length > 1
+    ) {
         const wallet = account.tonWallets.find(w => w.id === walletId);
         if (wallet) {
             return (

diff --git a/packages/uikit/src/components/connect/connectHook.ts b/packages/uikit/src/components/connect/connectHook.ts
@@ -87,7 +87,7 @@ export const useResponseConnectionMutation = () => {
             if (replyItems && manifest && data) {
                 const response = await saveWalletTonConnect({
                     storage: sdk.storage,
-                    wallet: data.activeTonWallet,
+                    account: data,
                     manifest,
                     params,
                     replyItems,

diff --git a/packages/uikit/src/components/modals/AddWalletNotificationControlled.tsx b/packages/uikit/src/components/modals/AddWalletNotificationControlled.tsx
@@ -192,12 +192,12 @@ export const AddWalletNotificationControlled = () => {
 
     const navigateHome = useMemo(
         () =>
-            !params?.walletType
+            selectedMethod
                 ? () => {
                       setSelectedMethod(undefined);
                   }
                 : undefined,
-        [params?.walletType]
+        [selectedMethod]
     );
 
     return (

diff --git a/packages/uikit/src/components/settings/AccountSettings.tsx b/packages/uikit/src/components/settings/AccountSettings.tsx
@@ -24,7 +24,8 @@ import {
 import { SettingsItem, SettingsList } from './SettingsList';
 import {
     isAccountTonWalletStandard,
-    isAccountVersionEditable
+    isAccountVersionEditable,
+    isMnemonicAndPassword
 } from '@tonkeeper/core/dist/entries/account';
 import { useBatteryEnabledConfig } from '../../state/battery';
 
@@ -81,7 +82,11 @@ const SingleAccountSettings = () => {
             });
         }
 
-        if (account.type === 'mnemonic' || account.type === 'ton-only') {
+        if (
+            account.type === 'mnemonic' ||
+            account.type === 'testnet' ||
+            account.type === 'ton-only'
+        ) {
             items.push({
                 name: t('settings_wallet_version'),
                 icon: walletVersionText(account.activeTonWallet.version),
@@ -197,7 +202,7 @@ const MultipleAccountSettings = () => {
     const mainItems = useMemo<SettingsItem[]>(() => {
         const items: SettingsItem[] = [];
 
-        if (account.type === 'mnemonic' || account.type === 'mam') {
+        if (isMnemonicAndPassword(account)) {
             items.push({
                 name: t('settings_recovery_phrase'),
                 icon: <RecoveryPhraseIcon />,

diff --git a/packages/uikit/src/pages/settings/Recovery.tsx b/packages/uikit/src/pages/settings/Recovery.tsx
@@ -1,4 +1,4 @@
-import { AccountId } from '@tonkeeper/core/dist/entries/account';
+import { AccountId, isMnemonicAndPassword } from '@tonkeeper/core/dist/entries/account';
 import { WalletId } from '@tonkeeper/core/dist/entries/wallet';
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { Navigate, useNavigate, useParams, useSearchParams } from 'react-router-dom';
@@ -12,7 +12,7 @@ import { useAccountState, useActiveAccount } from '../../state/wallet';
 
 export const ActiveRecovery = () => {
     const account = useActiveAccount();
-    if (account.type === 'mnemonic' || account.type === 'mam') {
+    if (isMnemonicAndPassword(account)) {
         return <RecoveryContent accountId={account.id} />;
     } else {
         return <Navigate to="../" replace={true} />;

diff --git a/packages/uikit/src/state/wallet.ts b/packages/uikit/src/state/wallet.ts
@@ -13,7 +13,8 @@ import {
     getNetworkByAccount,
     getWalletById,
     isAccountTonWalletStandard,
-    isAccountVersionEditable
+    isAccountVersionEditable,
+    isMnemonicAndPassword
 } from '@tonkeeper/core/dist/entries/account';
 import { Network } from '@tonkeeper/core/dist/entries/network';
 import { AuthKeychain, MnemonicType } from '@tonkeeper/core/dist/entries/password';
@@ -690,9 +691,7 @@ export const useMutateDeleteAll = () => {
 
 export const useIsPasswordSet = () => {
     const wallets = useAccountsState();
-    return (wallets || []).some(
-        acc => (acc.type === 'mnemonic' || acc.type === 'mam') && acc.auth.kind === 'password'
-    );
+    return (wallets || []).some(acc => isMnemonicAndPassword(acc) && acc.auth.kind === 'password');
 };
 
 export const useMutateLogOut = () => {