Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of github.com:etouyang/Maskbook into pet-owner
* '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
- Loading branch information