Merge remote-tracking branch 'upstream/develop' into feat/integration-boba-network

Author: developerfred

.i18n-codegen.json

@@ -38,6 +38,18 @@
                 "sourceMap": "inline"
             }
         },
+        {
+            "input": "./packages/shared-base-ui/src/locales/en-US.json",
+            "output": "./packages/shared-base-ui/src/locales/i18n_generated",
+            "parser": "i18next",
+            "generator": {
+                "type": "i18next/react-hooks",
+                "hooks": "useSharedBaseI18N",
+                "namespace": "shareBase",
+                "trans": "SharedBaseTrans",
+                "sourceMap": "inline"
+            }
+        },
         {
             "input": "./packages/dashboard/src/locales/en-US.json",
             "output": "./packages/dashboard/src/locales/i18n_generated",

cspell.json

@@ -78,6 +78,7 @@
         "elec",
         "encryptedmsg",
         "endregion",
+        "enhanceable",
         "ethersphere",
         "ethersproject",
         "eustatius",
@@ -270,6 +271,7 @@
         "xlarge",
         "xlink",
         "zerion",
+        "zora",
         "zubin"
     ],
     "ignoreWords": [

docs/rfc/000-Payload-v37.md

@@ -91,8 +91,7 @@ enum PublicKeyAlgorithmEnum {
 
 This field represents the format version.
 
-The first and the current binary version is `-37`.
-The implementation MUST fail when the version is less than `-37` (e.g. `-38`).
+The first and the current binary version is `0`.
 
 #### `authorNetwork` field
 

package.json

@@ -23,12 +23,13 @@
     "postinstall": "patch-package",
     "prepare": "husky install",
     "test": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
+    "test:update": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js -u",
     "spellcheck": "cspell lint --no-must-find-files"
   },
   "dependencies": {
     "@dimensiondev/kit": "0.0.0-20220223101101-4e6f3b9",
     "@emotion/cache": "^11.7.1",
-    "@emotion/react": "^11.8.1",
+    "@emotion/react": "^11.8.2",
     "@emotion/serialize": "^1.0.2",
     "@emotion/styled": "^11.8.1",
     "@emotion/utils": "^1.1.0",
@@ -37,7 +38,7 @@
     "@mui/material": "5.5.0",
     "@mui/system": "5.5.0",
     "@types/masknet__global-types": "workspace:*",
-    "@types/react": "^17.0.39",
+    "@types/react": "^17.0.40",
     "@types/react-dom": "17.0.13",
     "@types/web": "^0.0.55",
     "i18next": "^21.6.14",

packages/.eslintrc.json

@@ -50,7 +50,7 @@
         "react/self-closing-comp": ["warn", { "component": true, "html": true }],
         "react-hooks/exhaustive-deps": "off",
         "react-hooks/rules-of-hooks": "error",
-        "import/no-deprecated": "error",
+        "import/no-deprecated": "off",
         "import/no-duplicates": "error",
         "unicorn/better-regex": "error",
         "unicorn/catch-error-name": ["error", { "ignore": ["^err$"] }],
@@ -65,7 +65,6 @@
         "unicorn/prefer-number-properties": "error",
         "unicorn/relative-url-style": ["error", "always"],
         "unicorn/throw-new-error": "error",
-        "unused-imports/no-unused-imports-ts": "error",
         "@dimensiondev/no-jsx-template-literal": "error",
         "@dimensiondev/no-locale-case": "error",
         "@dimensiondev/no-number-constructor": "off",

packages/dashboard/package.json

@@ -20,6 +20,7 @@
     "@masknet/public-api": "workspace:*",
     "@masknet/shared": "workspace:*",
     "@masknet/shared-base": "workspace:*",
+    "@masknet/shared-base-ui": "workspace:*",
     "@masknet/storybook-shared": "workspace:*",
     "@masknet/theme": "workspace:*",
     "@masknet/web3-providers": "workspace:*",

packages/dashboard/src/components/DashboardFrame/Navigation.tsx

@@ -5,8 +5,6 @@ import {
     ListItemIcon,
     Collapse,
     Theme,
-    // see https://github.com/import-js/eslint-plugin-import/issues/2288
-    // eslint-disable-next-line import/no-deprecated
     useMediaQuery,
     styled,
     listItemClasses,
@@ -122,8 +120,6 @@ export function Navigation({ onClose }: NavigationProps) {
     const isWalletTransferPath = useMatch(DashboardRoutes.WalletsTransfer)
     const isWalletHistoryPath = useMatch(DashboardRoutes.WalletsHistory)
 
-    // see https://github.com/import-js/eslint-plugin-import/issues/2288
-    // eslint-disable-next-line import/no-deprecated
     const isLargeScreen = useMediaQuery<Theme>((theme) => theme.breakpoints.up('lg'))
     const t = useDashboardI18N()
     const mode = useTheme().palette.mode

packages/dashboard/src/components/DashboardFrame/index.tsx

@@ -1,9 +1,7 @@
 import { memo, Suspense, useMemo, useState } from 'react'
-// see https://github.com/import-js/eslint-plugin-import/issues/2288
-// eslint-disable-next-line import/no-deprecated
 import { Grid, styled, Theme, useMediaQuery } from '@mui/material'
 import { MaskColorVar } from '@masknet/theme'
-import { ErrorBoundary } from '@masknet/shared'
+import { ErrorBoundary } from '@masknet/shared-base-ui'
 import { DashboardContext } from './context'
 import { Navigation } from './Navigation'
 import { NavigationVersionFooter } from '../NavigationVersionFooter'
@@ -27,8 +25,6 @@ const LeftContainer = styled(Grid)(({ theme }) => ({
 export interface DashboardFrameProps extends React.PropsWithChildren<{}> {}
 
 export const DashboardFrame = memo((props: DashboardFrameProps) => {
-    // see https://github.com/import-js/eslint-plugin-import/issues/2288
-    // eslint-disable-next-line import/no-deprecated
     const isLargeScreen = useMediaQuery<Theme>((theme) => theme.breakpoints.up('lg'))
     const [navigationExpanded, setNavigationExpanded] = useState(true)
     const [drawerOpen, setDrawerOpen] = useState(false)

packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx

@@ -1,11 +1,11 @@
 import { memo, useCallback, useMemo } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { makeStyles } from '@masknet/theme'
-import { useRemoteControlledDialog } from '@masknet/shared'
+import { useRemoteControlledDialog } from '@masknet/shared-base-ui'
 import { useAccount } from '@masknet/web3-shared-evm'
 import { PluginMessages, Services } from '../../../API'
 import { PersonaContext } from '../../../pages/Personas/hooks/usePersonaContext'
-import { DashboardRoutes } from '@masknet/shared-base'
+import { DashboardRoutes, EnhanceableSite } from '@masknet/shared-base'
 import { PluginId } from '@masknet/plugin-infra'
 
 const useStyles = makeStyles()((theme) => ({
@@ -28,9 +28,6 @@ const useStyles = makeStyles()((theme) => ({
     },
 }))
 
-const TWITTER_NETWORK = 'twitter.com'
-const TWITTER_ADDRESS = 'https://www.twitter.com'
-
 export const FeaturePromotions = memo(() => {
     const { classes } = useStyles()
     const navigate = useNavigate()
@@ -45,7 +42,7 @@ export const FeaturePromotions = memo(() => {
         const { linkedProfiles } = currentPersona
         if (linkedProfiles.length === 0) return false
 
-        return !!linkedProfiles.find((profile) => profile.identifier.network === TWITTER_NETWORK)
+        return !!linkedProfiles.find((profile) => profile.identifier.network === EnhanceableSite.Twitter)
     }, [currentPersona])
 
     const openTransakDialog = useCallback(() => {
@@ -61,13 +58,13 @@ export const FeaturePromotions = memo(() => {
             return
         }
         if (isConnectedTwitter) {
-            await Services.SocialNetwork.openSNSAndActivatePlugin(`${TWITTER_ADDRESS}/home`, pluginId)
+            await Services.SocialNetwork.openSNSAndActivatePlugin('https://twitter.com/home', pluginId)
             return
         }
-        connectPersona(currentPersona.identifier, TWITTER_NETWORK)
+        connectPersona(currentPersona.identifier, EnhanceableSite.Twitter)
     }
 
-    const openMaskNetwork = () => window.open(`${TWITTER_ADDRESS}/realMaskNetwork`)
+    const openMaskNetwork = () => window.open('https://twitter.com/realMaskNetwork')
 
     return (
         <div className={classes.container}>

packages/dashboard/src/components/PageFrame/index.tsx

@@ -11,20 +11,18 @@ import {
     Theme,
     Toolbar,
     Typography,
-    // see https://github.com/import-js/eslint-plugin-import/issues/2288
-    // eslint-disable-next-line import/no-deprecated
     useMediaQuery,
     useTheme,
 } from '@mui/material'
 import { makeStyles, MaskColorVar } from '@masknet/theme'
 import { Close as CloseIcon, Menu as MenuIcon } from '@mui/icons-material'
 import Color from 'color'
-import { ErrorBoundary } from '@masknet/shared'
 import { DashboardContext } from '../DashboardFrame/context'
 import { Navigation } from '../DashboardFrame/Navigation'
 import { MaskBannerIcon, MaskNotSquareIcon } from '@masknet/icons'
 import { FeaturePromotions } from './FeaturePromotions'
 import { DashboardRoutes } from '@masknet/shared-base'
+import { ErrorBoundary } from '@masknet/shared-base-ui'
 import { NavigationVersionFooter } from '../NavigationVersionFooter'
 
 const featurePromotionsEnabled = [
@@ -132,8 +130,6 @@ export const PageFrame = memo((props: PageFrameProps) => {
     const location = useLocation()
     const left = typeof props.title === 'string' ? <Typography variant="h6">{props.title}</Typography> : props.title
     const right = props.primaryAction
-    // see https://github.com/import-js/eslint-plugin-import/issues/2288
-    // eslint-disable-next-line import/no-deprecated
     const isLargeScreen = useMediaQuery<Theme>((theme) => theme.breakpoints.up('lg'))
     const { drawerOpen, toggleDrawer } = useContext(DashboardContext)
     const showFeaturePromotions = featurePromotionsEnabled.some((path: string) => path === location.pathname)