Merge remote-tracking branch 'origin/develop' into feat/add_custom_token

RabbyHub · Apr 26, 2024 · b99568a · b99568a
2 parents 5595d1a + 43a6897
commit b99568a
Show file tree

Hide file tree

Showing 66 changed files with 777 additions and 515 deletions.
diff --git a/_raw/css/Noto+Sans+JP.css b/_raw/css/Noto+Sans+JP.css
@@ -0,0 +1,63 @@
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFBEi75s.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFJEj75s.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFE8j75s.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFBEj75s.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFCMj75s.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFM8k75s.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFPYk75s.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 800;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFJEk75s.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Noto Sans JP';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansjp/v52/-F6jfjtqLzI2JPCgQBnw7HFyzSD-AsregP8VFLgk75s.ttf) format('truetype');
+}
diff --git a/_raw/locales/en/messages.json b/_raw/locales/en/messages.json
@@ -914,7 +914,8 @@
         "disconnectRecentlyUsed": {
           "title_one": "Disconnect <strong>{{count}}</strong> connected Dapp",
           "title_other": "Disconnect <strong>{{count}}</strong> connected Dapps",
-          "description": "Pinned DApps will remain connected"
+          "description": "Pinned DApps will remain connected",
+          "title": "Disconnect recently used <strong>{{count}}</strong> DApps"
         },
         "title": "Connected Dapp",
         "pinned": "Pinned",

diff --git a/_raw/locales/zh-CN/messages.json b/_raw/locales/zh-CN/messages.json
@@ -849,7 +849,7 @@
       "Balance": "余额",
       "Confirm": "确认",
       "Continue": "继续",
-      "Including-service-fee": "包含 ${{fee}} 服务费",
+      "Including-service-fee": "包含 {{fee}} 服务费",
       "InsufficientBalance": "当前链的 Rabby 合约地址余额不足，\n请稍后再试",
       "InsufficientBalanceTips": "余额不足",
       "Loading_Tokens": "正在加载代币...",

diff --git a/_raw/locales/zh-HK/messages.json b/_raw/locales/zh-HK/messages.json
@@ -849,7 +849,7 @@
       "Balance": "結餘",
       "Confirm": "確認",
       "Continue": "繼續",
-      "Including-service-fee": "包含 ${{fee}} 服務費",
+      "Including-service-fee": "包含 {{fee}} 服務費",
       "InsufficientBalance": "當前鏈的 Rabby 合約地址結餘不足，\n請稍後再試",
       "InsufficientBalanceTips": "結餘不足",
       "Loading_Tokens": "正在加載代幣...",

diff --git a/package.json b/package.json
@@ -52,13 +52,13 @@
     "@rabby-wallet/eth-lattice-keyring": "1.1.0",
     "@rabby-wallet/eth-simple-keyring": "5.0.1",
     "@rabby-wallet/eth-trezor-keyring": "2.5.1",
-    "@rabby-wallet/eth-walletconnect-keyring": "2.1.2",
+    "@rabby-wallet/eth-walletconnect-keyring": "2.1.3",
     "@rabby-wallet/eth-watch-keyring": "1.0.0",
     "@rabby-wallet/gnosis-sdk": "1.3.6",
-    "@rabby-wallet/page-provider": "0.3.2",
+    "@rabby-wallet/page-provider": "0.3.3",
     "@rabby-wallet/rabby-api": "0.7.13",
     "@rabby-wallet/rabby-security-engine": "1.1.20",
-    "@rabby-wallet/rabby-swap": "0.0.34",
+    "@rabby-wallet/rabby-swap": "0.0.36",
     "@rabby-wallet/widgets": "1.0.9",
     "@rematch/core": "2.2.0",
     "@rematch/select": "3.1.2",

diff --git a/src/background/controller/provider/controller.ts b/src/background/controller/provider/controller.ts
@@ -457,6 +457,9 @@ class ProviderController extends BaseController {
       createBy: options?.data?.$ctx?.ga ? 'rabby' : 'dapp',
       source: options?.data?.$ctx?.ga?.source || '',
       trigger: options?.data?.$ctx?.ga?.trigger || '',
+      networkType: chainItem?.isTestnet
+        ? 'Custom Network'
+        : 'Integrated Network',
       reported: false,
     };
 
@@ -574,6 +577,9 @@ class ProviderController extends BaseController {
           createBy: options?.data?.$ctx?.ga ? 'rabby' : 'dapp',
           source: options?.data?.$ctx?.ga?.source || '',
           trigger: options?.data?.$ctx?.ga?.trigger || '',
+          networkType: chainItem?.isTestnet
+            ? 'Custom Network'
+            : 'Integrated Network',
         });
         if (!isSpeedUp && !isCancel) {
           transactionHistoryService.addSubmitFailedTransaction({

diff --git a/src/background/controller/provider/rpcFlow.ts b/src/background/controller/provider/rpcFlow.ts
@@ -14,7 +14,6 @@ import * as Sentry from '@sentry/browser';
 import stats from '@/stats';
 import { addHexPrefix, stripHexPrefix } from 'ethereumjs-util';
 import { findChain } from '@/utils/chain';
-import browser from 'webextension-polyfill';
 
 const isSignApproval = (type: string) => {
   const SIGN_APPROVALS = ['SignText', 'SignTypedData', 'SignTx'];
@@ -25,7 +24,7 @@ const lockedOrigins = new Set<string>();
 const connectOrigins = new Set<string>();
 
 const getScreenAvailHeight = async () => {
-  return (await browser.windows.getCurrent()).height || 1000;
+  return 1000;
 };
 
 const flow = new PromiseFlow<{
@@ -304,6 +303,7 @@ function reportStatsData() {
       createBy: statsData?.createBy,
       source: statsData?.source,
       trigger: statsData?.trigger,
+      networkType: statsData?.networkType,
     };
     if (statsData.signMethod) {
       sData.signMethod = statsData.signMethod;
@@ -320,6 +320,7 @@ function reportStatsData() {
       createBy: statsData?.createBy,
       source: statsData?.source,
       trigger: statsData?.trigger,
+      networkType: statsData?.networkType || '',
     });
   }
 

diff --git a/src/background/controller/wallet.ts b/src/background/controller/wallet.ts
@@ -115,6 +115,7 @@ import { customTestnetService } from '../service/customTestnet';
 import { getKeyringBridge, hasBridge } from '../service/keyring/bridge';
 import { http } from '../utils/http';
 import { syncChainService } from '../service/syncChain';
+import { matomoRequestEvent } from '@/utils/matomo-request';
 
 const stashKeyrings: Record<string | number, any> = {};
 
@@ -1335,7 +1336,9 @@ export class WalletController extends BaseController {
   };
   addConnectedSiteV2 = permissionService.addConnectedSiteV2;
   removeAllRecentConnectedSites = () => {
-    const sites = permissionService.getRecentConnectedSites();
+    const sites = permissionService
+      .getRecentConnectedSites()
+      .filter((item) => !item.isTop);
     sites.forEach((item) => {
       this.removeConnectedSite(item.origin);
     });
@@ -3684,7 +3687,26 @@ export class WalletController extends BaseController {
     return signature;
   };
 
-  addCustomTestnet = customTestnetService.add;
+  addCustomTestnet = async (
+    chain: Parameters<typeof customTestnetService.add>[0],
+    ctx?: {
+      ga?: {
+        source?: string;
+      };
+    }
+  ) => {
+    const source = ctx?.ga?.source || 'setting';
+
+    const res = await customTestnetService.add(chain);
+    if (!('error' in res)) {
+      matomoRequestEvent({
+        category: 'Custom Network',
+        action: 'Success Add Network',
+        label: `${source}_${String(chain.id)}`,
+      });
+    }
+    return res;
+  };
   updateCustomTestnet = customTestnetService.update;
   removeCustomTestnet = customTestnetService.remove;
   getCustomTestnetList = customTestnetService.getList;

diff --git a/src/background/index.ts b/src/background/index.ts
@@ -120,14 +120,7 @@ restoreAppState();
   let interval: NodeJS.Timeout | null;
   keyringService.on('unlock', () => {
     walletController.syncMainnetChainList();
-    const customTestnetLength = customTestnetService.getList()?.length;
-    if (customTestnetLength) {
-      matomoRequestEvent({
-        category: 'Custom Network',
-        action: 'Custom Network Status',
-        value: customTestnetLength,
-      });
-    }
+
     if (interval) {
       clearInterval(interval);
     }
@@ -136,6 +129,14 @@ restoreAppState();
       if (dayjs(time).utc().isSame(dayjs().utc(), 'day')) {
         return;
       }
+      const customTestnetLength = customTestnetService.getList()?.length;
+      if (customTestnetLength) {
+        matomoRequestEvent({
+          category: 'Custom Network',
+          action: 'Custom Network Status',
+          value: customTestnetLength,
+        });
+      }
       const chains = preferenceService.getSavedChains();
       matomoRequestEvent({
         category: 'User',

diff --git a/src/background/service/customTestnet.ts b/src/background/service/customTestnet.ts
@@ -169,13 +169,7 @@ class CustomTestnetService {
     };
     this.chains[chain.id] = createClientByChain(chain);
     this.syncChainList();
-    if (isAdd) {
-      matomoRequestEvent({
-        category: 'Custom Network',
-        action: 'Success Add Network',
-        label: String(chain.id),
-      });
-    }
+
     if (this.getList().length) {
       matomoRequestEvent({
         category: 'Custom Network',

diff --git a/src/background/service/keyring/eth-onekey-keyring/eth-onekey-keyring.ts b/src/background/service/keyring/eth-onekey-keyring/eth-onekey-keyring.ts
@@ -344,7 +344,9 @@ class OneKeyKeyring extends EventEmitter {
                       tx.s = Buffer.from(payload.s, 'hex');
                       return tx;
                     }
-                  ).then(resolve);
+                  )
+                    .then(resolve)
+                    .catch(reject);
                 } else {
                   this._signTransaction(
                     address,
@@ -368,7 +370,9 @@ class OneKeyKeyring extends EventEmitter {
                         freeze: Object.isFrozen(tx),
                       });
                     }
-                  ).then(resolve);
+                  )
+                    .then(resolve)
+                    .catch(reject);
                 }
                 // This is necessary to avoid popup collision
                 // between the unlock & sign trezor popups

diff --git a/src/background/service/notification.ts b/src/background/service/notification.ts
@@ -67,6 +67,7 @@ export type StatsData = {
   trigger: any;
   reported: boolean;
   signMethod?: string;
+  networkType?: string;
 };
 
 // something need user approval in window
@@ -258,15 +259,24 @@ class NotificationService extends Events {
         : null;
       const explain = signingTx?.explain;
 
-      if (explain && currentAccount) {
+      const chain = findChain({
+        id: signingTx?.rawTx.chainId,
+      });
+
+      if ((explain || chain?.isTestnet) && currentAccount) {
         stats.report('preExecTransaction', {
           type: currentAccount.brandName,
           category: KEYRING_CATEGORY_MAP[currentAccount.type],
-          chainId: explain.native_token.chain,
-          success: explain.calcSuccess && explain.pre_exec.success,
+          chainId: chain?.serverId || '',
+          success: explain
+            ? explain.calcSuccess && explain.pre_exec.success
+            : true,
           createBy: data?.params.$ctx?.ga ? 'rabby' : 'dapp',
           source: data?.params.$ctx?.ga?.source || '',
           trigger: data?.params.$ctx?.ga.trigger || '',
+          networkType: chain?.isTestnet
+            ? 'Custom Network'
+            : 'Integrated Network',
         });
       }
     };

diff --git a/src/background/service/permission.ts b/src/background/service/permission.ts
@@ -13,9 +13,6 @@ export interface ConnectedSite {
   chain: CHAINS_ENUM;
   e?: number;
   isSigned: boolean;
-  /**
-   * @deprecated
-   */
   isTop: boolean;
   order?: number;
   isConnected: boolean;

diff --git a/src/background/service/transactionHistory.ts b/src/background/service/transactionHistory.ts
@@ -728,12 +728,13 @@ class TxHistory {
       stats.report('completeTransaction', {
         chainId: chain.serverId,
         success,
-        preExecSuccess: Boolean(
-          target.explain?.pre_exec.success && target.explain?.calcSuccess
-        ),
+        preExecSuccess: target?.explain
+          ? target.explain?.pre_exec.success && target.explain?.calcSuccess
+          : true,
         createBy: target?.$ctx?.ga ? 'rabby' : 'dapp',
         source: target?.$ctx?.ga?.source || '',
         trigger: target?.$ctx?.ga?.trigger || '',
+        networkType: chain?.isTestnet ? 'Custom Network' : 'Integrated Network',
       });
     }
     this.clearBefore({ address, chainId, nonce });