Merge branch 'main' into dev

2023-03-02 23:44:50 +00:00 · 2023-03-02 23:44:50 +00:00 · f48c4edea5
parent db7574f99b 5b29b03380
commit f48c4edea5
7 changed files with 141 additions and 221 deletions
--- a/package.json
+++ b/package.json
@ -22,14 +22,12 @@
    "@codemirror/language": "6.6.0",
    "@codemirror/state": "6.2.0",
    "@codemirror/view": "6.9.1",
-    "@crossbell/connect-kit": "0.0.36",
-    "@crossbell/contract": "0.0.36",
-    "@crossbell/indexer": "0.0.36",
-    "@crossbell/notification": "0.0.36",
-    "@crossbell/ui": "0.0.36",
-    "@crossbell/util-ethers": "0.0.36",
-    "@crossbell/util-hooks": "0.0.36",
-    "@crossbell/util-metadata": "0.0.36",
+    "@crossbell/connect-kit": "0.0.39",
+    "@crossbell/contract": "0.0.39",
+    "@crossbell/indexer": "0.0.39",
+    "@crossbell/notification": "0.0.39",
+    "@crossbell/ui": "0.0.39",
+    "@crossbell/util-hooks": "0.0.39",
    "@emoji-mart/data": "1.1.2",
    "@emoji-mart/react": "1.1.1",
    "@floating-ui/react": "^0.20.1",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -6,14 +6,12 @@ specifiers:
  '@codemirror/language': 6.6.0
  '@codemirror/state': 6.2.0
  '@codemirror/view': 6.9.1
-  '@crossbell/connect-kit': 0.0.36
-  '@crossbell/contract': 0.0.36
-  '@crossbell/indexer': 0.0.36
-  '@crossbell/notification': 0.0.36
-  '@crossbell/ui': 0.0.36
-  '@crossbell/util-ethers': 0.0.36
-  '@crossbell/util-hooks': 0.0.36
-  '@crossbell/util-metadata': 0.0.36
+  '@crossbell/connect-kit': 0.0.39
+  '@crossbell/contract': 0.0.39
+  '@crossbell/indexer': 0.0.39
+  '@crossbell/notification': 0.0.39
+  '@crossbell/ui': 0.0.39
+  '@crossbell/util-hooks': 0.0.39
  '@emoji-mart/data': 1.1.2
  '@emoji-mart/react': 1.1.1
  '@floating-ui/react': ^0.20.1
@ -140,14 +138,12 @@ dependencies:
  '@codemirror/language': 6.6.0
  '@codemirror/state': 6.2.0
  '@codemirror/view': 6.9.1
-  '@crossbell/connect-kit': 0.0.36_qdgnykv4dtwwb7gnhnidsayybi
-  '@crossbell/contract': 0.0.36_kwxogcybwcfwwcfqhz7xfupf4i
-  '@crossbell/indexer': 0.0.36_3up2737zphycfewdotl5getaea
-  '@crossbell/notification': 0.0.36_n76a5pm7qjubstfwdolfnupqma
-  '@crossbell/ui': 0.0.36_lfu6dyzllhynsvpgshw5adulky
-  '@crossbell/util-ethers': 0.0.36
-  '@crossbell/util-hooks': 0.0.36_fvy4j2rqepw7kac2fyeyz4vekm
-  '@crossbell/util-metadata': 0.0.36_q6tmmegh6hrzts23i2dwrq3dia
+  '@crossbell/connect-kit': 0.0.39_qeryhxsfugywljglnvhgzaq754
+  '@crossbell/contract': 0.0.39_mesmmewwopkmkl7hvhwkhlmhve
+  '@crossbell/indexer': 0.0.39_mesmmewwopkmkl7hvhwkhlmhve
+  '@crossbell/notification': 0.0.39_ogut4lnwvlvmg3jumn6qr7hh6u
+  '@crossbell/ui': 0.0.39_we4vucwqp5ltf3fmtiio25khmm
+  '@crossbell/util-hooks': 0.0.39_biqbaboplfbrettd7655fr4n2y
  '@emoji-mart/data': 1.1.2
  '@emoji-mart/react': 1.1.1_kyrnz3vmphzqyjjk2ivrm6bcsu
  '@floating-ui/react': 0.20.1_zula6vjvt3wdocc4mwcxqa6nzi
@ -1657,30 +1653,19 @@ packages:
      - utf-8-validate
    dev: false

-  /@crossbell/connect-kit/0.0.36_qdgnykv4dtwwb7gnhnidsayybi:
-    resolution: {integrity: sha512-guibt4bNosPyVbfqgO+SmX8YmB6OCOEVITEDMWuqCU85b7ZdQ9FIAmWhXv/bNCMueu558OOVvfdSo2l3LjqB/w==}
+  /@crossbell/connect-kit/0.0.39_qeryhxsfugywljglnvhgzaq754:
+    resolution: {integrity: sha512-QCc0ZrfAbP8UFXivz2A8cz0/01Z4MKJIcIBD215JSlxcllYzACx6hM+yGIEw9YWallkU4pEnR2tckIGCxFgP0w==}
    peerDependencies:
-      '@crossbell/contract': 0.0.36
-      '@crossbell/indexer': 0.0.36
-      '@crossbell/ui': 0.0.36
-      '@crossbell/util-ethers': 0.0.36
-      '@crossbell/util-hooks': 0.0.36
-      '@crossbell/util-metadata': 0.0.36
-      '@tanstack/react-query': '*'
-      '@wagmi/core': '*'
-      crossbell.js: ^0.16
-      ethers: '*'
-      immer: ^9
-      react: ^18
-      wagmi: '*'
-      zustand: ^4
+      '@tanstack/react-query': ^4.24.10
+      ethers: ^5.7.2
+      wagmi: ^0.11.7
    dependencies:
-      '@crossbell/contract': 0.0.36_kwxogcybwcfwwcfqhz7xfupf4i
-      '@crossbell/indexer': 0.0.36_3up2737zphycfewdotl5getaea
-      '@crossbell/ui': 0.0.36_lfu6dyzllhynsvpgshw5adulky
-      '@crossbell/util-ethers': 0.0.36
-      '@crossbell/util-hooks': 0.0.36_fvy4j2rqepw7kac2fyeyz4vekm
-      '@crossbell/util-metadata': 0.0.36_q6tmmegh6hrzts23i2dwrq3dia
+      '@crossbell/contract': 0.0.39_mesmmewwopkmkl7hvhwkhlmhve
+      '@crossbell/indexer': 0.0.39_mesmmewwopkmkl7hvhwkhlmhve
+      '@crossbell/ui': 0.0.39_we4vucwqp5ltf3fmtiio25khmm
+      '@crossbell/util-ethers': 0.0.39
+      '@crossbell/util-hooks': 0.0.39_biqbaboplfbrettd7655fr4n2y
+      '@crossbell/util-metadata': 0.0.39
      '@emotion/react': 11.10.6_pmekkgnqduwlme35zpnqhenc34
      '@mantine/core': 6.0.0-alpha.5_gferxjqklvavuqa4osxnpnxt5i
      '@mantine/hooks': 6.0.0-alpha.5_react@18.2.0
@ -1700,129 +1685,157 @@ packages:
      react-google-recaptcha: 2.1.0_react@18.2.0
      ts-essentials: 9.3.0_typescript@4.9.5
      wagmi: 0.11.7_osprwltll6etshz2owvseumghu
+      zustand: 4.3.3_immer@9.0.19+react@18.2.0
    transitivePeerDependencies:
      - '@types/react'
+      - bufferutil
+      - node-fetch
      - react-dom
+      - react-native
+      - supports-color
      - typescript
+      - utf-8-validate
    dev: false

-  /@crossbell/contract/0.0.36_kwxogcybwcfwwcfqhz7xfupf4i:
-    resolution: {integrity: sha512-cvDkUDjHX6udK7N7rGfO8wsb+xDzuDsWVKbBuSmLJTizLtDSmbt6Kzb8qYdh9f0er6p1sUd0JrXcpRHQDhBp4Q==}
+  /@crossbell/contract/0.0.39_mesmmewwopkmkl7hvhwkhlmhve:
+    resolution: {integrity: sha512-SbK0DHfMZ1vOhfx43ygW7pM6M8TI9B5kaF6fMEFIX3X4UMnLNOaNsI5za89uYFWCIMIKgF112kseoUZQNXQOgg==}
    peerDependencies:
-      '@crossbell/indexer': 0.0.36
-      '@crossbell/util-hooks': 0.0.36
-      crossbell.js: 0.16.x
-      ethers: 5.x.x
-      react: 18.x.x
+      ethers: ^5
+      react: ^18
      wagmi: 0.11.x
    dependencies:
-      '@crossbell/indexer': 0.0.36_3up2737zphycfewdotl5getaea
-      '@crossbell/util-hooks': 0.0.36_fvy4j2rqepw7kac2fyeyz4vekm
+      '@crossbell/indexer': 0.0.39_mesmmewwopkmkl7hvhwkhlmhve
+      '@crossbell/util-hooks': 0.0.39_biqbaboplfbrettd7655fr4n2y
      crossbell.js: 0.16.6
      react: 18.2.0
      wagmi: 0.11.7_osprwltll6etshz2owvseumghu
+    transitivePeerDependencies:
+      - bufferutil
+      - node-fetch
+      - react-dom
+      - react-native
+      - supports-color
+      - utf-8-validate
    dev: false

-  /@crossbell/indexer/0.0.36_3up2737zphycfewdotl5getaea:
-    resolution: {integrity: sha512-j80fshVDRFHFzF5olax70I/5A/+SVvZIjZKe+20FFi0qIUiVJUSSVavCb/VDg65SQPSnBA7nx3Zwbiyi+6CQZw==}
+  /@crossbell/indexer/0.0.39_mesmmewwopkmkl7hvhwkhlmhve:
+    resolution: {integrity: sha512-MtTGRjw6x9Wwa4X24D5DCFUUE+gb5c3w4xCxUcHhUUJsT+IbwmRmcBk/n+jdF+WwrmtcWxbG6ML/CFjs7KBJXg==}
    peerDependencies:
-      '@tanstack/react-query': 4.x
-      crossbell.js: 0.16.x
-      dayjs: ^1.11.6
-      ethers: 5.x
-      wagmi: 0.11.x
+      ethers: ^5
+      wagmi: ^0.11
    dependencies:
      '@tanstack/react-query': 4.24.10_biqbaboplfbrettd7655fr4n2y
      crossbell.js: 0.16.6
      dayjs: 1.11.7
      lodash.compact: 3.0.1
-      lru-cache: 7.14.0
+      lru-cache: 7.17.0
      wagmi: 0.11.7_osprwltll6etshz2owvseumghu
+    transitivePeerDependencies:
+      - bufferutil
+      - node-fetch
+      - react
+      - react-dom
+      - react-native
+      - supports-color
+      - utf-8-validate
    dev: false

-  /@crossbell/notification/0.0.36_n76a5pm7qjubstfwdolfnupqma:
-    resolution: {integrity: sha512-sx2XKHpjngqmaxpIsN0UjS6PVyZKhVziHRPP79zug2+pldiN7YiNBLXC8tuFOaMLzVGwQ65brqtgVl0boK/WFg==}
+  /@crossbell/notification/0.0.39_ogut4lnwvlvmg3jumn6qr7hh6u:
+    resolution: {integrity: sha512-Dx5IvqU4HMNxsn/AsEgBmQu1n9qP7RDCAmnOBKGxiooPhfyBpGLA0s4At96rRydPlG0QgH/uPj1BOUnBI+Dw+Q==}
    peerDependencies:
-      '@crossbell/connect-kit': 0.0.36
-      '@crossbell/indexer': 0.0.36
-      '@crossbell/ui': 0.0.36
-      '@crossbell/util-hooks': 0.0.36
-      '@crossbell/util-metadata': 0.0.36
-      dayjs: ^1.11.6
-      react: 18.x.x
-      zustand: ^4.1.5
+      react: ^18
    dependencies:
-      '@crossbell/connect-kit': 0.0.36_qdgnykv4dtwwb7gnhnidsayybi
-      '@crossbell/indexer': 0.0.36_3up2737zphycfewdotl5getaea
-      '@crossbell/ui': 0.0.36_lfu6dyzllhynsvpgshw5adulky
-      '@crossbell/util-hooks': 0.0.36_fvy4j2rqepw7kac2fyeyz4vekm
-      '@crossbell/util-metadata': 0.0.36_q6tmmegh6hrzts23i2dwrq3dia
+      '@crossbell/connect-kit': 0.0.39_qeryhxsfugywljglnvhgzaq754
+      '@crossbell/indexer': 0.0.39_mesmmewwopkmkl7hvhwkhlmhve
+      '@crossbell/ui': 0.0.39_we4vucwqp5ltf3fmtiio25khmm
+      '@crossbell/util-hooks': 0.0.39_biqbaboplfbrettd7655fr4n2y
+      '@crossbell/util-metadata': 0.0.39
      '@mantine/core': 6.0.0-alpha.5_zula6vjvt3wdocc4mwcxqa6nzi
      classnames: 2.3.2
      dayjs: 1.11.7
      react: 18.2.0
      react-intersection-observer: 9.4.3_react@18.2.0
+      zustand: 4.3.3_immer@9.0.19+react@18.2.0
    transitivePeerDependencies:
      - '@emotion/react'
      - '@mantine/hooks'
+      - '@tanstack/react-query'
      - '@types/react'
+      - bufferutil
+      - ethers
+      - immer
+      - node-fetch
      - react-dom
+      - react-native
+      - supports-color
+      - typescript
+      - utf-8-validate
+      - wagmi
    dev: false

-  /@crossbell/ui/0.0.36_lfu6dyzllhynsvpgshw5adulky:
-    resolution: {integrity: sha512-t/eKbHPFbRDdMBV+eiINuw+1mDMVe4Kjnxnr1UWhA7NuxDNjs+6qz0YSlb/MZnOX5XFj4SEYikz7s4JEdDRI8Q==}
+  /@crossbell/ui/0.0.39_we4vucwqp5ltf3fmtiio25khmm:
+    resolution: {integrity: sha512-J4v93tpLNXR3wED5pZkZDXQ2vbWMSo4bTA9ziAse7xFnk6mXx7/7zooVE8uCYmxvCYRVBZ8RXjrZuGapjmcJWQ==}
    peerDependencies:
-      '@crossbell/indexer': 0.0.36
-      '@crossbell/util-hooks': 0.0.36
-      '@crossbell/util-metadata': 0.0.36
-      '@tanstack/react-query': '*'
-      crossbell.js: ^0.16
-      react: 18.x.x
-      react-dom: 18.x.x
+      react: ^18
+      react-dom: ^18
    dependencies:
-      '@crossbell/indexer': 0.0.36_3up2737zphycfewdotl5getaea
-      '@crossbell/util-hooks': 0.0.36_fvy4j2rqepw7kac2fyeyz4vekm
-      '@crossbell/util-metadata': 0.0.36_q6tmmegh6hrzts23i2dwrq3dia
+      '@crossbell/indexer': 0.0.39_mesmmewwopkmkl7hvhwkhlmhve
+      '@crossbell/util-hooks': 0.0.39_biqbaboplfbrettd7655fr4n2y
+      '@crossbell/util-metadata': 0.0.39
      '@tanstack/react-query': 4.24.10_biqbaboplfbrettd7655fr4n2y
      classnames: 2.3.2
      crossbell.js: 0.16.6
      facepaint: 1.2.1
      react: 18.2.0
      react-dom: 18.2.0_react@18.2.0
-      react-intersection-observer: 9.4.1_react@18.2.0
+      react-intersection-observer: 9.4.3_react@18.2.0
      react-remove-scroll: 2.5.5_pmekkgnqduwlme35zpnqhenc34
      react-transition-group: 4.4.5_biqbaboplfbrettd7655fr4n2y
      ts-essentials: 9.3.0_typescript@4.9.5
    transitivePeerDependencies:
      - '@types/react'
+      - bufferutil
+      - ethers
+      - node-fetch
+      - react-native
+      - supports-color
      - typescript
+      - utf-8-validate
+      - wagmi
    dev: false

-  /@crossbell/util-ethers/0.0.36:
-    resolution: {integrity: sha512-tXfDz3IjWJdVG8kA9GKZ4Oq+zW5XEdjco52CMYrHXqbVnq9sPuD714/wSAwnlj1SHSv9KLTlC9bQkMXCAJGMFA==}
+  /@crossbell/util-ethers/0.0.39:
+    resolution: {integrity: sha512-QNEMADqrFzVqaVZ2c99glqNnz5ng5TEMCkPCo2ytT3cR2MZaKO37mjrqWNgUm3k1OuXhEigF1NlOAlf+wNeL+Q==}
    dev: false

-  /@crossbell/util-hooks/0.0.36_fvy4j2rqepw7kac2fyeyz4vekm:
-    resolution: {integrity: sha512-8ov/ZiTo9wsTalgGX+dYx7oTPeFcbL7dQ4FiDf3QKGHUDWLKaqTYPocz8Dpg2ZusHl/wwsPxN+vlqRt82wfrCw==}
+  /@crossbell/util-hooks/0.0.39_biqbaboplfbrettd7655fr4n2y:
+    resolution: {integrity: sha512-DoIS4IY+nN1l6/k9F7oI7DY5oMVbz8XoKiEJAnbwwPmK0kQuu4rZXgvTZyg3/5fUpjMWPUNahyAVdRAe8O464Q==}
    peerDependencies:
-      '@tanstack/react-query': '*'
-      crossbell.js: ^0.16
-      react: 18.x.x
+      react: ^18
    dependencies:
      '@tanstack/react-query': 4.24.10_biqbaboplfbrettd7655fr4n2y
      crossbell.js: 0.16.6
      react: 18.2.0
+    transitivePeerDependencies:
+      - bufferutil
+      - node-fetch
+      - react-dom
+      - react-native
+      - supports-color
+      - utf-8-validate
    dev: false

-  /@crossbell/util-metadata/0.0.36_q6tmmegh6hrzts23i2dwrq3dia:
-    resolution: {integrity: sha512-WMVjZ5M70Az/LMuLfPEb/AqogcOboY5gvxdntAS0N04QK63OUowSO9/9OskZgw7oQFYuY02P4gDl+3DPTCW2PQ==}
-    peerDependencies:
-      '@crossbell/util-ethers': 0.0.36
-      crossbell.js: 0.16.x
+  /@crossbell/util-metadata/0.0.39:
+    resolution: {integrity: sha512-eEBxpLMQv+fbzD9YLPClv5q4lJS2OTC740XXHNjz51ZnC2Opa373ePpQkB25+0sUnmKKzmyUGoP5FgFgKeGUxQ==}
    dependencies:
-      '@crossbell/util-ethers': 0.0.36
-      '@fastify/deepmerge': 1.1.0
+      '@crossbell/util-ethers': 0.0.39
+      '@fastify/deepmerge': 1.3.0
      crossbell.js: 0.16.6
+    transitivePeerDependencies:
+      - bufferutil
+      - node-fetch
+      - supports-color
+      - utf-8-validate
    dev: false

  /@cspotcode/source-map-support/0.8.1:
@ -2668,8 +2681,8 @@ packages:
      '@ethersproject/strings': 5.7.0
    dev: false

-  /@fastify/deepmerge/1.1.0:
-    resolution: {integrity: sha512-E8Hfdvs1bG6u0N4vN5Nty6JONUfTdOciyD5rn8KnEsLKIenvOVcr210BQR9t34PRkNyjqnMLGk3e0BsaxRdL+g==}
+  /@fastify/deepmerge/1.3.0:
+    resolution: {integrity: sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==}
    dev: false

  /@floating-ui/core/1.2.2:
@ -9277,8 +9290,8 @@ packages:
    dependencies:
      yallist: 4.0.0

-  /lru-cache/7.14.0:
-    resolution: {integrity: sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==}
+  /lru-cache/7.17.0:
+    resolution: {integrity: sha512-zSxlVVwOabhVyTi6E8gYv2cr6bXK+8ifYz5/uyJb9feXX6NACVDwY4p5Ut3WC3Ivo/QhpARHU3iujx2xGAYHbQ==}
    engines: {node: '>=12'}
    dev: false

@ -11198,14 +11211,6 @@ packages:
      react: 18.2.0
    dev: false

-  /react-intersection-observer/9.4.1_react@18.2.0:
-    resolution: {integrity: sha512-IXpIsPe6BleFOEHKzKh5UjwRUaz/JYS0lT/HPsupWEQou2hDqjhLMStc5zyE3eQVT4Fk3FufM8Fw33qW1uyeiw==}
-    peerDependencies:
-      react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      react: 18.2.0
-    dev: false
-
  /react-intersection-observer/9.4.3_react@18.2.0:
    resolution: {integrity: sha512-WNRqMQvKpupr6MzecAQI0Pj0+JQong307knLP4g/nBex7kYfIaZsPpXaIhKHR+oV8z+goUbH9e10j6lGRnTzlQ==}
    peerDependencies:
--- a/src/components/common/ConnectButton.tsx
+++ b/src/components/common/ConnectButton.tsx
@ -8,6 +8,7 @@ import {
  useOpSignSettingsModal,
  useUpgradeAccountModal,
  useSelectCharactersModal,
+  useAccountBalance,
 } from "@crossbell/connect-kit"
 import { useAccountSites } from "~/queries/site"
 import { Avatar } from "~/components/ui/Avatar"
@ -34,7 +35,6 @@ import {
  useShowNotificationModal,
  useNotifications,
 } from "@crossbell/notification"
-import { useAccountBalance } from "~/hooks/use-account-balance"
 import { Menu } from "~/components/ui/Menu"
 import { useTranslation } from "next-i18next"

--- a/src/hooks/use-account-balance.ts
+++ b/src/hooks/use-account-balance.ts
@ -1,22 +0,0 @@
-import { useBalance } from "wagmi"
-import {
-  useAccountState,
-  useAccountBalance as _useAccountBalance,
-} from "@crossbell/connect-kit"
-
-export function useAccountBalance(): ReturnType<typeof _useAccountBalance> {
-  const account = useAccountState((s) => s.computed.account)
-  const walletBalance = useBalance({
-    address: account?.address as `0x${string}` | undefined,
-  })
-  const accountBalance = _useAccountBalance()
-
-  if (account?.type === "email") {
-    return accountBalance
-  } else {
-    return {
-      balance: walletBalance.data,
-      isLoading: walletBalance.isLoading,
-    }
-  }
-}
--- a/src/hooks/useUserRole.ts
+++ b/src/hooks/useUserRole.ts
@ -1,4 +1,3 @@
-import { useAccountBalance as _useAccountBalance } from "@crossbell/connect-kit"
 import { useAccountSites } from "~/queries/site"
 import { useGetSite, useIsOperators } from "~/queries/site"
 import { useAccountState } from "@crossbell/connect-kit"
--- a/src/lib/wallet-config.ts
+++ b/src/lib/wallet-config.ts
@ -1,55 +0,0 @@
-import { configureChains } from "wagmi"
-import { crossbell } from "wagmi/chains"
-import { jsonRpcProvider } from "wagmi/providers/jsonRpc"
-import { MetaMaskConnector } from "wagmi/connectors/metaMask"
-import { WalletConnectConnector } from "wagmi/connectors/walletConnect"
-import { CoinbaseWalletConnector } from "wagmi/connectors/coinbaseWallet"
-import { InjectedConnector } from "wagmi/connectors/injected"
-
-import { APP_NAME } from "~/lib/env"
-
-export const { chains, provider } = configureChains(
-  [crossbell],
-  [
-    jsonRpcProvider({
-      rpc: () => ({ http: crossbell.rpcUrls.default.http[0] }),
-    }),
-  ],
-  { pollingInterval: 1000 },
-)
-
-export const connectors = [
-  new InjectedConnector({
-    chains,
-    options: {
-      shimDisconnect: true,
-      name: (detectedName) =>
-        `Injected (${
-          typeof detectedName === "string"
-            ? detectedName
-            : detectedName.join(", ")
-        })`,
-    },
-  }),
-  new MetaMaskConnector({
-    chains,
-    options: {
-      shimDisconnect: true,
-      shimChainChangedDisconnect: false,
-      UNSTABLE_shimOnConnectSelectAccount: true,
-    },
-  }),
-  new CoinbaseWalletConnector({
-    chains,
-    options: {
-      appName: APP_NAME,
-      headlessMode: true,
-    },
-  }),
-  new WalletConnectConnector({
-    chains,
-    options: {
-      qrcode: false,
-    },
-  }),
-]
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@ -6,26 +6,23 @@ import { createClient, WagmiConfig } from "wagmi"
 import { Hydrate, QueryClient } from "@tanstack/react-query"
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
 import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client"
-import { ConnectKitProvider, contractConfig } from "@crossbell/connect-kit"
+import {
+  ConnectKitProvider,
+  getDefaultClientConfig,
+} from "@crossbell/connect-kit"
 import { NotificationModal } from "@crossbell/notification"
-import { InitContractProvider } from "@crossbell/contract"
 import NextNProgress from "nextjs-progressbar"
 import { Network } from "crossbell.js"
 import { appWithTranslation } from "next-i18next"

-import { IPFS_GATEWAY } from "~/lib/env"
+import { APP_NAME, IPFS_GATEWAY } from "~/lib/env"
 import { toGateway } from "~/lib/ipfs-parser"
-import { connectors, provider } from "~/lib/wallet-config"
 import { createIDBPersister } from "~/lib/persister.client"
 import { urlComposer } from "~/lib/url-composer"

 Network.setIpfsGateway(IPFS_GATEWAY)

-const wagmiClient = createClient({
-  autoConnect: true,
-  connectors,
-  provider,
-})
+const wagmiClient = createClient(getDefaultClientConfig({ appName: APP_NAME }))

 const queryClient = new QueryClient({
  defaultOptions: {
@ -46,22 +43,20 @@ function MyApp({ Component, pageProps }: any) {
        client={queryClient}
        persistOptions={{ persister }}
      >
-        <InitContractProvider {...contractConfig}>
-          <ConnectKitProvider
-            ipfsLinkToHttpLink={toGateway}
-            urlComposer={urlComposer}
-          >
-            <Hydrate state={pageProps.dehydratedState}>
-              {/* <ReactQueryDevtools /> */}
-              <NextNProgress
-                options={{ easing: "linear", speed: 500, trickleSpeed: 100 }}
-              />
-              {getLayout(<Component {...pageProps} />)}
-              <Toaster />
-              <NotificationModal />
-            </Hydrate>
-          </ConnectKitProvider>
-        </InitContractProvider>
+        <ConnectKitProvider
+          ipfsLinkToHttpLink={toGateway}
+          urlComposer={urlComposer}
+        >
+          <Hydrate state={pageProps.dehydratedState}>
+            {/* <ReactQueryDevtools /> */}
+            <NextNProgress
+              options={{ easing: "linear", speed: 500, trickleSpeed: 100 }}
+            />
+            {getLayout(<Component {...pageProps} />)}
+            <Toaster />
+            <NotificationModal />
+          </Hydrate>
+        </ConnectKitProvider>
      </PersistQueryClientProvider>
    </WagmiConfig>
  )