Merge branch 'develop' into feat/integration-boba-network

Author: developerfred

.eslintrc.json

@@ -3,7 +3,6 @@
         "ecmaVersion": 2020,
         "sourceType": "module"
     },
-    "extends": ["plugin:prettier/recommended"],
     "env": {
         "node": true
     },

.github/workflows/linters.yml

@@ -90,7 +90,11 @@ jobs:
           node-version: "16"
           cache: "pnpm"
       - run: pnpm install
-      - run: pnpm run lint:ci
+      - name: Run Eslint
+        run: |
+          # report to stdio and to file, it's cached, the second run should be fast
+          pnpm run lint:ci
+          pnpm run lint:ci-report
       - name: Upload eslint report
         uses: actions/upload-artifact@v2
         with:

package.json

@@ -18,7 +18,8 @@
     "build": "build",
     "build-ios": "build --preset iOS",
     "lint": "eslint -c packages/.eslintrc.json packages --ext .ts,.tsx,.js --cache --fix",
-    "lint:ci": "eslint -c packages/.eslintrc.json packages --ext .ts,.tsx,.js --cache --format=junit --output-file=reports/junit/eslint-results.xml",
+    "lint:ci": "eslint -c packages/.eslintrc.json packages --ext .ts,.tsx,.js --cache",
+    "lint:ci-report": "pnpm lint:ci -- --format=junit --output-file=reports/junit/eslint-results.xml",
     "postinstall": "patch-package",
     "prepare": "husky install",
     "test": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
@@ -31,21 +32,21 @@
     "@emotion/serialize": "^1.0.2",
     "@emotion/styled": "^11.8.1",
     "@emotion/utils": "^1.1.0",
-    "@mui/icons-material": "5.4.4",
-    "@mui/lab": "5.0.0-alpha.71",
-    "@mui/material": "5.4.4",
-    "@mui/system": "5.4.4",
+    "@mui/icons-material": "5.5.0",
+    "@mui/lab": "5.0.0-alpha.72",
+    "@mui/material": "5.5.0",
+    "@mui/system": "5.5.0",
     "@types/masknet__global-types": "workspace:*",
     "@types/react": "^17.0.39",
-    "@types/react-dom": "17.0.11",
-    "@types/web": "^0.0.54",
-    "i18next": "^21.6.13",
+    "@types/react-dom": "17.0.13",
+    "@types/web": "^0.0.55",
+    "i18next": "^21.6.14",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "lodash-unified": "1.0.2",
-    "react": "18.0.0-rc.0",
-    "react-dom": "18.0.0-rc.0",
-    "react-i18next": "^11.15.5",
+    "react": "18.0.0-rc.2",
+    "react-dom": "18.0.0-rc.2",
+    "react-i18next": "^11.15.6",
     "ts-results": "3.3.0",
     "web3-core": "1.5.2",
     "web3-core-method": "1.5.2"
@@ -62,28 +63,26 @@
     "@nice-labs/git-rev": "^3.5.0",
     "@swc/core": "^1.2.148",
     "@types/lodash-es": "^4.17.6",
-    "@typescript-eslint/experimental-utils": "^5.13.0",
+    "@typescript-eslint/experimental-utils": "^5.14.0",
     "cspell": "^5.18.5",
     "eslint": "8.10.0",
-    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.3",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-plugin-unicorn": "^41.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "gulp": "^4.0.2",
     "husky": "^7.0.4",
     "jest": "^28.0.0-alpha.3",
-    "lint-staged": "^12.3.4",
+    "lint-staged": "^12.3.5",
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.3",
-    "ts-node": "^10.6.0",
+    "ts-node": "^10.7.0",
     "typescript": "4.6.2"
   },
   "pnpm": {
     "overrides": {
-      "@types/node": "^17.0.17"
+      "@types/node": "^17.0.21"
     },
     "onlyBuiltDependencies": []
   }

packages/dashboard/package.json

@@ -22,14 +22,14 @@
     "@masknet/shared-base": "workspace:*",
     "@masknet/storybook-shared": "workspace:*",
     "@masknet/theme": "workspace:*",
+    "@masknet/web3-providers": "workspace:*",
     "@masknet/web3-shared-base": "workspace:*",
     "@masknet/web3-shared-evm": "workspace:*",
-    "@masknet/web3-providers": "workspace:*",
     "@msgpack/msgpack": "^2.7.2",
     "@servie/events": "^3.0.0",
     "@types/color": "^3.0.3",
     "@types/react-avatar-editor": "^10.3.6",
-    "async-call-rpc": "^6.0.1",
+    "async-call-rpc": "^6.0.2",
     "bignumber.js": "^9.0.2",
     "classnames": "^2.3.1",
     "color": "^4.2.1",

packages/dashboard/src/index.tsx

@@ -5,7 +5,8 @@ import type {} from 'react-dom/next'
 
 import './initialization/isolated_bridge'
 import './initialization/i18n'
-import ReactDOM from 'react-dom'
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
 import Dashboard from './initialization/Dashboard'
 
 if (import.meta.webpackHot) {
@@ -14,4 +15,8 @@ if (import.meta.webpackHot) {
     document.getElementById('warning')?.remove()
 }
 
-ReactDOM.createRoot(document.getElementById('root')!).render(<Dashboard />)
+createRoot(document.getElementById('root')!).render(
+    <StrictMode>
+        <Dashboard />
+    </StrictMode>,
+)

packages/dashboard/src/locales/zh-CN.json

@@ -31,22 +31,22 @@
     "about_dialog_source_code": "源代码： ",
     "about_dialog_feedback": "反馈： ",
     "about_dialog_touch": "联系我们",
-    "about_dialog_description": "Mask Network引领您探索更新更开放的互联网。Mask Network允许您在社交网络上发送加密的贴文。 同时我们提供了更多功能，譬如发送加密红包，购买加密货币，加密文件服务等。",
+    "about_dialog_description": "Mask Network 引领您探索更新更开放的互联网。Mask Network 允许您在社交网络上发送加密的贴文。 同时我们提供了更多功能，譬如发送加密红包，购买加密货币，加密文件服务等。",
     "setup_page_title": "欢迎来到 Mask Network！",
     "setup_page_description": "在社交网络上加密您的贴文和聊天内容，只允许您的朋友进行解密。",
     "setup_page_create_account_title": "创建身份",
-    "setup_page_create_account_subtitle": "构建您的数字身份系统，探索Web 3.0",
+    "setup_page_create_account_subtitle": "构建您的数字身份系统，探索 Web 3.0",
     "setup_page_create_account_button": "创建",
     "setup_page_create_restore_title": "恢复身份",
-    "setup_page_create_restore_subtitle": "使用身份助记词或历史备份恢复您的数据.",
+    "setup_page_create_restore_subtitle": "通过身份助记词或历史备份恢复。",
     "setup_page_create_restore_button": "恢复或登录",
     "create_account_private_key": "私钥",
     "create_account_identity_id": "身份助记词",
     "create_account_identity_title": "创建Mask Network身份",
     "create_account_sign_in_button": "恢复或登录",
     "create_account_persona_exists": "该身份已存在。",
     "create_account_mnemonic_download_or_print": "我已妥善保存我的身份信息。",
-    "create_account_preview_tip": "这个二维码保存您的身份信息，请妥善保存。您可以使用Mask APP 扫描二维码登录您的身份。",
+    "create_account_preview_tip": "这个二维码保存您的身份信息，请妥善保存。您可以使用 Mask APP 扫描二维码登录您的身份。",
     "create_account_mnemonic_confirm_failed": "助记词不正确",
     "create_account_connect_social_media_button": "创建",
     "create_account_connect_social_media": "连接到 {{type}}",

packages/dashboard/src/pages/CreateMaskWallet/index.tsx

@@ -1,18 +1,20 @@
 import { Routes, Route } from 'react-router-dom'
 import { lazy } from 'react'
 import { CreateMaskWalletFrame } from '../../components/CreateWalletFrame'
+import { DashboardRoutes, relativeRouteOf } from '@masknet/shared-base'
 
 const Welcome = lazy(() => import('./components/Welcome'))
 const CreateWalletForm = lazy(() => import('./components/CreateWalletForm'))
 const CreateMnemonic = lazy(() => import('./components/CreateMnemonic'))
 
+const r = relativeRouteOf(DashboardRoutes.CreateMaskWallet)
 export default function CreateWallet() {
     return (
         <CreateMaskWalletFrame>
             <Routes>
-                <Route path="/" element={<Welcome />} />
-                <Route path="/form" element={<CreateWalletForm />} />
-                <Route path="/mnemonic" element={<CreateMnemonic />} />
+                <Route path="*" element={<Welcome />} />
+                <Route path={r(DashboardRoutes.CreateMaskWalletForm)} element={<CreateWalletForm />} />
+                <Route path={r(DashboardRoutes.CreateMaskWalletMnemonic)} element={<CreateMnemonic />} />
             </Routes>
         </CreateMaskWalletFrame>
     )

packages/dashboard/src/pages/Wallets/index.tsx

@@ -11,7 +11,7 @@ import {
     Web3Plugin,
 } from '@masknet/plugin-infra'
 import { useRemoteControlledDialog } from '@masknet/shared'
-import { DashboardRoutes } from '@masknet/shared-base'
+import { DashboardRoutes, relativeRouteOf } from '@masknet/shared-base'
 import { useWeb3State } from '@masknet/web3-shared-evm'
 import BigNumber from 'bignumber.js'
 import { useEffect, useMemo, useState } from 'react'
@@ -30,6 +30,7 @@ import { useIsMatched } from './hooks'
 import { StartUp } from './StartUp'
 import { getTokenUSDValue } from './utils/getTokenUSDValue'
 
+const r = relativeRouteOf(DashboardRoutes.Wallets)
 function Wallets() {
     const wallet = useWallet()
     const wallets = useWallets()
@@ -122,10 +123,10 @@ function Wallets() {
                         showOperations={pluginId === NetworkPluginID.PLUGIN_EVM}
                     />
                     <Routes>
-                        <Route path="/" element={<Assets network={selectedNetwork} />} />
-                        <Route path="transfer" element={<Transfer />} />
+                        <Route path="*" element={<Assets network={selectedNetwork} />} />
+                        <Route path={r(DashboardRoutes.WalletsTransfer)} element={<Transfer />} />
                         <Route
-                            path="history"
+                            path={r(DashboardRoutes.WalletsHistory)}
                             element={<History selectedChainId={selectedNetwork?.chainId ?? currentChainId} />}
                         />
                     </Routes>

packages/external-plugin-previewer/src/playground.ts

@@ -1,7 +1,7 @@
 import React from 'react'
 import { t } from 'ef.js'
 import { setupPortalShadowRoot } from '@masknet/theme'
-setupPortalShadowRoot({ mode: 'open' })
+setupPortalShadowRoot({ mode: 'open' }, [])
 
 Object.assign(globalThis, { React })
 

packages/injected-script/package.json

@@ -6,7 +6,7 @@
   "types": "./dist/sdk/index.d.ts",
   "devDependencies": {
     "@rollup/plugin-sucrase": "^4.0.2",
-    "rollup": "^2.69.0",
+    "rollup": "^2.70.0",
     "rollup-plugin-terser": "^7.0.2"
   },
   "scripts": {