Fix lint issues and improve network validation

Co-Authored-By: nacho@reown.com <nacho@reown.com>

Author: devin-ai-integration[bot]

packages/core/src/__tests__/controllers/NetworkController.test.ts

@@ -77,10 +77,10 @@ describe('NetworkController', () => {
 
   it('should validate if active network is in requested networks', () => {
     NetworkController.setRequestedCaipNetworks(requestedCaipNetworks);
-    
+
     NetworkController.setCaipNetwork({ id: 'eip155:1', name: 'Ethereum' });
     expect(NetworkController.isActiveNetworkInRequestedNetworks()).toBe(true);
-    
+
     NetworkController.setCaipNetwork({ id: 'eip155:99', name: 'Unknown Network' });
     expect(NetworkController.isActiveNetworkInRequestedNetworks()).toBe(false);
   });

packages/core/src/controllers/NetworkController.ts

@@ -122,7 +122,7 @@ export const NetworkController = {
     if (!state.caipNetwork || !state.requestedCaipNetworks?.length) {
       return true; // No active network or no requested networks, so no validation needed
     }
-    
+
     return state.requestedCaipNetworks.some(network => network.id === state.caipNetwork?.id);
   }
 };

packages/scaffold/src/modal/w3m-network-button/index.tsx

@@ -17,16 +17,18 @@ export interface NetworkButtonProps {
 }
 
 export function NetworkButton({ disabled, style }: NetworkButtonProps) {
-  const { isConnected } = useSnapshot(AccountController.state);
-  const { caipNetwork, requestedCaipNetworks } = useSnapshot(NetworkController.state);
   const { loading } = useSnapshot(ModalController.state);
   const { themeMode, themeVariables } = useSnapshot(ThemeController.state);
-  
-  const isNetworkSupported = !caipNetwork || !requestedCaipNetworks?.length || 
-                            requestedCaipNetworks.some(network => network.id === caipNetwork.id);
+
+  const isNetworkSupported =
+    !NetworkController.state.caipNetwork ||
+    !NetworkController.state.requestedCaipNetworks?.length ||
+    NetworkController.state.requestedCaipNetworks.some(
+      network => network.id === NetworkController.state.caipNetwork?.id
+    );
 
   const onNetworkPress = () => {
-    if (isConnected && !isNetworkSupported) {
+    if (AccountController.state.isConnected && !isNetworkSupported) {
       ModalController.open({ view: 'UnsupportedChain' });
     } else {
       ModalController.open({ view: 'Networks' });
@@ -40,15 +42,20 @@ export function NetworkButton({ disabled, style }: NetworkButtonProps) {
   return (
     <ThemeProvider themeMode={themeMode} themeVariables={themeVariables}>
       <NetworkButtonUI
-        imageSrc={AssetUtil.getNetworkImage(caipNetwork)}
+        imageSrc={AssetUtil.getNetworkImage(NetworkController.state.caipNetwork)}
         imageHeaders={ApiController._getApiHeaders()}
         disabled={disabled || loading}
         style={style}
         onPress={onNetworkPress}
         loading={loading}
         testID="network-button"
       >
-        {caipNetwork?.name ?? (isConnected ? (isNetworkSupported ? 'Unknown Network' : 'Switch Network') : 'Select Network')}
+        {NetworkController.state.caipNetwork?.name ??
+          (AccountController.state.isConnected
+            ? isNetworkSupported
+              ? 'Unknown Network'
+              : 'Switch Network'
+            : 'Select Network')}
       </NetworkButtonUI>
     </ThemeProvider>
   );

packages/scaffold/src/views/w3m-unsupported-chain-view/index.tsx

@@ -49,8 +49,8 @@ export function UnsupportedChainView() {
       ListHeaderComponentStyle={styles.header}
       ListHeaderComponent={
         <Text variant="small-400" color="fg-200" center>
-          The current network is not supported by this application. 
-          Please switch to an available option to continue.
+          The current network is not supported by this application. Please switch to an available
+          option to continue.
         </Text>
       }
       contentContainerStyle={styles.contentContainer}

packages/wagmi/src/client.ts

@@ -470,15 +470,17 @@ export class AppKit extends AppKitScaffold {
         imageId: PresetsUtil.EIP155NetworkImageIds[id],
         imageUrl: this.options?.chainImages?.[id]
       });
-      
+
       const internalState = this.wagmiConfig.chains || [];
-      const isNetworkSupported = internalState.length === 0 || 
-                                internalState.some((chainItem: Chain) => 
-                                  `${ConstantsUtil.EIP155}:${chainItem.id}` === caipChainId);
+      const isNetworkSupported =
+        internalState.length === 0 ||
+        internalState.some(
+          (chainItem: Chain) => `${ConstantsUtil.EIP155}:${chainItem.id}` === caipChainId
+        );
       if (!isNetworkSupported) {
         console.warn(`Network ${caipChainId} is not in the requested networks list`);
       }
-      
+
       if (isConnected && address && chainId) {
         const caipAddress: CaipAddress = `${ConstantsUtil.EIP155}:${id}:${address}`;
         this.setCaipAddress(caipAddress);