Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
"looksrare",
"magiceden",
"maskbook",
"maskbox",
"masknet",
"masknetwork",
"maskwallet",
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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]",
Expand Down
5 changes: 0 additions & 5 deletions packages/icons/icon-generated-as-jsx.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/icons/icon-generated-as-url.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions packages/icons/plugins/MaskBox.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/mask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:^",
Expand Down
10 changes: 3 additions & 7 deletions packages/mask/popups/modals/ConnectProvider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion packages/mask/shared/plugin-infra/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
69 changes: 0 additions & 69 deletions packages/plugins/MaskBox/package.json

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading