fix: v5 remove names flow for solana (#2973)

Co-authored-by: tomiir <[email protected]>
reown-com · Oct 2, 2024 · a9d6860 · a9d6860
1 parent 63d4e2d
commit a9d6860
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/packages/core/src/controllers/NetworkController.ts b/packages/core/src/controllers/NetworkController.ts
@@ -7,6 +7,7 @@ import { NetworkUtil, type Chain } from '@web3modal/common'
 import { ChainController } from './ChainController.js'
 import { PublicStateController } from './PublicStateController.js'
 import { ConstantsUtil } from '../utils/ConstantsUtil.js'
+import { ConstantsUtil as CommonConstantsUtil } from '@web3modal/common'
 
 // -- Types --------------------------------------------- //
 export interface NetworkControllerClient {
@@ -285,6 +286,19 @@ export const NetworkController = {
     return Boolean(smartAccountEnabledNetworks?.includes(networkId))
   },
 
+  checkIfNamesSupported() {
+    const chain = ChainController.state.activeChain
+
+    if (!chain) {
+      return false
+    }
+
+    const activeCaipNetwork = ChainController.state.chains.get(chain)?.networkState?.caipNetwork
+
+    // Names are only supported on EVM networks
+    return activeCaipNetwork?.chain === CommonConstantsUtil.CHAIN.EVM
+  },
+
   resetNetwork() {
     const chain = ChainController.state.activeChain
 

diff --git a/packages/core/tests/controllers/NetworkController.test.ts b/packages/core/tests/controllers/NetworkController.test.ts
@@ -122,6 +122,16 @@ describe('NetworkController', () => {
       'solana:mainnet:So11111111111111111111111111111111111111111'
     )
 
-    mock.mockClear()
+    mock.mockRestore()
+  })
+
+  it('should check if network supports names feature', () => {
+    expect(NetworkController.checkIfNamesSupported()).toEqual(true)
+    NetworkController.setActiveCaipNetwork({
+      id: 'solana:mainnet',
+      name: 'Solana',
+      chain: ConstantsUtil.CHAIN.SOLANA
+    })
+    expect(NetworkController.checkIfNamesSupported()).toEqual(false)
   })
 })
diff --git a/packages/scaffold-ui/src/views/w3m-account-settings-view/index.ts b/packages/scaffold-ui/src/views/w3m-account-settings-view/index.ts
@@ -162,7 +162,8 @@ export class W3mAccountSettingsView extends LitElement {
   private chooseNameButtonTemplate() {
     const type = StorageUtil.getConnectedConnector()
     const authConnector = ConnectorController.getAuthConnector()
-    if (!authConnector || type !== 'AUTH' || this.profileName) {
+    const hasNetworkSupport = NetworkController.checkIfNamesSupported()
+    if (!hasNetworkSupport || !authConnector || type !== 'AUTH' || this.profileName) {
       return null
     }