refactor: merge develop into refactor/migrate-evm

.i18n-codegen.json

@@ -253,6 +253,18 @@
                 "trans": "Translate",
                 "sourceMap": "inline"
             }
+        },
+        {
+            "input": "./packages/mask/src/plugins/Avatar/locales/en-US.json",
+            "output": "./packages/mask/src/plugins/Avatar/locales/i18n_generated",
+            "parser": "i18next",
+            "generator": {
+                "type": "i18next/react-hooks",
+                "hooks": "useI18N",
+                "namespace": "com.maskbook.avatar",
+                "trans": "Translate",
+                "sourceMap": "inline"
+            }
         }
     ]
 }

cspell.json

@@ -120,7 +120,6 @@
         "multicall",
         "multihop",
         "newsfeed",
-        "nftrss",
         "nftscan",
         "nums",
         "openswap",
@@ -215,7 +214,7 @@
         "aicanft",
         "algr",
         "anft",
-        "avator",
+        "armv",
         "blocto",
         "bsct",
         "btcb",

package.json

@@ -58,7 +58,7 @@
   "devDependencies": {
     "@commitlint/cli": "^16.2.4",
     "@commitlint/config-conventional": "^16.2.4",
-    "@dimensiondev/eslint-plugin": "^0.0.2-20220414093950-7d54c58",
+    "@dimensiondev/eslint-plugin": "0.0.2-20220516081411-2649814",
     "@dimensiondev/patch-package": "^6.5.0",
     "@jest/globals": "^28.1.0",
     "@magic-works/i18n-codegen": "^0.1.0",

packages/.eslintrc.json

@@ -40,6 +40,8 @@
         "no-unmodified-loop-condition": "error",
         "no-unneeded-ternary": "error",
         "no-useless-concat": "error",
+        "no-useless-rename": "error",
+        "no-useless-catch": "error",
         "no-loss-of-precision": "error",
         "prefer-regex-literals": "error",
         "react/jsx-boolean-value": "error",
@@ -59,6 +61,7 @@
         "unicorn/no-new-buffer": "error",
         "unicorn/no-thenable": "error",
         "unicorn/no-useless-promise-resolve-reject": "error",
+        "unicorn/no-array-reduce": ["error", { "allowSimpleOperations": false }],
         "unicorn/prefer-add-event-listener": "error",
         "unicorn/prefer-date-now": "error",
         "unicorn/prefer-dom-node-dataset": "error",
@@ -70,6 +73,7 @@
         "@dimensiondev/browser/prefer-location-assign": "error",
         "@dimensiondev/jsx/no-class-component": "error",
         "@dimensiondev/jsx/no-template-literal": "error",
+        "@dimensiondev/no-for-in": "error",
         "@dimensiondev/no-number-constructor": "off",
         "@dimensiondev/prefer-early-return": "error",
         "@dimensiondev/string/no-interpolation": "off",
@@ -81,7 +85,6 @@
         "@dimensiondev/unicode/specific-set": "error",
         "@typescript-eslint/await-thenable": "error",
         "@typescript-eslint/no-base-to-string": "off",
-        "@typescript-eslint/no-for-in-array": "error",
         "@typescript-eslint/no-implied-eval": "error",
         "@typescript-eslint/no-inferrable-types": "error",
         "@typescript-eslint/no-invalid-this": "error",

packages/backup-format/src/utils/backupPreview.ts

@@ -1,4 +1,5 @@
 import type { NormalizedBackup } from '@masknet/backup-format'
+import { sumBy } from 'lodash-unified'
 
 export interface BackupPreview {
     personas: number
@@ -20,7 +21,7 @@ export function getBackupPreviewInfo(json: NormalizedBackup.Data): BackupPreview
 
     return {
         personas: json.personas.size,
-        accounts: [...json.personas.values()].reduce((a, b) => a + b.linkedProfiles.size, 0),
+        accounts: sumBy([...json.personas.values()], (persona) => persona.linkedProfiles.size),
         posts: json.posts.size,
         contacts: json.profiles.size,
         relations: json.relations.length,

packages/backup-format/src/utils/hex2buffer.ts

@@ -1,3 +1,5 @@
+import { sum } from 'lodash-unified'
+
 /** @internal */
 export function hex2buffer(hexString: string, padded?: boolean) {
     if (hexString.length % 2) {
@@ -21,7 +23,7 @@ export function hex2buffer(hexString: string, padded?: boolean) {
 
 /** @internal */
 function concat(...buf: (Uint8Array | number[])[]) {
-    const res = new Uint8Array(buf.map((item) => item.length).reduce((prev, cur) => prev + cur))
+    const res = new Uint8Array(sum(buf.map((item) => item.length)))
     let offset = 0
     buf.forEach((item) => {
         for (let i = 0; i < item.length; i += 1) {

packages/dashboard/src/components/Restore/RestoreFromCloud.tsx

@@ -159,7 +159,7 @@ export const RestoreFromCloud = memo(() => {
                     )}
                 </Step>
                 <Step name="restore">
-                    {(_, { backupJson: backupBasicInfoJson, handleRestore: handleRestore }) => (
+                    {(_, { backupJson: backupBasicInfoJson, handleRestore }) => (
                         <>
                             <Box sx={{ width: '100%' }}>
                                 <BackupPreviewCard json={backupBasicInfoJson} />

packages/dashboard/src/locales/qya-AA.json

@@ -187,6 +187,7 @@
     "wallets_empty_tokens_tip": "crwdns1789:0crwdne1789:0",
     "wallets_empty_collectible_tip": "crwdns1791:0crwdne1791:0",
     "wallets_address_copied": "crwdns1793:0crwdne1793:0",
+    "public_key_copied": "crwdns16574:0crwdne16574:0",
     "wallets_address_copy": "crwdns1795:0crwdne1795:0",
     "wallets_history_types": "crwdns1797:0crwdne1797:0",
     "wallets_history_value": "crwdns1799:0crwdne1799:0",

packages/dashboard/src/pages/Personas/components/ContactTableRow/index.tsx

@@ -137,7 +137,7 @@ export const ContactTableRowUI = memo<ContactTableRowUIProps>(
                                 {/* To support emoji */}
                                 {String.fromCodePoint(
                                     first.codePointAt(0) ?? SPACE_POINT,
-                                    last.codePointAt(0) ?? SPACE_POINT,
+                                    last?.codePointAt(0) ?? SPACE_POINT,
                                 )}
                             </Avatar>
                             {contact.fingerprint ? <MaskBlueIcon className={classes.maskIcon} /> : null}

packages/encryption/src/encryption/Encryption.ts

@@ -94,7 +94,7 @@ async function e2e_v37(
     target: EncryptTargetE2E,
     io: EncryptIO,
 ): Promise<[PayloadWellFormed.EndToEndEncryption, EncryptResult['e2e']]> {
-    const { authorPublic, postIV: postIV, postKeyEncoded } = context
+    const { authorPublic, postIV, postKeyEncoded } = context
     const authorPublicKey = await authorPublic
     if (!authorPublicKey.some) throw new EncryptError(EncryptErrorReasons.PublicKeyNotFound)
 

packages/gun-utils/src/utils.ts

@@ -2,6 +2,7 @@ import { EventIterator } from 'event-iterator'
 import { getGunInstance, OnCloseEvent } from './instance'
 
 function getGunNodeFromPath(path: string[]) {
+    // eslint-disable-next-line unicorn/no-array-reduce
     const resultNode = path.reduce((gun, path) => gun.get(path as never), getGunInstance())
     return resultNode
 }

packages/icons/general/Plugin.tsx

@@ -0,0 +1,12 @@
+import { createIcon } from '../utils'
+
+export const PluginIcon = createIcon(
+    'PluginIcon',
+    <g>
+        <path
+            d="M12.6624 16.5H9.24266L9.50679 15.7563C9.57629 15.5547 9.59715 15.3392 9.56934 15.1238C9.54154 14.9083 9.45813 14.7067 9.33302 14.5329C9.20791 14.3592 9.04109 14.2132 8.85342 14.1159C8.47808 13.9213 7.99848 13.9213 7.62314 14.1159C7.43547 14.2132 7.26865 14.3592 7.14354 14.5329C7.02538 14.7067 6.94197 14.9152 6.91417 15.1238C6.88636 15.3323 6.90721 15.5547 6.97672 15.7563L7.24085 16.5H3.82109C3.57782 16.5 3.34844 16.4513 3.12602 16.361C2.90359 16.2706 2.70897 16.1386 2.53521 15.9648C2.36144 15.791 2.22937 15.5964 2.13901 15.374C2.04866 15.1516 2 14.9152 2 14.6789V11.2731L2.74373 11.5372C2.9453 11.6067 3.16077 11.6275 3.36929 11.5997C3.57782 11.5719 3.77939 11.4885 3.95315 11.3634C4.12692 11.2383 4.27289 11.0784 4.3702 10.8838C4.46751 10.6961 4.52311 10.4807 4.52311 10.2721C4.52311 10.0636 4.46751 9.8412 4.3702 9.65353C4.27289 9.46586 4.12692 9.29904 3.95315 9.17393C3.77939 9.04882 3.57782 8.97236 3.36929 8.93761C3.16077 8.9098 2.93835 8.93066 2.74373 9.00016L2 9.26429V5.84453C2 5.35798 2.18767 4.89923 2.53521 4.55865C2.87579 4.21806 3.34149 4.02344 3.82109 4.02344H5.7951C5.78815 3.88443 5.7951 3.74541 5.81595 3.61335C5.86461 3.22411 6.01752 2.85572 6.23994 2.53599C6.46237 2.21625 6.7682 1.95212 7.11574 1.77836C7.46327 1.59764 7.87337 1.49338 8.24175 1.50033C8.65185 1.50033 9.03414 1.59069 9.36777 1.7575C9.71531 1.93822 10.0142 2.20235 10.2436 2.52208C10.4729 2.84182 10.6189 3.21716 10.6676 3.59945C10.6884 3.73846 10.6954 3.87748 10.6884 4.00954H12.6624C12.9057 4.00954 13.1351 4.0582 13.3575 4.14855C13.5799 4.23891 13.7745 4.37098 13.9483 4.54475C14.1221 4.71156 14.2541 4.91313 14.3445 5.13556C14.4349 5.35798 14.4835 5.59431 14.4835 5.83063V7.80464C14.6225 7.79769 14.7615 7.80464 14.8936 7.82549C15.2828 7.8811 15.6582 8.02706 15.9779 8.24948C16.2976 8.47886 16.5618 8.77774 16.7425 9.12528C16.9232 9.47281 17.0205 9.86205 17.0205 10.2513C17.0205 10.6405 16.9232 11.0298 16.7425 11.3773C16.5618 11.7248 16.2976 12.0307 15.9779 12.2531C15.6582 12.4755 15.2828 12.6284 14.8936 12.6771C14.7546 12.698 14.6225 12.7049 14.4835 12.698V14.665C14.4835 14.9083 14.4349 15.1446 14.3445 15.3601C14.2541 15.5756 14.1221 15.7771 13.9553 15.9509C13.7815 16.1247 13.5869 16.2567 13.3644 16.3471C13.1351 16.4513 12.8987 16.5 12.6624 16.5ZM10.6954 15.3879H12.6624C12.7528 15.3879 12.8501 15.367 12.9335 15.3323C13.0169 15.2975 13.1003 15.2419 13.1629 15.1794C13.2254 15.1168 13.281 15.0334 13.3158 14.95C13.3505 14.8666 13.3714 14.7693 13.3714 14.6789V11.2522L14.1151 11.5163C14.3167 11.5858 14.5322 11.6136 14.7476 11.5789C14.9631 11.5511 15.1647 11.4677 15.3384 11.3495C15.5122 11.2244 15.6582 11.0576 15.7555 10.8699C15.8528 10.6822 15.9015 10.4668 15.9015 10.2513C15.9015 10.0358 15.8459 9.8273 15.7485 9.63268C15.6512 9.44501 15.5053 9.27819 15.3315 9.15308C15.1577 9.02797 14.9562 8.95151 14.7407 8.92371C14.5322 8.8959 14.3097 8.91675 14.1082 8.98626L13.3644 9.25039V5.83063C13.3644 5.74027 13.3436 5.64991 13.3088 5.55955C13.2741 5.47614 13.2254 5.39969 13.1559 5.33018C13.0864 5.26067 13.01 5.21202 12.9265 5.17726C12.8431 5.14251 12.7528 5.12166 12.6555 5.12166H9.23571L9.49984 4.37793C9.56934 4.17636 9.5902 3.96089 9.56239 3.74541C9.53459 3.53689 9.45118 3.32837 9.32607 3.1546C9.20095 2.98083 9.03414 2.83487 8.84647 2.73756C8.67965 2.6611 8.47808 2.61244 8.24175 2.61244C8.02628 2.61244 7.81776 2.6611 7.63009 2.75841C7.44242 2.85572 7.2756 3.00168 7.15049 3.17545C7.02538 3.34922 6.94197 3.55774 6.91417 3.76626C6.88636 3.97479 6.90721 4.19721 6.97672 4.39878L7.24085 5.14251H3.82109C3.63342 5.14251 3.4527 5.21897 3.32064 5.35103C3.18857 5.47614 3.11212 5.65686 3.11212 5.84453V7.81854C3.25113 7.81159 3.39015 7.81854 3.52221 7.83939C3.91145 7.895 4.27984 8.04096 4.59957 8.27034C4.91931 8.49276 5.17648 8.79859 5.3572 9.14613C5.53792 9.49367 5.62828 9.88291 5.62828 10.2721C5.62828 10.6614 5.53097 11.0506 5.3572 11.3982C5.17648 11.7457 4.91931 12.0446 4.59957 12.274C4.27984 12.4964 3.91145 12.6493 3.52221 12.7049C3.39015 12.7119 3.25113 12.7188 3.11212 12.7119V14.672C3.11212 14.7693 3.13297 14.8596 3.16772 14.943C3.20248 15.0264 3.25808 15.1099 3.32064 15.1724C3.3832 15.235 3.45965 15.2906 3.55001 15.3253C3.63342 15.3601 3.72378 15.3809 3.82109 15.3809H5.7951C5.78815 15.2419 5.7951 15.1029 5.81595 14.9708C5.87156 14.5816 6.01752 14.2132 6.23994 13.8935C6.46237 13.5737 6.7682 13.3096 7.11574 13.1289C7.81081 12.7675 8.67965 12.7675 9.37472 13.1289C9.72226 13.3096 10.0211 13.5737 10.2505 13.8935C10.4799 14.2132 10.6259 14.5885 10.6745 14.9708C10.6884 15.1099 10.6954 15.2489 10.6954 15.3879Z"
+            fill="white"
+        />
+    </g>,
+    '0 0 19 18',
+)

packages/icons/general/Provider.tsx

@@ -0,0 +1,14 @@
+import { createIcon } from '../utils'
+
+export const ProviderByIcon = createIcon(
+    'ProviderByIcon',
+    <g>
+        <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M2.6333 2.79997C2.6333 2.43178 2.93178 2.1333 3.29997 2.1333H8.0049V3.19997H3.69997V12.8H13.3V8.31266H14.3666V13.2C14.3666 13.5682 14.0682 13.8666 13.7 13.8666H3.29997C2.93178 13.8666 2.6333 13.5682 2.6333 13.2V2.79997ZM9.60936 2.66663C9.60936 2.37208 9.84814 2.1333 10.1427 2.1333H13.8333C14.1279 2.1333 14.3666 2.37208 14.3666 2.66663V6.32887C14.3666 6.62342 14.1279 6.86221 13.8333 6.86221C13.5387 6.86221 13.3 6.62342 13.3 6.32887V3.96988L6.71998 10.6629C6.51349 10.8729 6.17581 10.8758 5.96576 10.6693C5.75572 10.4628 5.75284 10.1251 5.95934 9.9151L12.5611 3.19997H10.1427C9.84814 3.19997 9.60936 2.96119 9.60936 2.66663Z"
+            fill="#767F8D"
+        />
+    </g>,
+    '0 0 17 16',
+)

packages/icons/general/index.ts

@@ -116,6 +116,8 @@ export * from './MindsRound'
 export * from './CircleLoading'
 export * from './AddUser'
 export * from './PopupRestore'
+export * from './Provider'
+export * from './Plugin'
 export * from './Direct'
 export * from './SearchEmpty'
 export * from './WarningTriangle'

packages/icons/plugins/CyberConnect.tsx

@@ -15,7 +15,7 @@ export const CyberConnectIcon: typeof SvgIcon = createPaletteAwareIcon(
         fillRule="evenodd"
         clipRule="evenodd"
         d="M20.8194 14.1385L29.6618 23.2918C29.768 23.4001 29.8525 23.529 29.9105 23.6712C29.9685 23.8133 29.9989 23.9659 30 24.1202C30.001 24.2745 29.9727 24.4275 29.9165 24.5705C29.8604 24.7135 29.7777 24.8436 29.673 24.9535L29.0242 25.6228C28.8418 25.8206 28.601 25.9497 28.3397 25.9897C28.1672 26.0136 27.9917 25.9958 27.8269 25.9377C27.6621 25.8797 27.5126 25.7829 27.3899 25.6551L16.5922 14.4778C16.4045 14.2838 16.2556 14.0534 16.1539 13.7997C16.0523 13.5461 16 13.2742 16 12.9996C16 12.725 16.0523 12.4531 16.1539 12.1994C16.2556 11.9458 16.4045 11.7153 16.5922 11.5213L27.3899 0.344062C27.4951 0.234991 27.62 0.148459 27.7576 0.0894208C27.8951 0.0303825 28.0425 0 28.1914 0C28.3403 0 28.4877 0.0303825 28.6253 0.0894208C28.7628 0.148459 28.8878 0.234991 28.993 0.344062L29.6618 1.04798C29.7672 1.15687 29.8508 1.2862 29.9078 1.42856C29.9648 1.57093 29.9942 1.72354 29.9942 1.87767C29.9942 2.03179 29.9648 2.1844 29.9078 2.32677C29.8508 2.46914 29.7672 2.59848 29.6618 2.70738L20.8194 11.8629C20.5294 12.1655 20.3667 12.5745 20.3667 13.0007C20.3667 13.427 20.5294 13.8359 20.8194 14.1385ZM9.18017 11.8726L0.341223 2.71698C0.233969 2.60853 0.148579 2.47911 0.0900066 2.33622C0.0314345 2.19333 0.000846678 2.03982 1.73677e-05 1.88459C-0.000811943 1.72936 0.0281358 1.5755 0.0851776 1.43194C0.142219 1.28839 0.226225 1.158 0.332313 1.04833L0.978629 0.376712C1.16268 0.180155 1.40373 0.0512975 1.66506 0.00975571C1.83749 -0.0133774 2.01275 0.00476068 2.17734 0.0627778C2.34194 0.120795 2.49149 0.217133 2.61448 0.344398L13.408 11.5218C13.5957 11.7158 13.7445 11.9463 13.8461 12.1999C13.9477 12.4536 14 12.7255 14 13.0001C14 13.2747 13.9477 13.5466 13.8461 13.8002C13.7445 14.0539 13.5957 14.2843 13.408 14.4783L2.61448 25.6557C2.50913 25.7649 2.38405 25.8515 2.24639 25.9105C2.10872 25.9696 1.96117 26 1.81215 26C1.66314 26 1.51558 25.9696 1.37792 25.9105C1.24025 25.8515 1.11517 25.7649 1.00983 25.6557L0.341223 24.9634C0.235829 24.8543 0.152224 24.7247 0.0951825 24.5822C0.038141 24.4396 0.00878436 24.2868 0.00878436 24.1325C0.00878436 23.9782 0.038141 23.8254 0.0951825 23.6828C0.152224 23.5402 0.235829 23.4107 0.341223 23.3016L9.18017 14.1483C9.47006 13.8457 9.63272 13.4367 9.63272 13.0104C9.63272 12.5842 9.47006 12.1752 9.18017 11.8726Z"
-        fill="white"
+        fill="black"
     />,
     undefined,
     '-8 -10 44 44',

packages/icons/plugins/MarketsClaim.tsx

@@ -1,7 +1,6 @@
 import { createIcon } from '../utils'
-import type { SvgIcon } from '@mui/material'
 
-export const MarketsClaimIcon: typeof SvgIcon = createIcon(
+export const MarketsClaimIcon = createIcon(
     'Markets',
     <>
         <path d="M5.98291 10.8867H31.8683V16.2617H5.98291V10.8867Z" fill="#FF4A4A" />

packages/icons/plugins/NFTAvatar.tsx

@@ -0,0 +1,29 @@
+import { createIcon } from '../utils'
+import type { SvgIcon } from '@mui/material'
+
+export const NFTAvatarIcon: typeof SvgIcon = createIcon(
+    'nft_avatar',
+    <g>
+        <path
+            d="M4.83325 3.5C4.83325 2.39543 5.72868 1.5 6.83325 1.5H29.8333C30.9378 1.5 31.8333 2.39543 31.8333 3.5V32.5C31.8333 33.6046 30.9378 34.5 29.8333 34.5H6.83325C5.72868 34.5 4.83325 33.6046 4.83325 32.5V3.5Z"
+            fill="url(#paint0_linear_35_22290)"
+        />
+        <path
+            d="M13.6273 6.90742C15.4435 5.44402 17.9166 5.03182 20.1702 5.46022C22.2222 5.94982 24.0582 7.33042 25.0536 9.19702C25.743 10.4246 25.9572 11.8466 25.9662 13.2362C25.9644 16.838 25.9662 20.438 25.9644 24.0398C25.905 24.5096 26.2758 24.8444 26.5116 25.2044C27.6312 26.81 28.155 28.7576 28.2468 30.698C27.5736 30.7016 26.9004 30.6998 26.2272 30.698C26.1246 29.4452 25.9032 28.1924 25.3164 27.0674C23.4786 27.0584 21.6426 27.098 19.8048 27.08C19.794 25.7156 19.7994 24.3512 19.7976 22.9868C18.2298 22.6196 16.5739 22.8932 15.1015 23.5016C12.2881 24.6878 10.3837 27.6578 10.3945 30.6998H8.42525C8.33165 28.295 9.32885 25.9262 10.9021 24.1352C11.1235 23.9264 11.0443 23.5988 11.0677 23.3288C11.0479 20.5676 11.0803 17.8046 11.0515 15.0434C10.9831 13.6682 11.0263 12.2912 11.0893 10.916C11.2531 9.27082 12.2629 7.80562 13.6273 6.90742ZM20.073 7.46362C20.2998 8.10262 20.919 8.50582 21.1638 9.14302C21.9324 10.5722 21.7146 12.2264 21.7398 13.7816C21.7524 17.5634 21.7488 21.3434 21.7506 25.1252C22.5048 25.127 23.2608 25.1306 24.015 25.1162C24.0096 21.1562 24.0114 17.1944 24.015 13.2344C24.006 12.2786 23.9106 11.294 23.484 10.4228C22.8522 9.00082 21.5562 7.91362 20.073 7.46362ZM14.4175 8.75602C13.4221 9.40582 12.9289 10.6262 12.9667 11.789C15.2491 11.8106 17.5296 11.7962 19.812 11.798C19.893 10.2806 18.912 8.73982 17.4108 8.35102C16.4101 7.99642 15.3247 8.28082 14.4175 8.75602ZM13.0261 13.7366C13.0153 14.5484 13.0441 15.4016 13.4725 16.1198C14.1097 17.3276 15.4309 18.0692 16.7826 18.1106C16.7845 18.755 16.7845 19.3994 16.7826 20.0456C15.3841 20.015 14.0413 19.4696 12.9829 18.5624C13.0027 19.8206 12.9829 21.0788 12.9973 22.3388C14.9899 21.0644 17.4649 20.5298 19.803 20.9042C19.7904 18.5156 19.8012 16.1252 19.7958 13.7366C17.5404 13.7348 15.2833 13.7348 13.0261 13.7366Z"
+            fill="white"
+        />
+        <defs>
+            <linearGradient
+                id="paint0_linear_35_22290"
+                x1="21.0748"
+                y1="1.5"
+                x2="21.0748"
+                y2="34.4996"
+                gradientUnits="userSpaceOnUse">
+                <stop stopColor="#FF8D5C" />
+                <stop offset="0.99" stopColor="#FFC49A" />
+            </linearGradient>
+        </defs>
+    </g>,
+    '0 0 37 36',
+)