[Release] Hotfix 2.23.3 => 2.23.4 (patch) (#10992)

* chore: bump version to 2.23.4 * chore: change calendar api (#10994) * chore: change calendar api (#10995) * chore: change calendar api * chore: change calendar api * fix: news list same key (#10996) * feat: mf-5475 add scroll chain (#10971) * fix: type error (#10999) * fixup! feat: mf-5475 add scroll chain (#11001) * fix: mf-5520 add debank scroll chain name (#11003) * fix: update scroll icon (#11004) * fixup! fix: update scroll icon (#11004) (#11006) * fix: web3 selector (#11007) * fix: the web3/more injection * refactor: code style * fix: mf-5518 add scroll chain name for rabby (#11008) --------- Co-authored-by: Harlan Sun <[email protected]> Co-authored-by: UncleBill <[email protected]>
DimensionDev · Oct 19, 2023 · 307729c · 307729c
1 parent 87182ed
commit 307729c
Show file tree

Hide file tree

Showing 53 changed files with 250 additions and 140 deletions.
diff --git a/cspell.json b/cspell.json
@@ -259,6 +259,7 @@
         "sbch",
         "scamsniffer",
         "scenechange",
+        "scrl",
         "scroller",
         "secp",
         "serializers",

diff --git a/lint-staged.config.js b/lint-staged.config.js
@@ -1,7 +1,6 @@
 export default {
     '*': 'prettier --write --ignore-unknown',
     'packages/**/*.{ts,tsx,js,jsx}': 'eslint --fix',
-    'packages/web3-constants/**/*': () => 'pnpm --filter ./packages/web3-constants start',
     'cspell.json': () => 'gulp reorder-spellcheck',
     'packages/**/*.svg': 'npx svgo',
 }
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.23.3",
+  "version": "2.23.4",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {

diff --git a/packages/mask/src/extension/popups/components/TokenPicker/TokenItem.tsx b/packages/mask/src/extension/popups/components/TokenPicker/TokenItem.tsx
@@ -145,6 +145,7 @@ export const TokenItem = memo(function TokenItem({
                 <Box position="relative">
                     <TokenIcon
                         className={classes.tokenIcon}
+                        pluginID={NetworkPluginID.PLUGIN_EVM}
                         chainId={asset.chainId}
                         address={asset.address}
                         name={asset.name}

diff --git a/packages/mask/src/extension/popups/components/UnlockERC20Token/index.tsx b/packages/mask/src/extension/popups/components/UnlockERC20Token/index.tsx
@@ -125,6 +125,8 @@ export const UnlockERC20Token = memo<UnlockERC20TokenProps>(function UnlockERC20
     const { data: token } = useFungibleToken(
         NetworkPluginID.PLUGIN_EVM,
         transaction.formattedTransaction?.tokenInAddress,
+        undefined,
+        { chainId },
     )
 
     const { data: balance = '0' } = useFungibleTokenBalance(
@@ -244,7 +246,7 @@ export const UnlockERC20Token = memo<UnlockERC20TokenProps>(function UnlockERC20
                 ) : null}
                 <Typography className={classes.name}>{t('popups_wallet_unlock_erc20_requested_by')}</Typography>
                 {transaction.formattedTransaction.popup?.spender ? (
-                    <Typography className={classes.spender}>
+                    <Typography className={classes.spender} component="div">
                         {t('contract')}:
                         <Typography className={classes.spenderAddress}>
                             {transaction.formattedTransaction.popup?.spender}{' '}

diff --git a/packages/mask/src/site-adaptors/twitter.com/utils/selector.ts b/packages/mask/src/site-adaptors/twitter.com/utils/selector.ts
@@ -15,7 +15,7 @@ export const querySelectorAll = <T extends E>(selector: string) => {
 // #region "Enhanced Profile"
 export const searchProfileTabListLastChildSelector: () => LiveSelector<E, true> = () =>
     querySelector<E>(
-        '[data-testid="primaryColumn"] div + [role="navigation"][aria-label] [data-testid="ScrollSnap-List"]  a[href*="/like"]',
+        '[data-testid="primaryColumn"] div + [role="navigation"][aria-label] [data-testid="ScrollSnap-List"] div[role="presentation"]:last-of-type a[role="tab"]',
     ).closest(1)
 export const nextTabListSelector: () => LiveSelector<E, true> = () =>
     querySelector('[data-testid="ScrollSnap-nextButtonWrapper"]')

diff --git a/packages/plugins/Approval/src/SiteAdaptor/ApprovalDialog.tsx b/packages/plugins/Approval/src/SiteAdaptor/ApprovalDialog.tsx
@@ -5,65 +5,64 @@ import { TabContext } from '@mui/lab'
 import { PluginWalletStatusBar, InjectedDialog, NetworkTab } from '@masknet/shared'
 import { useChainContext } from '@masknet/web3-hooks-base'
 import { type ChainId } from '@masknet/web3-shared-evm'
-import { NetworkPluginID, PluginID } from '@masknet/shared-base'
+import { EMPTY_LIST, NetworkPluginID, PluginID } from '@masknet/shared-base'
 import { useActivatedPlugin } from '@masknet/plugin-infra/dom'
 import { useI18N } from '../locales/index.js'
 import { ApprovalTokenContent } from './ApprovalTokenContent.js'
 import { ApprovalNFTContent } from './ApprovalNFTContent.js'
+import { useMemo } from 'react'
 
-const useStyles = makeStyles<{ listItemBackground?: string; listItemBackgroundIcon?: string } | void>()(
-    (theme, props) => ({
-        dialogRoot: {
-            width: 600,
-            height: 620,
-            overflowX: 'hidden',
+const useStyles = makeStyles()((theme, props) => ({
+    dialogRoot: {
+        width: 600,
+        height: 620,
+        overflowX: 'hidden',
+    },
+    dialogContent: {
+        width: 600,
+        background: theme.palette.maskColor.bottom,
+        padding: 0,
+        margin: 'auto',
+        overflowX: 'hidden',
+    },
+    contentWrapper: {
+        width: 602,
+        padding: 0,
+        overflowY: 'auto',
+        overflowX: 'hidden',
+        height: '100%',
+        '::-webkit-scrollbar': {
+            backgroundColor: 'transparent',
+            width: 18,
         },
-        dialogContent: {
-            width: 600,
-            background: theme.palette.maskColor.bottom,
-            padding: 0,
-            margin: 'auto',
-            overflowX: 'hidden',
+        '::-webkit-scrollbar-thumb': {
+            borderRadius: '20px',
+            width: 5,
+            border: '7px solid rgba(0, 0, 0, 0)',
+            backgroundColor: theme.palette.maskColor.secondaryLine,
+            backgroundClip: 'padding-box',
         },
-        contentWrapper: {
-            width: 602,
-            padding: 0,
-            overflowY: 'auto',
-            overflowX: 'hidden',
-            height: '100%',
-            '::-webkit-scrollbar': {
-                backgroundColor: 'transparent',
-                width: 18,
-            },
-            '::-webkit-scrollbar-thumb': {
-                borderRadius: '20px',
-                width: 5,
-                border: '7px solid rgba(0, 0, 0, 0)',
-                backgroundColor: theme.palette.maskColor.secondaryLine,
-                backgroundClip: 'padding-box',
-            },
+    },
+    dialogTitle: {
+        '& > p': {
+            overflow: 'visible',
         },
-        dialogTitle: {
-            '& > p': {
-                overflow: 'visible',
-            },
-        },
-        abstractTabWrapper: {
-            width: '100%',
-            paddingBottom: theme.spacing(2),
-        },
-        approvalWrapper: {
-            display: 'flex',
-            flexDirection: 'column',
-            width: '100%',
-            height: '100%',
-        },
-        footer: {
-            position: 'sticky',
-            bottom: 0,
-        },
-    }),
-)
+    },
+    abstractTabWrapper: {
+        width: '100%',
+        paddingBottom: theme.spacing(2),
+    },
+    approvalWrapper: {
+        display: 'flex',
+        flexDirection: 'column',
+        width: '100%',
+        height: '100%',
+    },
+    footer: {
+        position: 'sticky',
+        bottom: 0,
+    },
+}))
 
 export interface ApprovalDialogProps {
     open: boolean
@@ -111,9 +110,11 @@ function ApprovalWrapper(props: ApprovalWrapperProps) {
 
     const { chainId } = useChainContext<NetworkPluginID.PLUGIN_EVM>()
     const approvalDefinition = useActivatedPlugin(PluginID.Approval, 'any')
-    const chainIdList = compact<ChainId>(
-        approvalDefinition?.enableRequirement.web3?.[NetworkPluginID.PLUGIN_EVM]?.supportedChainIds ?? [],
-    )
+    const chainIdList = useMemo(() => {
+        return compact<ChainId>(
+            approvalDefinition?.enableRequirement.web3?.[NetworkPluginID.PLUGIN_EVM]?.supportedChainIds ?? EMPTY_LIST,
+        )
+    }, [approvalDefinition])
     const { classes } = useStyles()
 
     return (

diff --git a/packages/plugins/Approval/src/SiteAdaptor/pipes.ts b/packages/plugins/Approval/src/SiteAdaptor/pipes.ts
@@ -20,6 +20,7 @@ export const resolveNetworkOnRabby = createLookupTableResolver<NetworkType, stri
         [NetworkType.Conflux]: '',
         [NetworkType.Astar]: '',
         [NetworkType.Moonbeam]: '',
+        [NetworkType.Scroll]: '',
         [NetworkType.CustomNetwork]: '',
     },
     'eth',

diff --git a/packages/plugins/Approval/src/base.ts b/packages/plugins/Approval/src/base.ts
@@ -32,6 +32,7 @@ export const base: Plugin.Shared.Definition = {
                     ChainId.Avalanche,
                     ChainId.Aurora,
                     ChainId.Optimism,
+                    ChainId.Scroll,
                 ],
             },
             [NetworkPluginID.PLUGIN_FLOW]: { supportedChainIds: [] },

diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx
@@ -146,7 +146,7 @@ export function NewsList({ list, isLoading, empty, dateString }: NewsListProps)
                                 {list[key].map((v) => (
                                     <div
                                         className={classes.eventCard}
-                                        key={v.eventTitle}
+                                        key={v.event_url}
                                         onClick={() => {
                                             window.open(v.event_url)
                                         }}>

diff --git a/packages/plugins/Collectible/src/SiteAdaptor/index.tsx b/packages/plugins/Collectible/src/SiteAdaptor/index.tsx
@@ -1,16 +1,17 @@
-import { useCallback } from 'react'
-import { Trans } from 'react-i18next'
-import { Box } from '@mui/material'
 import { Icons } from '@masknet/icons'
 import { usePluginWrapper, usePostInfoDetails, type Plugin } from '@masknet/plugin-infra/content-script'
 import { CollectionList, UserAssetsProvider } from '@masknet/shared'
 import { CrossIsolationMessages, NetworkPluginID, PluginID, SocialAddressType, parseURLs } from '@masknet/shared-base'
+import { makeStyles } from '@masknet/theme'
 import { extractTextFromTypedMessage } from '@masknet/typed-message'
 import type { Web3Helper } from '@masknet/web3-helpers'
-import { Telemetry } from '@masknet/web3-telemetry'
-import { EventID, EventType } from '@masknet/web3-telemetry/types'
 import { Web3ContextProvider } from '@masknet/web3-hooks-base'
 import { SearchResultType } from '@masknet/web3-shared-base'
+import { Telemetry } from '@masknet/web3-telemetry'
+import { EventID, EventType } from '@masknet/web3-telemetry/types'
+import { Box } from '@mui/material'
+import { useCallback } from 'react'
+import { Trans } from 'react-i18next'
 import { base } from '../base.js'
 import { PLUGIN_ID, PLUGIN_NAME } from '../constants.js'
 import { getPayloadFromURLs } from '../helpers/index.js'
@@ -39,6 +40,11 @@ function useInspectCollectible(pluginID?: NetworkPluginID) {
 const gridProps = {
     columns: 'repeat(auto-fill, minmax(20%, 1fr))',
 }
+const usePopupCollectionStyles = makeStyles()({
+    sidebar: {
+        paddingBottom: 48,
+    },
+})
 const TabConfig: Plugin.SiteAdaptor.ProfileTab = {
     ID: `${PLUGIN_ID}_nfts`,
     label: 'NFTs',
@@ -101,6 +107,7 @@ const site: Plugin.SiteAdaptor.Definition = {
             UI: {
                 TabContent({ socialAccount }) {
                     const inspectCollectible = useInspectCollectible(socialAccount?.pluginID)
+                    const { classes } = usePopupCollectionStyles()
 
                     if (!socialAccount) return null
 
@@ -110,6 +117,7 @@ const site: Plugin.SiteAdaptor.Definition = {
                                 <CollectionList
                                     height={392}
                                     gridProps={gridProps}
+                                    classes={{ sidebar: classes.sidebar }}
                                     disableWindowScroll
                                     from="profileCard"
                                     onItemClick={(asset) => inspectCollectible(asset, 'profileCard')}

diff --git a/packages/plugins/MaskBox/src/hooks/useContext.ts b/packages/plugins/MaskBox/src/hooks/useContext.ts
@@ -295,7 +295,7 @@ function useContext(initialState?: { boxId: string; hashRoot: string }) {
         proofBytes,
         openBoxTransactionOverrides,
     )
-    const { value: erc20Allowance, retry: retryAllowance } = useERC20TokenAllowance(
+    const { data: erc20Allowance, refetch: retryAllowance } = useERC20TokenAllowance(
         isNativeToken ? undefined : paymentTokenAddress,
         MASK_BOX_CONTRACT_ADDRESS,
     )

diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketDialog.tsx b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketDialog.tsx
@@ -1,5 +1,4 @@
 import { useCallback, useMemo, useState } from 'react'
-import { compact } from 'lodash-es'
 import Web3Utils from 'web3-utils'
 import { DialogContent, Tab, useTheme } from '@mui/material'
 import { TabContext, TabPanel } from '@mui/lab'
@@ -83,12 +82,10 @@ export default function RedPacketDialog(props: RedPacketDialogProps) {
     const theme = useTheme()
     const mode = useSiteThemeMode(theme)
     const { classes } = useStyles({ currentTab, showHistory, isDim: mode === 'dim' })
-    const chainIdList = useMemo(() => {
-        return compact<ChainId>(
-            currentTab === tabs.tokens
-                ? approvalDefinition?.enableRequirement.web3?.[NetworkPluginID.PLUGIN_EVM]?.supportedChainIds ?? []
-                : [ChainId.Mainnet, ChainId.BSC, ChainId.Matic],
-        )
+    const chainIdList: ChainId[] = useMemo(() => {
+        return currentTab === tabs.tokens
+            ? approvalDefinition?.enableRequirement.web3?.[NetworkPluginID.PLUGIN_EVM]?.supportedChainIds ?? []
+            : [ChainId.Mainnet, ChainId.BSC, ChainId.Matic]
     }, [currentTab === tabs.tokens, approvalDefinition?.enableRequirement.web3])
     const chainId = chainIdList.includes(_chainId) ? _chainId : ChainId.Mainnet
 

diff --git a/packages/plugins/RedPacket/src/base.ts b/packages/plugins/RedPacket/src/base.ts
@@ -34,6 +34,7 @@ export const base: Plugin.Shared.Definition = {
                     ChainId.Aurora,
                     ChainId.Conflux,
                     ChainId.Astar,
+                    ChainId.Scroll,
                 ],
             },
             [NetworkPluginID.PLUGIN_FLOW]: { supportedChainIds: [] },

diff --git a/packages/plugins/SmartPay/src/SiteAdaptor/components/SmartPayContent.tsx b/packages/plugins/SmartPay/src/SiteAdaptor/components/SmartPayContent.tsx
@@ -212,7 +212,7 @@ export const SmartPayContent = memo(() => {
     const { data: maskToken } = useFungibleToken(NetworkPluginID.PLUGIN_EVM, maskAddress, undefined, { chainId })
 
     const { PAYMASTER_MASK_CONTRACT_ADDRESS } = useSmartPayConstants(chainId)
-    const { value: allowance = '0' } = useERC20TokenAllowance(maskAddress, PAYMASTER_MASK_CONTRACT_ADDRESS, {
+    const { data: allowance = '0' } = useERC20TokenAllowance(maskAddress, PAYMASTER_MASK_CONTRACT_ADDRESS, {
         chainId,
     })
 

diff --git a/packages/plugins/Tips/src/base.ts b/packages/plugins/Tips/src/base.ts
@@ -33,6 +33,7 @@ export const base: Plugin.Shared.Definition = {
                     ChainId.Fantom,
                     ChainId.Conflux,
                     ChainId.Astar,
+                    ChainId.Scroll,
                     ChainId.Optimism,
                 ],
             },

diff --git a/packages/plugins/Trader/src/constants/0x.ts b/packages/plugins/Trader/src/constants/0x.ts
@@ -21,5 +21,6 @@ export const ZRX_BASE_URL: Record<NetworkType, string> = {
     [NetworkType.Conflux]: '',
     [NetworkType.Astar]: '',
     [NetworkType.Moonbeam]: '',
+    [NetworkType.Scroll]: '',
     [NetworkType.CustomNetwork]: '',
 }
diff --git a/packages/plugins/Trader/src/helpers/getEVMAvailableTraderProviders.ts b/packages/plugins/Trader/src/helpers/getEVMAvailableTraderProviders.ts
@@ -55,6 +55,7 @@ export function getEVMAvailableTraderProviders(networkType?: NetworkType) {
             return [TradeProvider.DODO, TradeProvider.WANNASWAP, TradeProvider.TRISOLARIS]
         case NetworkType.Astar:
             return [TradeProvider.ARTHSWAP, TradeProvider.VERSA, TradeProvider.ASTAREXCHANGE, TradeProvider.YUMISWAP]
+        case NetworkType.Scroll:
         case NetworkType.Boba:
         case NetworkType.Fuse:
         case NetworkType.Metis:

diff --git a/packages/plugins/Trader/src/providers/ZeroX.ts b/packages/plugins/Trader/src/providers/ZeroX.ts
@@ -47,6 +47,7 @@ export function getNativeTokenLabel(networkType: NetworkType) {
         case NetworkType.Optimism:
         case NetworkType.Conflux:
         case NetworkType.Astar:
+        case NetworkType.Scroll:
         case NetworkType.Moonbeam:
         case NetworkType.CustomNetwork:
             return ZRX_NATIVE_TOKEN_ADDRESS

diff --git a/packages/plugins/Trader/src/trader/0x/useTrade.ts b/packages/plugins/Trader/src/trader/0x/useTrade.ts
@@ -33,6 +33,7 @@ export function getNativeTokenLabel(networkType: NetworkType) {
         case NetworkType.Conflux:
         case NetworkType.Astar:
         case NetworkType.Moonbeam:
+        case NetworkType.Scroll:
         case NetworkType.CustomNetwork:
             return NATIVE_TOKEN_ADDRESS
         default:

diff --git a/packages/shared/src/UI/components/AssetsManagement/ChainRuntimeProvider.tsx b/packages/shared/src/UI/components/AssetsManagement/ChainRuntimeProvider.tsx
@@ -33,6 +33,7 @@ const ChainRuntimeContext = createContext<ChainRuntimeOptions>({
     networks: EMPTY_LIST,
 })
 
+//  https://docs.simplehash.com/reference/chains
 const SimpleHashSupportedChains: Record<NetworkPluginID, number[]> = {
     [NetworkPluginID.PLUGIN_EVM]: [
         ChainId.Mainnet,
@@ -43,6 +44,7 @@ const SimpleHashSupportedChains: Record<NetworkPluginID, number[]> = {
         ChainId.Optimism,
         ChainId.Avalanche,
         ChainId.xDai,
+        ChainId.Scroll,
     ],
     [NetworkPluginID.PLUGIN_SOLANA]: [SolanaChainId.Mainnet],
     [NetworkPluginID.PLUGIN_FLOW]: [FlowChainId.Mainnet],

diff --git a/packages/shared/src/UI/components/AssetsManagement/CollectionList.tsx b/packages/shared/src/UI/components/AssetsManagement/CollectionList.tsx
@@ -86,7 +86,8 @@ function getTopOffset() {
 }
 export interface CollectionListProps
     extends BoxProps,
-        Pick<CollectionProps, 'disableAction' | 'onActionClick' | 'onItemClick'> {
+        Pick<CollectionProps, 'disableAction' | 'onActionClick' | 'onItemClick'>,
+        withClasses<'sidebar'> {
     gridProps?: CollectibleGridProps
     disableSidebar?: boolean
     disableWindowScroll?: boolean
@@ -121,7 +122,7 @@ export const CollectionList = memo(function CollectionList({
     ...rest
 }: CollectionListProps) {
     const t = useSharedI18N()
-    const { classes, cx } = useStyles(gridProps)
+    const { classes, cx } = useStyles(gridProps, { props: rest })
 
     const { pluginID, account, chainId, setChainId, networks } = useChainRuntime()
     const { collections, currentCollection, setCurrentCollectionId, loading, error, retry } =