Merge branch 'fix/approved-caip-networks-data-upa' of github.com:Wall…

…etConnect/web3modal into fix/approved-caip-networks-data-upa
reown-com · Sep 19, 2024 · 9b0c8fa · 9b0c8fa
2 parents 959d0fe + 2b9b166
commit 9b0c8fa
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/apps/laboratory/tests/multichain/multichain-wagmi-solana.spec.ts b/apps/laboratory/tests/multichain/multichain-wagmi-solana.spec.ts
@@ -58,7 +58,6 @@ test('it should switch networks and sign', async () => {
 
     const chainName = chains[index] ?? DEFAULT_CHAIN_NAME
     await modalPage.switchNetwork(chainName)
-    await modalValidator.expectSwitchedNetwork(chainName)
     await modalPage.closeModal()
 
     // -- Sign ------------------------------------------------------------------
@@ -78,7 +77,6 @@ test('it should switch between multiple accounts', async () => {
   const chainName = 'Ethereum'
   await modalPage.switchNetwork(chainName)
   await modalPage.page.waitForTimeout(500)
-  await modalValidator.expectSwitchedNetwork(chainName)
   await modalPage.closeModal()
   const originalAddress = await modalPage.getAddress()
   await modalPage.openAccount()

diff --git a/packages/scaffold-ui/src/partials/w3m-all-wallets-widget/index.ts b/packages/scaffold-ui/src/partials/w3m-all-wallets-widget/index.ts
@@ -33,7 +33,7 @@ export class W3mAllWalletsWidget extends LitElement {
 
   // -- Render -------------------------------------------- //
   public override render() {
-    const wcConnector = this.connectors.find(c => c.type === 'WALLET_CONNECT')
+    const wcConnector = this.connectors.find(c => c.id === 'walletConnect')
     const { allWallets } = OptionsController.state
 
     if (!wcConnector || allWallets === 'HIDE') {

diff --git a/packages/scaffold-ui/src/partials/w3m-connect-announced-widget/index.ts b/packages/scaffold-ui/src/partials/w3m-connect-announced-widget/index.ts
@@ -68,7 +68,7 @@ export class W3mConnectAnnouncedWidget extends LitElement {
 
   // -- Private Methods ----------------------------------- //
   private onConnector(connector: Connector) {
-    if (connector.type === 'WALLET_CONNECT') {
+    if (connector.id === 'walletConnect') {
       if (CoreHelperUtil.isMobile()) {
         RouterController.push('AllWallets')
       } else {

diff --git a/packages/scaffold-ui/src/partials/w3m-connect-recommended-widget/index.ts b/packages/scaffold-ui/src/partials/w3m-connect-recommended-widget/index.ts
@@ -34,7 +34,7 @@ export class W3mConnectRecommendedWidget extends LitElement {
 
   // -- Render -------------------------------------------- //
   public override render() {
-    const connector = this.connectors.find(c => c.type === 'WALLET_CONNECT')
+    const connector = this.connectors.find(c => c.id === 'walletConnect')
     if (!connector) {
       return null
     }

diff --git a/packages/scaffold-ui/src/partials/w3m-connect-walletconnect-widget/index.ts b/packages/scaffold-ui/src/partials/w3m-connect-walletconnect-widget/index.ts
@@ -38,7 +38,7 @@ export class W3mConnectWalletConnectWidget extends LitElement {
       return null
     }
 
-    const connector = this.connectors.find(c => c.type === 'WALLET_CONNECT')
+    const connector = this.connectors.find(c => c.id === 'walletConnect')
 
     if (!connector) {
       this.style.cssText = `display: none`

diff --git a/packages/scaffold-ui/src/partials/w3m-connector-list/index.ts b/packages/scaffold-ui/src/partials/w3m-connector-list/index.ts
@@ -37,6 +37,7 @@ export class W3mConnectorList extends LitElement {
   public override render() {
     const { custom, recent, announced, injected, multiChain, recommended, featured, external } =
       this.getConnectorsByType()
+
     const enableWalletConnect = OptionsController.state.enableWalletConnect
 
     return html`

diff --git a/packages/scaffold-ui/src/partials/w3m-social-login-widget/index.ts b/packages/scaffold-ui/src/partials/w3m-social-login-widget/index.ts
@@ -149,7 +149,7 @@ export class W3mSocialLoginWidget extends LitElement {
   }
 
   private separatorTemplate() {
-    const walletConnectConnector = this.connectors.find(c => c.type === 'WALLET_CONNECT')
+    const walletConnectConnector = this.connectors.find(c => c.id === 'walletConnect')
     const enableWallets = OptionsController.state.enableWallets
 
     if (walletConnectConnector && enableWallets) {

diff --git a/packages/scaffold-ui/src/views/w3m-connecting-multi-chain-view/index.ts b/packages/scaffold-ui/src/views/w3m-connecting-multi-chain-view/index.ts
@@ -101,7 +101,7 @@ export class W3mConnectingMultiChainView extends LitElement {
       return
     }
 
-    if (connector.type === 'WALLET_CONNECT') {
+    if (connector.id === 'walletConnect') {
       if (CoreHelperUtil.isMobile()) {
         RouterController.push('AllWallets')
       } else {