From ebae213ec993ccb7b4cd27d2a17c164de1af0cf4 Mon Sep 17 00:00:00 2001 From: Wenty Li <105278450+wenty22@users.noreply.github.com> Date: Fri, 15 Dec 2023 13:33:43 +0800 Subject: [PATCH 1/6] Fixed modal flickering issue in grid layout. (#66) * chore: Update bug_report template (#26) * feat: Add test example * feat: Update examples * feat: Add disclaimer & download url * docs: Update example * docs: Update docs * docs: Update docs * docs: Update gitignore * docs: Update docs * feat: Add zIndices theme config * feat: Update examples * feat: Refactor switch network modal * refactor: Clean code * feat: Update examples * refactor: Update dependencies * feat: Update version * docs: Update docs * chore: Add changeset * test: Test changeset version * docs: Create LICENSE * docs: Update packages info * chore: Add husky & lint-staged * abc: test commit lint * chore: Update husky * chore: Update husky * test: test husky * chore: Add issue & pr template * fix: Update OpenSwitchNetworkOptions type * feat: Add options to control modal close * feat: Add default wallets to walletConnect * docs: Update useModal document * refactor: Add className to base components * chore: Add release github acton * chore: Add publish ci script * chore: Fix github action * chore: Update github action * test: Test github action * chore: Add .pnpm-store to gitignore * chore: Update github action * chore: Copy readme to walletkit package when publish * chore: Update issue_template * chore: Update pr & issue template * Update bug_report.yml * Create config.yml * Delete .github/ISSUE_TEMPLATE/config.yml * Update bug_report.yml * Update bug_report.yml * chore: Update bug_report.yml * style: Add chains type declaration for dev example * style: Add chains type declaration for dev example * chore: test docs release workflow * chore: Test docs release workflow * chore: test docs release workflow * chore: test docs release workflow * style: Add chains type declaration for dev example * chore: test docs release workflow * chore: Test docs release workflow * chore: test docs release workflow * chore: test docs release workflow * test: test alpha release * chore: update versions (alpha) (#39) Co-authored-by: github-actions[bot] * docs: Update docs * fix: fix theme `auto` mode issue & fix walletConnect chains error * fix: fixed `WalletConnect` automatic connection issue * chore: Update dependencies versions * chore: update versions (alpha) (#41) Co-authored-by: github-actions[bot] * chore: prettier & eslint ignore changeset's md files * fix: No need refresh when open WalletConnect Modal in QRCode page * chore: Add vconsole for dev demo * fix: fixed trustwallet losing status after refreshing * chore: update release info * fix: Fixed trustwallet losing account status after refreshing (#44) * chore: prettier & eslint ignore changeset's md files * fix: No need refresh when open WalletConnect Modal in QRCode page * chore: Add vconsole for dev demo * fix: fixed trustwallet losing status after refreshing * chore: update release info * chore: update versions (alpha) (#45) Co-authored-by: github-actions[bot] * style: Update log output styles * style: Add switchNetwork log * refactor: update the `installed` field that detect whether wallet is installed to a function * fix: fixed conflict issue between trustwallet and metaMask * docs: update release docs * Dev (#47) * chore: prettier & eslint ignore changeset's md files * fix: No need refresh when open WalletConnect Modal in QRCode page * chore: Add vconsole for dev demo * fix: fixed trustwallet losing status after refreshing * chore: update release info * style: Update log output styles * style: Add switchNetwork log * refactor: update the `installed` field that detect whether wallet is installed to a function * fix: fixed conflict issue between trustwallet and metaMask * docs: update release docs * chore: update versions (alpha) (#48) Co-authored-by: github-actions[bot] * docs: Add tests for adding new wallet * Dev (#49) * chore: prettier & eslint ignore changeset's md files * fix: No need refresh when open WalletConnect Modal in QRCode page * chore: Add vconsole for dev demo * fix: fixed trustwallet losing status after refreshing * chore: update release info * style: Update log output styles * style: Add switchNetwork log * refactor: update the `installed` field that detect whether wallet is installed to a function * fix: fixed conflict issue between trustwallet and metaMask * docs: update release docs * docs: Add tests for adding new wallet * docs: Update contributing * docs: Add test result table to PULL_REQUEST_TEMPLATE * fix: fixed multiple wallet conflicts resulting in undetectable issues * chore: Add changeset log * fix: Fixed multiple wallets conficts resulting in undetectable issues. (#51) * docs: Add test result table to PULL_REQUEST_TEMPLATE * fix: fixed multiple wallet conflicts resulting in undetectable issues * chore: Add changeset log * chore: update versions (alpha) (#52) Co-authored-by: github-actions[bot] * fix: Fixed TrustWallet will automatically reconnect after reloading the page. (#53) * docs: Add test result table to PULL_REQUEST_TEMPLATE * fix: fixed multiple wallet conflicts resulting in undetectable issues * chore: Add changeset log * chore: update versions (alpha) (#54) Co-authored-by: github-actions[bot] * feat: add `action` prop to WalletKitButton & WalletKitButton.Custom to support the case of adding network. * Add `action` prop to WalletKitButton & WalletKitButton.Custom to support the case of adding network. (#56) * docs: Add test result table to PULL_REQUEST_TEMPLATE * fix: fixed multiple wallet conflicts resulting in undetectable issues * chore: Add changeset log * feat: add `action` prop to WalletKitButton & WalletKitButton.Custom to support the case of adding network. * chore: update versions (alpha) (#57) Co-authored-by: github-actions[bot] * fix: fix theme configuration naming error issue * docs: Add changeset docs * build: release * fix: Fixed modal flickering issue in grid layout. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] --- .changeset/afraid-crabs-pump.md | 5 +++++ .changeset/cold-rockets-knock.md | 5 +++++ .changeset/famous-drinks-behave.md | 5 +++++ .changeset/happy-hounds-complain.md | 5 +++++ .changeset/honest-numbers-hug.md | 5 +++++ .changeset/late-birds-compare.md | 5 +++++ .changeset/lovely-months-argue.md | 5 +++++ .changeset/modern-comics-smell.md | 5 +++++ .changeset/pre.json | 19 +++++++++++++++++++ .changeset/pretty-flowers-rhyme.md | 5 +++++ .../components/WalletKitProvider/context.ts | 1 + .../components/WalletKitProvider/index.tsx | 5 ++++- .../walletkit/src/pages/Connectors/index.tsx | 4 +--- 13 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 .changeset/afraid-crabs-pump.md create mode 100644 .changeset/cold-rockets-knock.md create mode 100644 .changeset/famous-drinks-behave.md create mode 100644 .changeset/happy-hounds-complain.md create mode 100644 .changeset/honest-numbers-hug.md create mode 100644 .changeset/late-birds-compare.md create mode 100644 .changeset/lovely-months-argue.md create mode 100644 .changeset/modern-comics-smell.md create mode 100644 .changeset/pre.json create mode 100644 .changeset/pretty-flowers-rhyme.md diff --git a/.changeset/afraid-crabs-pump.md b/.changeset/afraid-crabs-pump.md new file mode 100644 index 00000000..c9bc7057 --- /dev/null +++ b/.changeset/afraid-crabs-pump.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed theme configuration naming error issue diff --git a/.changeset/cold-rockets-knock.md b/.changeset/cold-rockets-knock.md new file mode 100644 index 00000000..6ebe2b36 --- /dev/null +++ b/.changeset/cold-rockets-knock.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed modal flickering issue in grid layout. diff --git a/.changeset/famous-drinks-behave.md b/.changeset/famous-drinks-behave.md new file mode 100644 index 00000000..d53113e8 --- /dev/null +++ b/.changeset/famous-drinks-behave.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed TrustWallet will automatically reconnect after reloading the page. diff --git a/.changeset/happy-hounds-complain.md b/.changeset/happy-hounds-complain.md new file mode 100644 index 00000000..17ddadad --- /dev/null +++ b/.changeset/happy-hounds-complain.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +refactor: update the `installed` field that detect whether wallet is installed to a function diff --git a/.changeset/honest-numbers-hug.md b/.changeset/honest-numbers-hug.md new file mode 100644 index 00000000..12669d36 --- /dev/null +++ b/.changeset/honest-numbers-hug.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed multiple wallets conficts resulting in undetectable issues. diff --git a/.changeset/late-birds-compare.md b/.changeset/late-birds-compare.md new file mode 100644 index 00000000..2471f4e7 --- /dev/null +++ b/.changeset/late-birds-compare.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed `WalletConnect` automatic connection issue in the follow scenario: connect the WalletConnect -> close browser -> reopen browser -> disconnect -> select WalletConnect, will automatically connect. diff --git a/.changeset/lovely-months-argue.md b/.changeset/lovely-months-argue.md new file mode 100644 index 00000000..8674cc05 --- /dev/null +++ b/.changeset/lovely-months-argue.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed trustwallet losing account status after refreshing diff --git a/.changeset/modern-comics-smell.md b/.changeset/modern-comics-smell.md new file mode 100644 index 00000000..55dfc42c --- /dev/null +++ b/.changeset/modern-comics-smell.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed conflict issue between trustwallet and metaMask. diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 00000000..06ad5de3 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,19 @@ +{ + "mode": "exit", + "tag": "alpha", + "initialVersions": { + "example-nextjs": "0.0.1", + "example-vite": "0.0.1", + "@totejs/walletkit": "1.0.7-alpha.2", + "website": "0.0.1" + }, + "changesets": [ + "famous-drinks-behave", + "happy-hounds-complain", + "honest-numbers-hug", + "late-birds-compare", + "lovely-months-argue", + "modern-comics-smell", + "pretty-flowers-rhyme" + ] +} diff --git a/.changeset/pretty-flowers-rhyme.md b/.changeset/pretty-flowers-rhyme.md new file mode 100644 index 00000000..261fa305 --- /dev/null +++ b/.changeset/pretty-flowers-rhyme.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Add `action` prop to WalletKitButton & WalletKitButton.Custom to support the case of adding network. diff --git a/packages/walletkit/src/components/WalletKitProvider/context.ts b/packages/walletkit/src/components/WalletKitProvider/context.ts index fa7cf50b..a61faf62 100644 --- a/packages/walletkit/src/components/WalletKitProvider/context.ts +++ b/packages/walletkit/src/components/WalletKitProvider/context.ts @@ -29,6 +29,7 @@ export interface WalletKitOptions { export interface WalletKitContextProps { options: WalletKitOptions; supportedChains: ChainProps[]; + isMobileLayout: boolean; action: Action; setAction: (action: Action) => void; diff --git a/packages/walletkit/src/components/WalletKitProvider/index.tsx b/packages/walletkit/src/components/WalletKitProvider/index.tsx index f357fec8..ba196ffb 100644 --- a/packages/walletkit/src/components/WalletKitProvider/index.tsx +++ b/packages/walletkit/src/components/WalletKitProvider/index.tsx @@ -10,6 +10,7 @@ import { RouteProvider } from '../RouteProvider'; import { ThemeVariant, ThemeMode, ThemeProvider } from '../ThemeProvider'; import { WalletKitModal } from '../WalletKitModal'; import { WalletKitOptions, WalletKitContextProps, WalletKitContext, Action } from './context'; +import { useResponsive } from '@/base/hooks/useResponsive'; export interface WalletKitProviderProps { options: WalletKitOptions; @@ -34,6 +35,7 @@ export const WalletKitProvider = (props: WalletKitProviderProps) => { const [selectedConnector, setSelectedConnector] = useState({} as Connector); const chains = useChains(); + const { isMobileLayout } = useResponsive(); const value = useMemo(() => { const finalOptions = getDefaultProviderOptions(options); @@ -44,13 +46,14 @@ export const WalletKitProvider = (props: WalletKitProviderProps) => { log: debugMode ? console.log : () => {}, options: finalOptions, supportedChains: finalChains, + isMobileLayout, action, setAction, selectedConnector, setSelectedConnector, }; return finalValue; - }, [options, chains, debugMode, action, selectedConnector]); + }, [options, chains, debugMode, isMobileLayout, action, selectedConnector]); return ( diff --git a/packages/walletkit/src/pages/Connectors/index.tsx b/packages/walletkit/src/pages/Connectors/index.tsx index 81eac6c4..b03b94e8 100644 --- a/packages/walletkit/src/pages/Connectors/index.tsx +++ b/packages/walletkit/src/pages/Connectors/index.tsx @@ -1,6 +1,5 @@ import { Box } from '@/base/components/Box'; import { ModalHeader } from '@/base/components/Modal/ModalHeader'; -import { useResponsive } from '@/base/hooks/useResponsive'; import { Navbar } from '@/components/Navbar'; import { useWalletKitContext, cx } from '@/index'; import { useConnect } from 'wagmi'; @@ -11,9 +10,8 @@ import { LIST_LAYOUT_THRESHOLD } from '@/constants/common'; export function ConnectorsPage() { const { connectors } = useConnect(); - const { options } = useWalletKitContext(); + const { options, isMobileLayout } = useWalletKitContext(); - const { isMobileLayout } = useResponsive(); const visibleConnectors = connectors.filter((c) => !!c._wallet); const useGridLayout = visibleConnectors.length > LIST_LAYOUT_THRESHOLD || isMobileLayout; From 1fabb68f9ea58508163e92315e028d85c9312ffc Mon Sep 17 00:00:00 2001 From: Wenty Li Date: Fri, 15 Dec 2023 13:34:34 +0800 Subject: [PATCH 2/6] docs: Remove changeset log --- .changeset/afraid-crabs-pump.md | 5 ----- .changeset/cold-rockets-knock.md | 5 ----- .changeset/famous-drinks-behave.md | 5 ----- .changeset/happy-hounds-complain.md | 5 ----- .changeset/honest-numbers-hug.md | 5 ----- .changeset/late-birds-compare.md | 5 ----- .changeset/lovely-months-argue.md | 5 ----- .changeset/modern-comics-smell.md | 5 ----- .changeset/pre.json | 10 +--------- .changeset/pretty-flowers-rhyme.md | 5 ----- 10 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 .changeset/afraid-crabs-pump.md delete mode 100644 .changeset/cold-rockets-knock.md delete mode 100644 .changeset/famous-drinks-behave.md delete mode 100644 .changeset/happy-hounds-complain.md delete mode 100644 .changeset/honest-numbers-hug.md delete mode 100644 .changeset/late-birds-compare.md delete mode 100644 .changeset/lovely-months-argue.md delete mode 100644 .changeset/modern-comics-smell.md delete mode 100644 .changeset/pretty-flowers-rhyme.md diff --git a/.changeset/afraid-crabs-pump.md b/.changeset/afraid-crabs-pump.md deleted file mode 100644 index c9bc7057..00000000 --- a/.changeset/afraid-crabs-pump.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed theme configuration naming error issue diff --git a/.changeset/cold-rockets-knock.md b/.changeset/cold-rockets-knock.md deleted file mode 100644 index 6ebe2b36..00000000 --- a/.changeset/cold-rockets-knock.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed modal flickering issue in grid layout. diff --git a/.changeset/famous-drinks-behave.md b/.changeset/famous-drinks-behave.md deleted file mode 100644 index d53113e8..00000000 --- a/.changeset/famous-drinks-behave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed TrustWallet will automatically reconnect after reloading the page. diff --git a/.changeset/happy-hounds-complain.md b/.changeset/happy-hounds-complain.md deleted file mode 100644 index 17ddadad..00000000 --- a/.changeset/happy-hounds-complain.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -refactor: update the `installed` field that detect whether wallet is installed to a function diff --git a/.changeset/honest-numbers-hug.md b/.changeset/honest-numbers-hug.md deleted file mode 100644 index 12669d36..00000000 --- a/.changeset/honest-numbers-hug.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed multiple wallets conficts resulting in undetectable issues. diff --git a/.changeset/late-birds-compare.md b/.changeset/late-birds-compare.md deleted file mode 100644 index 2471f4e7..00000000 --- a/.changeset/late-birds-compare.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed `WalletConnect` automatic connection issue in the follow scenario: connect the WalletConnect -> close browser -> reopen browser -> disconnect -> select WalletConnect, will automatically connect. diff --git a/.changeset/lovely-months-argue.md b/.changeset/lovely-months-argue.md deleted file mode 100644 index 8674cc05..00000000 --- a/.changeset/lovely-months-argue.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed trustwallet losing account status after refreshing diff --git a/.changeset/modern-comics-smell.md b/.changeset/modern-comics-smell.md deleted file mode 100644 index 55dfc42c..00000000 --- a/.changeset/modern-comics-smell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed conflict issue between trustwallet and metaMask. diff --git a/.changeset/pre.json b/.changeset/pre.json index 06ad5de3..610d3659 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -7,13 +7,5 @@ "@totejs/walletkit": "1.0.7-alpha.2", "website": "0.0.1" }, - "changesets": [ - "famous-drinks-behave", - "happy-hounds-complain", - "honest-numbers-hug", - "late-birds-compare", - "lovely-months-argue", - "modern-comics-smell", - "pretty-flowers-rhyme" - ] + "changesets": [] } diff --git a/.changeset/pretty-flowers-rhyme.md b/.changeset/pretty-flowers-rhyme.md deleted file mode 100644 index 261fa305..00000000 --- a/.changeset/pretty-flowers-rhyme.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Add `action` prop to WalletKitButton & WalletKitButton.Custom to support the case of adding network. From e76c5af0f8efe92fb2f83d3bdeb866d3364d1449 Mon Sep 17 00:00:00 2001 From: Wenty Li Date: Fri, 15 Dec 2023 13:37:34 +0800 Subject: [PATCH 3/6] docs: Update release docs --- .changeset/cold-rockets-knock.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/cold-rockets-knock.md diff --git a/.changeset/cold-rockets-knock.md b/.changeset/cold-rockets-knock.md new file mode 100644 index 00000000..80cb27c6 --- /dev/null +++ b/.changeset/cold-rockets-knock.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed modal flickering issue in grid layout. \ No newline at end of file From b06e30afb64925920d0d2b69e5d8bd6f2c72d4b1 Mon Sep 17 00:00:00 2001 From: Wenty Li Date: Fri, 15 Dec 2023 13:40:09 +0800 Subject: [PATCH 4/6] docs: Remove changeset logs --- .changeset/afraid-crabs-pump.md | 5 ----- .changeset/famous-drinks-behave.md | 5 ----- .changeset/happy-hounds-complain.md | 5 ----- .changeset/honest-numbers-hug.md | 5 ----- .changeset/late-birds-compare.md | 5 ----- .changeset/lovely-months-argue.md | 5 ----- .changeset/modern-comics-smell.md | 5 ----- .changeset/pretty-flowers-rhyme.md | 5 ----- 8 files changed, 40 deletions(-) delete mode 100644 .changeset/afraid-crabs-pump.md delete mode 100644 .changeset/famous-drinks-behave.md delete mode 100644 .changeset/happy-hounds-complain.md delete mode 100644 .changeset/honest-numbers-hug.md delete mode 100644 .changeset/late-birds-compare.md delete mode 100644 .changeset/lovely-months-argue.md delete mode 100644 .changeset/modern-comics-smell.md delete mode 100644 .changeset/pretty-flowers-rhyme.md diff --git a/.changeset/afraid-crabs-pump.md b/.changeset/afraid-crabs-pump.md deleted file mode 100644 index c9bc7057..00000000 --- a/.changeset/afraid-crabs-pump.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed theme configuration naming error issue diff --git a/.changeset/famous-drinks-behave.md b/.changeset/famous-drinks-behave.md deleted file mode 100644 index d53113e8..00000000 --- a/.changeset/famous-drinks-behave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed TrustWallet will automatically reconnect after reloading the page. diff --git a/.changeset/happy-hounds-complain.md b/.changeset/happy-hounds-complain.md deleted file mode 100644 index 17ddadad..00000000 --- a/.changeset/happy-hounds-complain.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -refactor: update the `installed` field that detect whether wallet is installed to a function diff --git a/.changeset/honest-numbers-hug.md b/.changeset/honest-numbers-hug.md deleted file mode 100644 index 12669d36..00000000 --- a/.changeset/honest-numbers-hug.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed multiple wallets conficts resulting in undetectable issues. diff --git a/.changeset/late-birds-compare.md b/.changeset/late-birds-compare.md deleted file mode 100644 index 2471f4e7..00000000 --- a/.changeset/late-birds-compare.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed `WalletConnect` automatic connection issue in the follow scenario: connect the WalletConnect -> close browser -> reopen browser -> disconnect -> select WalletConnect, will automatically connect. diff --git a/.changeset/lovely-months-argue.md b/.changeset/lovely-months-argue.md deleted file mode 100644 index 8674cc05..00000000 --- a/.changeset/lovely-months-argue.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed trustwallet losing account status after refreshing diff --git a/.changeset/modern-comics-smell.md b/.changeset/modern-comics-smell.md deleted file mode 100644 index 55dfc42c..00000000 --- a/.changeset/modern-comics-smell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed conflict issue between trustwallet and metaMask. diff --git a/.changeset/pretty-flowers-rhyme.md b/.changeset/pretty-flowers-rhyme.md deleted file mode 100644 index 261fa305..00000000 --- a/.changeset/pretty-flowers-rhyme.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Add `action` prop to WalletKitButton & WalletKitButton.Custom to support the case of adding network. From 5fddeec02e1e72c3136cdad7f03be539d5d6038f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 13:58:50 +0800 Subject: [PATCH 5/6] chore: update versions (#75) Co-authored-by: github-actions[bot] --- .changeset/cold-rockets-knock.md | 5 ----- .changeset/pre.json | 11 ----------- packages/walletkit/CHANGELOG.md | 6 ++++++ packages/walletkit/package.json | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 .changeset/cold-rockets-knock.md delete mode 100644 .changeset/pre.json diff --git a/.changeset/cold-rockets-knock.md b/.changeset/cold-rockets-knock.md deleted file mode 100644 index 6ebe2b36..00000000 --- a/.changeset/cold-rockets-knock.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@totejs/walletkit': patch ---- - -Fixed modal flickering issue in grid layout. diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 610d3659..00000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "mode": "exit", - "tag": "alpha", - "initialVersions": { - "example-nextjs": "0.0.1", - "example-vite": "0.0.1", - "@totejs/walletkit": "1.0.7-alpha.2", - "website": "0.0.1" - }, - "changesets": [] -} diff --git a/packages/walletkit/CHANGELOG.md b/packages/walletkit/CHANGELOG.md index f0b7c728..04796165 100644 --- a/packages/walletkit/CHANGELOG.md +++ b/packages/walletkit/CHANGELOG.md @@ -1,5 +1,11 @@ # @totejs/walletkit +## 1.0.8 + +### Patch Changes + +- ebae213: Fixed modal flickering issue in grid layout. + ## 1.0.7 ### Patch Changes diff --git a/packages/walletkit/package.json b/packages/walletkit/package.json index 9d9d1b73..ee31778d 100644 --- a/packages/walletkit/package.json +++ b/packages/walletkit/package.json @@ -1,6 +1,6 @@ { "name": "@totejs/walletkit", - "version": "1.0.7", + "version": "1.0.8", "author": "node-real", "private": false, "description": "WalletKit is a React component library for easily connecting a wallet to your dApp.", From 53b65ecdc09edfcabd3c4b8a5961d75b3f153374 Mon Sep 17 00:00:00 2001 From: Wenty Li Date: Mon, 18 Dec 2023 16:56:37 +0800 Subject: [PATCH 6/6] fix: Fixed switching network failure in coinbaseWallet. --- .changeset/pre.json | 11 ++++ .changeset/stale-pumas-float.md | 5 ++ .../src/wallets/coinbaseWallet/connector.ts | 59 +++++++++++++++++++ .../src/wallets/coinbaseWallet/index.tsx | 2 +- packages/walletkit/src/wallets/index.ts | 1 + 5 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 .changeset/pre.json create mode 100644 .changeset/stale-pumas-float.md create mode 100644 packages/walletkit/src/wallets/coinbaseWallet/connector.ts diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 00000000..61d13b15 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,11 @@ +{ + "mode": "pre", + "tag": "alpha", + "initialVersions": { + "example-nextjs": "0.0.1", + "example-vite": "0.0.1", + "@totejs/walletkit": "1.0.8", + "website": "0.0.1" + }, + "changesets": [] +} diff --git a/.changeset/stale-pumas-float.md b/.changeset/stale-pumas-float.md new file mode 100644 index 00000000..da17fc16 --- /dev/null +++ b/.changeset/stale-pumas-float.md @@ -0,0 +1,5 @@ +--- +'@totejs/walletkit': patch +--- + +Fixed switching network failure in coinbaseWallet. diff --git a/packages/walletkit/src/wallets/coinbaseWallet/connector.ts b/packages/walletkit/src/wallets/coinbaseWallet/connector.ts new file mode 100644 index 00000000..8d44f669 --- /dev/null +++ b/packages/walletkit/src/wallets/coinbaseWallet/connector.ts @@ -0,0 +1,59 @@ +import { CoinbaseWalletConnector as WagmiCoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet'; + +import { ProviderRpcError, SwitchChainError, UserRejectedRequestError, numberToHex } from 'viem'; + +export class CoinbaseWalletConnector extends WagmiCoinbaseWalletConnector { + async switchChain(chainId: number) { + const provider = await this.getProvider(); + const id = numberToHex(chainId); + + try { + await provider.request({ + method: 'wallet_switchEthereumChain', + params: [{ chainId: id }], + }); + return ( + this.chains.find((x) => x.id === chainId) ?? { + id: chainId, + name: `Chain ${id}`, + network: `${id}`, + nativeCurrency: { name: 'Ether', decimals: 18, symbol: 'ETH' }, + rpcUrls: { default: { http: [''] }, public: { http: [''] } }, + } + ); + } catch (error) { + const chain = this.chains.find((x) => x.id === chainId); + if (!chain) { + throw new Error(`Chain "${chainId}" not configured for connector "${this.id}".`); + } + + // fix: + // We found if there is no corresponding network in coinbaseWallet, error code is -32603 + // Indicates chain is not added to provider + if ( + (error as ProviderRpcError).code === 4902 || + (error as ProviderRpcError).code === -32603 + ) { + try { + await provider.request({ + method: 'wallet_addEthereumChain', + params: [ + { + chainId: id, + chainName: chain.name, + nativeCurrency: chain.nativeCurrency, + rpcUrls: [chain.rpcUrls.public?.http[0] ?? ''], + blockExplorerUrls: this.getBlockExplorerUrls(chain), + }, + ], + }); + return chain; + } catch (error) { + throw new UserRejectedRequestError(error as Error); + } + } + + throw new SwitchChainError(error as Error); + } + } +} diff --git a/packages/walletkit/src/wallets/coinbaseWallet/index.tsx b/packages/walletkit/src/wallets/coinbaseWallet/index.tsx index d944b39f..58d339d6 100644 --- a/packages/walletkit/src/wallets/coinbaseWallet/index.tsx +++ b/packages/walletkit/src/wallets/coinbaseWallet/index.tsx @@ -1,6 +1,6 @@ import { getGlobalData } from '@/globalData'; import { Chain } from 'wagmi'; -import { CoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet'; +import { CoinbaseWalletConnector } from './connector'; import { PartialWalletProps, WalletProps } from '..'; import { hasInjectedProvider } from '../utils'; import { CoinbaseWalletIcon, CoinbaseWalletTransparentIcon } from './icon'; diff --git a/packages/walletkit/src/wallets/index.ts b/packages/walletkit/src/wallets/index.ts index 900f90ff..b1889677 100644 --- a/packages/walletkit/src/wallets/index.ts +++ b/packages/walletkit/src/wallets/index.ts @@ -14,3 +14,4 @@ export * from './okxWallet'; export * from './mathWallet'; export * from './binanceWeb3Wallet'; export * from './coinbaseWallet'; +export * from './coinbaseWallet/connector';