Merge remote-tracking branch 'upstream/develop' into feat/MetisNetwork

Author: developerfred

.github/detect-pull-request-conflict.yml

@@ -0,0 +1,2 @@
+enabled: true
+label: "Blocked: Has Conflict"

.github/workflows/bot.yml

@@ -310,6 +310,8 @@
         "crwdns",
         "dodoapi",
         "getdodoroute",
+        "openocean",
+        "OPENOCEAN",
         "getx",
         "hookform",
         "idiv",

cspell.json

@@ -9,9 +9,15 @@ import { InMemoryStorages, PersistentStorages } from '../utils/kv-storage'
 
 const PluginHost: Plugin.__Host.Host<Plugin.Dashboard.DashboardContext> = {
     enabled: {
+        // Due to MASK-391, we don't have a user configurable "disabled" plugin.
+        // All plugins are always loaded but it might be displayed in the invisible mode.
+        isEnabled: () => true,
+        events: new Emitter(),
+    },
+    minimalMode: {
         events: new Emitter(),
         isEnabled: (id) => {
-            return Services.Settings.getPluginEnabled(id)
+            return Services.Settings.getPluginMinimalModeEnabled(id)
         },
     },
     addI18NResource(plugin, resource) {
@@ -27,7 +33,8 @@ const PluginHost: Plugin.__Host.Host<Plugin.Dashboard.DashboardContext> = {
     },
 }
 setTimeout(() => {
-    Messages.events.pluginEnabled.on((id) => PluginHost.enabled.events.emit('enabled', id))
-    Messages.events.pluginDisabled.on((id) => PluginHost.enabled.events.emit('disabled', id))
+    Messages.events.pluginMinimalModeChanged.on(([id, status]) => {
+        PluginHost.minimalMode.events.emit(status ? 'enabled' : 'disabled', id)
+    })
     startPluginDashboard(PluginHost)
 })

packages/dashboard/src/initialization/PluginHost.ts

@@ -58,6 +58,7 @@ export interface PluginItemProps {
     desc: string
     icon?: ReactNode
     enabled?: boolean
+    hideSwitch?: boolean
     onSwitch: (id: string, checked: boolean) => void
     onTwitter?: (id: string) => void
     onFacebook?: (id: string) => void
@@ -72,7 +73,20 @@ export function PluginItemPlaceholder() {
 }
 
 export default function PluginItem(props: PluginItemProps) {
-    const { id, title, desc, icon, enabled, onSwitch, onTwitter, onFacebook, onExplore, onSetting, onTutorial } = props
+    const {
+        id,
+        title,
+        desc,
+        icon,
+        enabled = false,
+        hideSwitch,
+        onSwitch,
+        onTwitter,
+        onFacebook,
+        onExplore,
+        onSetting,
+        onTutorial,
+    } = props
     const { classes } = useStyles()
     return (
         <Box className={classes.root}>
@@ -98,7 +112,7 @@ export default function PluginItem(props: PluginItemProps) {
                         {onExplore ? <Explore onClick={() => onExplore(id)} /> : null}
                     </Box>
                 ) : null}
-                {id ? (
+                {!hideSwitch ? (
                     <SettingSwitch
                         size="small"
                         checked={enabled}

packages/dashboard/src/pages/Labs/components/PluginItem.tsx

@@ -30,25 +30,34 @@ export default function SwapSettingDialog({ open, onClose }: SettingDialogProps)
         { label: 'Balancer', value: TradeProvider.BALANCER },
         { label: 'DODO', value: TradeProvider.DODO },
         { label: 'Bancor', value: TradeProvider.BANCOR },
+        { label: 'OpenOcean', value: TradeProvider.OPENOCEAN },
     ]
 
     const polygonOptions = [
         { label: 'QuickSwap', value: TradeProvider.QUICKSWAP },
         { label: 'SushiSwap', value: TradeProvider.SUSHISWAP },
         { label: '0x', value: TradeProvider.ZRX },
         { label: 'DODO', value: TradeProvider.DODO },
+        { label: 'OpenOcean', value: TradeProvider.OPENOCEAN },
     ]
 
     const bscOptions = [
         { label: 'PancakeSwap', value: TradeProvider.PANCAKESWAP },
         { label: 'SushiSwap', value: TradeProvider.SUSHISWAP },
         { label: '0x', value: TradeProvider.ZRX },
         { label: 'DODO', value: TradeProvider.DODO },
+        { label: 'OpenOcean', value: TradeProvider.OPENOCEAN },
     ]
 
-    const arbitrumOptions = [{ label: 'UniSwap V3', value: TradeProvider.UNISWAP_V3 }]
+    const arbitrumOptions = [
+        { label: 'UniSwap V3', value: TradeProvider.UNISWAP_V3 },
+        { label: 'OpenOcean', value: TradeProvider.OPENOCEAN },
+    ]
 
-    const xDaiOptions = [{ label: 'SushiSwap', value: TradeProvider.SUSHISWAP }]
+    const xDaiOptions = [
+        { label: 'SushiSwap', value: TradeProvider.SUSHISWAP },
+        { label: 'OpenOcean', value: TradeProvider.OPENOCEAN },
+    ]
     const fantomOptions = xDaiOptions
 
     const celoOptions = [{ label: 'SushiSwap', value: TradeProvider.SUSHISWAP }]

packages/dashboard/src/pages/Labs/components/SwapSettingDialog.tsx

@@ -21,7 +21,7 @@ import {
 import { useDashboardI18N } from '../../locales'
 import MarketTrendSettingDialog from './components/MarketTrendSettingDialog'
 import { useAccount } from '@masknet/web3-shared-evm'
-import { Services, PluginMessages } from '../../API'
+import { Messages, Services, PluginMessages } from '../../API'
 import { useRemoteControlledDialog } from '@masknet/shared'
 import { TUTORIAL_URLS_EN } from './constants'
 import { ContentContainer } from '../../components/ContentContainer'
@@ -71,6 +71,14 @@ export default function Plugins() {
         [PluginId.PoolTogether]: true,
     })
 
+    useEffect(
+        () =>
+            Messages.events.pluginMinimalModeChanged.on(([id, newValue]) =>
+                setPluginStatus({ ...pluginStatus, [id]: newValue }),
+            ),
+        [pluginStatus],
+    )
+
     const plugins = [
         {
             id: PluginId.RedPacket,
@@ -107,13 +115,15 @@ export default function Plugins() {
             icon: <SwapServiceIcon />,
             enabled: pluginStatus[PluginId.Trader],
             setting: true,
+            hideSwitch: true,
         },
         {
             id: PluginId.Transak,
             title: t.labs_transak(),
             desc: t.labs_transak_desc(),
             icon: <TransakIcon />,
             enabled: pluginStatus[PluginId.Transak],
+            hideSwitch: true,
         },
         {
             id: PluginId.Collectible,
@@ -189,7 +199,7 @@ export default function Plugins() {
     const { openDialog: openSwapDialog } = useRemoteControlledDialog(PluginMessages.Swap.swapDialogUpdated)
 
     async function onSwitch(id: string, checked: boolean) {
-        await Services.Settings.setPluginEnabled(id, checked)
+        await Services.Settings.setPluginMinimalModeEnabled(id, !checked)
         setPluginStatus({ ...pluginStatus, [id]: checked })
     }
 
@@ -215,7 +225,7 @@ export default function Plugins() {
 
     useEffect(() => {
         Object.values(PluginId).forEach(async (id) => {
-            const enabled = await Services.Settings.getPluginEnabled(id)
+            const enabled = await Services.Settings.getPluginMinimalModeEnabled(id)
             setPluginStatus((status) => ({ ...status, [id]: enabled }))
         })
     }, [])
@@ -247,6 +257,7 @@ export default function Plugins() {
                             onSwitch={onSwitch}
                             onTutorial={onTutorial}
                             onSetting={p.setting ? onSetting : undefined}
+                            hideSwitch={p.hideSwitch}
                         />
                     ))}
                 </Box>

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

@@ -91,6 +91,8 @@
     "user_guide_tip_2": "Click here to have a quick start.",
     "create_persona": "Create persona",
     "connect_persona": "Connect persona",
+    "please_create_persona": "Please create persona",
+    "please_connect_persona": "Please connect persona",
     "mask_network": "Mask Network",
     "import": "Import",
     "no_search_result": "No result",
@@ -174,6 +176,7 @@
     "wallet_search_no_result": "No results.",
     "wallet_confirm_with_password": "Confirm with password",
     "wallet_airdrop_nft_unclaimed_title": "NFT Airdrop Unclaimed:",
+    "plugin_not_enabled": "{{plugin}} (Not Enabled)",
     "plugin_external_unknown_plugin": "New unknown Mask plugins found. Do you want to load them?",
     "plugin_external_loader_search_holder": "Search for an external plugin",
     "plugin_external_loader_search_button": "Search for plugin",
@@ -365,6 +368,14 @@
     "plugin_red_packet_nft_account_name": "Wallet account",
     "plugin_red_packet_nft_attached_message": "Attached Message",
     "plugin_red_packet_nft_total_amount": "Total Amount",
+    "plugin_red_packet_nft_select_collection": "Choose your collection",
+    "plugin_red_packet_nft_max_shares": "The maximum number of NFTs to be sold in NFT lucky drop contract is {{amount}}.",
+    "plugin_red_packet_nft_max_shares_tip": "The collection lucky drop contract supports up to {{amount}} NFTs for sale.",
+    "plugin_red_packet_nft_shift_select_tip": "You can also use <text>{{text}}</text> to select multiple NFTs.",
+    "plugin_red_packet_nft_non_existed_tip": "Token ID <tokenIdList></tokenIdList> does not exist or belong to you.",
+    "plugin_red_packet_nft_select_all_option": "ALL ({{total}} NFT)",
+    "plugin_red_packet_nft_select_partially_option": "Select partially",
+    "plugin_red_packet_nft_approve_all_tip": "Note: When selecting approve all, all NFTs in the contract will be authorized for sale by default, including the NFTs transfered later.",
     "plugin_red_packet_completed": "Completed",
     "plugin_red_packet_expired": "Expired",
     "plugin_red_packet_indivisible": "The minimum amount for each share is {{amount}} {{symbol}}",

packages/mask/shared-ui/locales/en-US.json

@@ -18,7 +18,7 @@ export interface BadgeRendererProps {
 }
 
 export function BadgeRenderer({ meta, onDeleteMeta, readonly }: BadgeRendererProps) {
-    const plugins = useActivatedPluginsSNSAdaptor()
+    const plugins = useActivatedPluginsSNSAdaptor('any')
     const i18n = usePluginI18NField()
     const { t } = useI18N()
     if (!meta) return null

packages/mask/src/components/CompositionDialog/BadgeRenderer.tsx

@@ -29,7 +29,7 @@ export const PluginEntryRender = memo(
         const chainId = useChainId()
         const pluginID = usePluginIDContext()
         const operatingSupportedChainMapping = useActivatedPluginSNSAdaptor_Web3Supported(chainId, pluginID)
-        const result = [...useActivatedPluginsSNSAdaptor()]
+        const result = [...useActivatedPluginsSNSAdaptor('any')]
             .sort((plugin) => {
                 // TODO: support priority order
                 if (plugin.ID === RedPacketPluginID || plugin.ID === ITO_PluginID) return -1