fix: Deduplicate EIP6963 wallets from connectors (#1691)

apps/gallery/package.json

@@ -12,15 +12,15 @@
     "@web3modal/common": "3.5.3",
     "@web3modal/ui": "3.5.3",
     "lit": "3.1.0",
-    "storybook": "7.6.6"
+    "storybook": "7.6.7"
   },
   "devDependencies": {
-    "@storybook/addon-essentials": "7.6.6",
-    "@storybook/addon-links": "7.6.6",
-    "@storybook/blocks": "7.6.6",
-    "@storybook/theming": "7.6.6",
-    "@storybook/web-components": "7.6.6",
-    "@storybook/web-components-vite": "7.6.6",
+    "@storybook/addon-essentials": "7.6.7",
+    "@storybook/addon-links": "7.6.7",
+    "@storybook/blocks": "7.6.7",
+    "@storybook/theming": "7.6.7",
+    "@storybook/web-components": "7.6.7",
+    "@storybook/web-components-vite": "7.6.7",
     "file-system-cache": "2.4.4"
   }
 }

apps/laboratory/package.json

@@ -13,10 +13,10 @@
   },
   "dependencies": {
     "@chakra-ui/react": "2.8.2",
-    "@emotion/react": "11.11.1",
+    "@emotion/react": "11.11.3",
     "@emotion/styled": "11.11.0",
-    "@sentry/browser": "7.89.0",
-    "@sentry/react": "7.89.0",
+    "@sentry/browser": "7.91.0",
+    "@sentry/react": "7.91.0",
     "@web3modal/ethers": "3.5.3",
     "@web3modal/ethers5": "3.5.3",
     "@web3modal/wagmi": "3.5.3",

examples/vue-ethers5/package.json

@@ -11,6 +11,6 @@
     "ethers": "5.7.2"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "4.5.2"
+    "@vitejs/plugin-vue": "5.0.2"
   }
 }

examples/vue-wagmi/package.json

@@ -10,6 +10,6 @@
     "@web3modal/wagmi": "3.5.3"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "4.5.2"
+    "@vitejs/plugin-vue": "5.0.2"
   }
 }

package.json

@@ -45,10 +45,10 @@
     "examples/*"
   ],
   "devDependencies": {
-    "@types/react": "18.2.45",
+    "@types/react": "18.2.46",
     "@types/react-dom": "18.2.18",
-    "@typescript-eslint/eslint-plugin": "6.15.0",
-    "@typescript-eslint/parser": "6.15.0",
+    "@typescript-eslint/eslint-plugin": "6.17.0",
+    "@typescript-eslint/parser": "6.17.0",
     "danger": "11.3.1",
     "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
@@ -59,10 +59,10 @@
     "react-dom": "18.2.0",
     "turbo": "1.11.2",
     "typescript": "5.3.3",
-    "viem": "1.20.3",
+    "viem": "1.21.4",
     "vite": "5.0.10",
-    "vitest": "1.1.0",
-    "vue": "3.3.13",
+    "vitest": "1.1.1",
+    "vue": "3.4.3",
     "wagmi": "1.4.12"
   }
 }

packages/core/src/controllers/ConnectorController.ts

@@ -34,6 +34,10 @@ export const ConnectorController = {
     return state.connectors.find(c => c.type === 'EMAIL') as EmailConnector | undefined
   },
 
+  getAnnouncedConnectorRdns() {
+    return state.connectors.filter(c => c.type === 'ANNOUNCED').map(c => c.info?.rdns)
+  },
+
   getConnectors() {
     return state.connectors
   }

packages/core/src/utils/ConstantsUtil.ts

@@ -24,5 +24,9 @@ export const ConstantsUtil = {
     'ASIA/MACAO',
     'ASIA/BEIJING',
     'ASIA/HARBIN'
-  ]
+  ],
+
+  CONNECTOR_RDNS_MAP: {
+    coinbaseWallet: 'com.coinbase.wallet'
+  } as Record<string, string>
 }

packages/ethers/package.json

@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "3.7.2",
-    "@walletconnect/ethereum-provider": "2.10.6",
+    "@walletconnect/ethereum-provider": "2.11.0",
     "@web3modal/polyfills": "3.5.3",
     "@web3modal/scaffold": "3.5.3",
     "@web3modal/scaffold-react": "3.5.3",

packages/ethers5/package.json

@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "3.7.2",
-    "@walletconnect/ethereum-provider": "2.10.6",
+    "@walletconnect/ethereum-provider": "2.11.0",
     "@web3modal/polyfills": "3.5.3",
     "@web3modal/scaffold": "3.5.3",
     "@web3modal/scaffold-react": "3.5.3",

packages/scaffold/src/views/w3m-connect-view/index.ts

@@ -8,7 +8,8 @@ import {
   EventsController,
   OptionsController,
   RouterController,
-  StorageUtil
+  StorageUtil,
+  ConstantsUtil
 } from '@web3modal/core'
 import { customElement } from '@web3modal/ui'
 import { LitElement, html } from 'lit'
@@ -147,7 +148,7 @@ export class W3mConnectView extends LitElement {
           name=${connector.name ?? 'Unknown'}
           @click=${() => this.onConnector(connector)}
           tagVariant="success"
-          installed=${true}
+          .installed=${true}
         >
         </wui-list-wallet>
       `
@@ -169,7 +170,7 @@ export class W3mConnectView extends LitElement {
       return html`
         <wui-list-wallet
           imageSrc=${ifDefined(AssetUtil.getConnectorImage(connector))}
-          installed=${Boolean(announced)}
+          .installed=${Boolean(announced)}
           name=${connector.name ?? 'Unknown'}
           @click=${() => this.onConnector(connector)}
         >
@@ -179,11 +180,17 @@ export class W3mConnectView extends LitElement {
   }
 
   private connectorsTemplate() {
+    const announcedRdns = ConnectorController.getAnnouncedConnectorRdns()
+
     return this.connectors.map(connector => {
       if (['WALLET_CONNECT', 'INJECTED', 'ANNOUNCED', 'EMAIL'].includes(connector.type)) {
         return null
       }
 
+      if (announcedRdns.includes(ConstantsUtil.CONNECTOR_RDNS_MAP[connector.id])) {
+        return null
+      }
+
       return html`
         <wui-list-wallet
           imageSrc=${ifDefined(AssetUtil.getConnectorImage(connector))}