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

fix: fixup maskbox for evm migration #6395

Merged
merged 1 commit into from
Jun 3, 2022
Merged

fix: fixup maskbox for evm migration #6395

merged 1 commit into from
Jun 3, 2022

Conversation

UncleBill
Copy link
Contributor

No description provided.

@UncleBill UncleBill changed the title fix: fixup maskbox for evm migrate fix: fixup maskbox for evm migration May 31, 2022
@github-actions
Copy link
Contributor

github-actions bot commented May 31, 2022

@github-actions github-actions bot temporarily deployed to pull request May 31, 2022 13:22 Inactive
@github-actions github-actions bot temporarily deployed to pull request June 1, 2022 09:31 Inactive
@github-actions github-actions bot temporarily deployed to pull request June 2, 2022 10:59 Inactive
@guanbinrui guanbinrui merged commit e677947 into develop Jun 3, 2022
@guanbinrui guanbinrui deleted the fix/maskbox branch June 3, 2022 08:15
etouyang added a commit to etouyang/Maskbook that referenced this pull request Jun 7, 2022
* 'develop' of github.com:etouyang/Maskbook: (173 commits)
  feat: more debugger connection actions (DimensionDev#6438)
  fix: sign tx by wallet with mnemonic words (DimensionDev#6437)
  fix: sign arbitrary message (DimensionDev#6436)
  fix: bugfix for refactor (DimensionDev#6434)
  fix: lost overrides (DimensionDev#6435)
  feat: add useAccountName (DimensionDev#6429)
  fix: button logic under EVM chain (DimensionDev#6431)
  fix: gas price fallback (DimensionDev#6432)
  chore: update node-version for workspace (DimensionDev#6428)
  refactor: social address list (DimensionDev#6410)
  fix: bugfix for trader (DimensionDev#6424)
  fix: duplicated db fetch (DimensionDev#6426)
  docs(i18n): sync i18n files from Crowdin (DimensionDev#6425)
  fix: tsc need restart to handle new file or removed file in watch mode
  fix: lint errors
  feat: referral farms (DimensionDev#6128)
  fix: fixup maskbox for evm migrate (DimensionDev#6395)
  fix: pets artblocks plugin (DimensionDev#6393)
  docs: update compat table
  refactor: add RecentTransactionComputed (DimensionDev#6420)
  ...

# Conflicts:
#	packages/dashboard/src/initialization/isolated_bridge.ts
#	packages/mask/src/extension/dashboard/index.tsx
#	packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx
#	packages/mask/src/plugins/Pets/SNSAdaptor/PreviewBox.tsx
#	packages/mask/src/plugins/Pets/Services/rss3.ts
#	packages/mask/src/plugins/Pets/hooks/useNfts.ts
#	packages/shared/src/index.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants