[Release] Hotfix 2.28.0 => 2.28.1 (patch) (#11929)

* chore: bump version to 2.28.1 * chore: remove fortmatic wallet and maskbox plugin (#11923) * chore: mf-6488 remove fortmatic wallet * chore: mf-6374 remove maskbox * fixup! chore: mf-6374 remove maskbox * fix: prettier --------- Co-authored-by: swkatmask <[email protected]> * fixup! refactor: mf-6204 relation service use lowercase category name (#11922) (#11932) * fix: lint --------- Co-authored-by: Wukong Sun <[email protected]> Co-authored-by: swkatmask <[email protected]>
DimensionDev · Nov 15, 2024 · 59eb901 · 59eb901
1 parent 2f6a199
commit 59eb901
Show file tree

Hide file tree

Showing 85 changed files with 164 additions and 3,936 deletions.
diff --git a/cspell.json b/cspell.json
@@ -118,7 +118,6 @@
         "looksrare",
         "magiceden",
         "maskbook",
-        "maskbox",
         "masknet",
         "masknetwork",
         "maskwallet",

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.28.0",
+  "version": "2.28.1",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
@@ -145,7 +145,6 @@
       "@project-serum/[email protected]": "patches/@[email protected]",
       "@types/[email protected]": "patches/@[email protected]",
       "@cyberlab/[email protected]": "patches/@[email protected]",
-      "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",

diff --git a/packages/icons/icon-generated-as-jsx.js b/packages/icons/icon-generated-as-jsx.js
diff --git a/packages/icons/icon-generated-as-url.js b/packages/icons/icon-generated-as-url.js
diff --git a/packages/icons/plugins/MaskBox.svg b/packages/icons/plugins/MaskBox.svg
diff --git a/packages/mask/package.json b/packages/mask/package.json
@@ -56,7 +56,6 @@
     "@masknet/plugin-go-plus-security": "workspace:^",
     "@masknet/plugin-handle": "workspace:^",
     "@masknet/plugin-infra": "workspace:^",
-    "@masknet/plugin-maskbox": "workspace:^",
     "@masknet/plugin-nextid": "workspace:^",
     "@masknet/plugin-pets": "workspace:^",
     "@masknet/plugin-profilecard": "workspace:^",

diff --git a/packages/mask/popups/modals/ConnectProvider/index.tsx b/packages/mask/popups/modals/ConnectProvider/index.tsx
@@ -7,7 +7,7 @@ import { makeStyles, usePopupCustomSnackbar } from '@masknet/theme'
 import { useNetworkContext, useProviderDescriptor, useWeb3State } from '@masknet/web3-hooks-base'
 import { PopupModalRoutes, type NetworkPluginID, PopupRoutes } from '@masknet/shared-base'
 import { EVMWeb3 } from '@masknet/web3-providers'
-import { ChainId, ProviderType } from '@masknet/web3-shared-evm'
+import { type ProviderType } from '@masknet/web3-shared-evm'
 import { ActionModal, type ActionModalBaseProps, useModalNavigate } from '../../components/index.js'
 import { Trans } from '@lingui/macro'
 
@@ -104,18 +104,14 @@ export const ConnectProviderModal = memo<ActionModalBaseProps>(function ConnectP
             const connect = async () => {
                 // wait for web3 state init
                 await delay(1500)
-                const chainId =
-                    providerType === ProviderType.Fortmatic ?
-                        ChainId.Mainnet
-                    :   await EVMWeb3.getChainId({ providerType })
+                const chainId = await EVMWeb3.getChainId({ providerType })
                 return EVMWeb3.connect({
                     chainId,
                     providerType: providerType as ProviderType,
                 })
             }
 
-            // Fortmatic takes extra time because it requires the user to enter an account and password, a verification code
-            const result = await timeout(connect(), providerType === ProviderType.Fortmatic ? 5 * 60 * 1000 : 30 * 1000)
+            const result = await timeout(connect(), 30 * 1000)
             if (!result) return
             navigate(PopupRoutes.ConnectWallet, {
                 replace: true,

diff --git a/packages/mask/shared/plugin-infra/register.js b/packages/mask/shared/plugin-infra/register.js
@@ -16,7 +16,6 @@ import '@masknet/plugin-collectible/register'
 import '@masknet/plugin-transak/register'
 import '@masknet/plugin-vcent/register'
 import '@masknet/plugin-avatar/register'
-import '@masknet/plugin-maskbox/register'
 import '@masknet/plugin-claim/register'
 import '@masknet/plugin-artblocks/register'
 import '@masknet/plugin-pets/register'

diff --git a/packages/plugins/MaskBox/package.json b/packages/plugins/MaskBox/package.json
diff --git a/packages/plugins/MaskBox/src/SiteAdaptor/components/ArticlesTab.tsx b/packages/plugins/MaskBox/src/SiteAdaptor/components/ArticlesTab.tsx
diff --git a/packages/plugins/MaskBox/src/SiteAdaptor/components/CollectibleCard.tsx b/packages/plugins/MaskBox/src/SiteAdaptor/components/CollectibleCard.tsx