fix wallet list

apps/laboratory/src/pages/library/ethers.tsx

@@ -16,16 +16,7 @@ const modal = createWeb3Modal({
   enableAnalytics: true,
   metadata: ConstantsUtil.Metadata,
   termsConditionsUrl: 'https://walletconnect.com/terms',
-  privacyPolicyUrl: 'https://walletconnect.com/privacy',
-  customWallets: [
-    {
-      id: 'react-wallet-v2',
-      name: 'react-wallet-v2',
-      homepage: 'https://react-wallet-v2-git-chore-2111-walletconnect1.vercel.app',
-      mobile_link: 'https://react-wallet.walletconnect.com',
-      desktop_link: 'https://react-wallet.walletconnect.com'
-    }
-  ]
+  privacyPolicyUrl: 'https://walletconnect.com/privacy'
 })
 
 ThemeStore.setModal(modal)

apps/laboratory/src/pages/library/wagmi.tsx

@@ -23,17 +23,7 @@ const modal = createWeb3Modal({
   enableAnalytics: true,
   metadata: ConstantsUtil.Metadata,
   termsConditionsUrl: 'https://walletconnect.com/terms',
-  privacyPolicyUrl: 'https://walletconnect.com/privacy',
-  customWallets: [
-    {
-      id: 'react-wallet-v2',
-      name: 'react-wallet-v2',
-      homepage: 'https://react-wallet-v2-git-chore-2111-walletconnect1.vercel.app',
-      mobile_link: 'https://react-wallet.walletconnect.com',
-      desktop_link: 'https://react-wallet.walletconnect.com',
-      webapp_link: 'https://react-wallet.walletconnect.com'
-    }
-  ]
+  privacyPolicyUrl: 'https://walletconnect.com/privacy'
 })
 
 ThemeStore.setModal(modal)

packages/core/src/controllers/ConnectorController.ts

@@ -45,10 +45,6 @@ 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/ethers/src/client.ts

@@ -1053,7 +1053,7 @@ export class Web3Modal extends Web3ModalScaffold {
       const connectors = this.getConnectors()
       const existingConnector = connectors.find(c => c.name === info.name)
       if (!existingConnector) {
-        const type = PresetsUtil.ConnectorTypesMap[ConstantsUtil.EIP6963_CONNECTOR_ID]
+        const type = PresetsUtil.ConnectorTypesMap[ConstantsUtil.INJECTED_CONNECTOR_ID]
         if (type) {
           this.addConnector({
             id: ConstantsUtil.EIP6963_CONNECTOR_ID,

packages/ethers5/src/client.ts

@@ -950,7 +950,7 @@ export class Web3Modal extends Web3ModalScaffold {
       const connectors = this.getConnectors()
       const existingConnector = connectors.find(c => c.name === info.name)
       if (!existingConnector) {
-        const type = PresetsUtil.ConnectorTypesMap[ConstantsUtil.EIP6963_CONNECTOR_ID]
+        const type = PresetsUtil.ConnectorTypesMap[ConstantsUtil.INJECTED_CONNECTOR_ID]
         if (type) {
           this.addConnector({
             id: ConstantsUtil.EIP6963_CONNECTOR_ID,

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

@@ -44,10 +44,9 @@ export class W3mConnectView extends LitElement {
       <wui-flex flexDirection="column" padding="s" gap="xs">
         <w3m-email-login-widget></w3m-email-login-widget>
 
-        ${this.walletConnectConnectorTemplate()} ${this.recentTemplate()}
-        ${this.announcedTemplate()} ${this.injectedTemplate()} ${this.featuredTemplate()}
-        ${this.customTemplate()} ${this.recommendedTemplate()} ${this.externalTemplate()}
-        ${this.allWalletsTemplate()}
+        ${this.walletConnectConnectorTemplate()} ${this.recentTemplate()} ${this.injectedTemplate()}
+        ${this.featuredTemplate()} ${this.customTemplate()} ${this.recommendedTemplate()}
+        ${this.externalTemplate()} ${this.allWalletsTemplate()}
       </wui-flex>
       <w3m-legal-footer></w3m-legal-footer>
     `
@@ -82,6 +81,7 @@ export class W3mConnectView extends LitElement {
     if (!customWallets?.length) {
       return null
     }
+
     const wallets = this.filterOutDuplicateWallets(customWallets)
 
     return wallets.map(
@@ -136,25 +136,6 @@ export class W3mConnectView extends LitElement {
     )
   }
 
-  private announcedTemplate() {
-    return this.connectors.map(connector => {
-      if (connector.type !== 'ANNOUNCED') {
-        return null
-      }
-
-      return html`
-        <wui-list-wallet
-          imageSrc=${ifDefined(AssetUtil.getConnectorImage(connector))}
-          name=${connector.name ?? 'Unknown'}
-          @click=${() => this.onConnector(connector)}
-          tagVariant="success"
-          .installed=${true}
-        >
-        </wui-list-wallet>
-      `
-    })
-  }
-
   private injectedTemplate() {
     return this.connectors.map(connector => {
       if (connector.type !== 'INJECTED') {
@@ -178,17 +159,11 @@ export class W3mConnectView extends LitElement {
   }
 
   private externalTemplate() {
-    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))}
@@ -241,15 +216,16 @@ export class W3mConnectView extends LitElement {
     const { connectors } = ConnectorController.state
     const recent = StorageUtil.getRecentWallets()
     const injected = connectors.filter(c => c.type === 'INJECTED')
-    const eip6963 = connectors.filter(c => c.type === 'ANNOUNCED')
+    const filteredInjected = injected.filter(i => i.name !== 'Browser Wallet')
+
     if (featuredWalletIds || customWallets || !recommended.length) {
       return null
     }
 
-    // EIP6963 wallets are no longer serialized as ANNOUNCED in wagmiv2.
-    const eip6963Amount = eip6963.length || Math.max(0, injected.length - 1)
-    const overrideLength = eip6963Amount + recent.length
+    const overrideLength = filteredInjected.length + recent.length
+
     const maxRecommended = Math.max(0, 2 - overrideLength)
+
     const wallets = this.filterOutDuplicateWallets(recommended).slice(0, maxRecommended)
 
     return wallets.map(
@@ -281,10 +257,9 @@ export class W3mConnectView extends LitElement {
     const { connectors } = ConnectorController.state
     const recent = StorageUtil.getRecentWallets()
     const recentIds = recent.map(wallet => wallet.id)
+    const rdnsIds = connectors.map(c => c.info?.rdns).filter(Boolean)
     const filtered = wallets.filter(
-      wallet =>
-        !recentIds.includes(wallet.id) &&
-        !connectors.find(c => c.id === wallet.rdns || c?.info?.rdns === wallet.rdns)
+      wallet => !recentIds.includes(wallet.id) && !rdnsIds.includes(wallet.rdns ?? undefined)
     )
 
     return filtered

packages/wagmi/src/client.ts

@@ -333,16 +333,21 @@ export class Web3Modal extends Web3ModalScaffold {
   private syncConnectors(
     connectors: Web3ModalClientOptions<CoreConfig>['wagmiConfig']['connectors']
   ) {
+    const uniqueIds = new Set()
+    const filteredConnectors = connectors.filter(
+      item => !uniqueIds.has(item.id) && uniqueIds.add(item.id)
+    )
+
     const w3mConnectors: Connector[] = []
 
     const coinbaseSDKId = ConstantsUtil.COINBASE_SDK_CONNECTOR_ID
 
     // Check if coinbase injected connector is present
-    const coinbaseConnector = connectors.find(
+    const coinbaseConnector = filteredConnectors.find(
       c => c.id === CoreConstants.CONNECTOR_RDNS_MAP[coinbaseSDKId]
     )
 
-    connectors.forEach(({ id, name, type, icon }) => {
+    filteredConnectors.forEach(({ id, name, type, icon }) => {
       // If coinbase injected connector is present, skip coinbase sdk connector.
       const shouldSkip =
         (coinbaseConnector && id === coinbaseSDKId) || ConstantsUtil.EMAIL_CONNECTOR_ID === id
@@ -358,7 +363,7 @@ export class Web3Modal extends Web3ModalScaffold {
       }
     })
     this.setConnectors(w3mConnectors)
-    this.syncEmailConnector(connectors)
+    this.syncEmailConnector(filteredConnectors)
   }
 
   private async syncEmailConnector(