From e8dde06ef16db37a9c13ac3d80bad097d5ee4892 Mon Sep 17 00:00:00 2001
From: Kirill Klimenko <klimenkomud@gmail.com>
Date: Wed, 24 Jan 2024 11:12:45 +0100
Subject: [PATCH] Fix dom node nesting, remove wagmi public provider, fix
 conditional to prevent setting ERC20 claim contract

---
 .../Proposals/ProposalActions/ProposalAction.tsx   | 14 +++++---------
 .../ui/menus/AccountDisplay/MenuItemNetwork.tsx    |  8 +-------
 src/hooks/DAO/loaders/governance/useERC20Claim.ts  |  3 ++-
 src/providers/NetworkConfig/rainbow-kit.config.ts  |  2 --
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/components/Proposals/ProposalActions/ProposalAction.tsx b/src/components/Proposals/ProposalActions/ProposalAction.tsx
index c3e09daced..42f372f945 100644
--- a/src/components/Proposals/ProposalActions/ProposalAction.tsx
+++ b/src/components/Proposals/ProposalActions/ProposalAction.tsx
@@ -103,17 +103,13 @@ export function ProposalAction({
   if (!showActionButton) {
     if (!expandedView) {
       return (
-        <Link
+        <Button
+          as={Link}
           href={DAO_ROUTES.proposal.relative(daoAddress, proposal.proposalId)}
-          passHref
+          variant="secondary"
         >
-          <Button
-            as="a"
-            variant="secondary"
-          >
-            {t('details')}
-          </Button>
-        </Link>
+          {t('details')}
+        </Button>
       );
     }
     // This means that Proposal in state where there's no action to perform
diff --git a/src/components/ui/menus/AccountDisplay/MenuItemNetwork.tsx b/src/components/ui/menus/AccountDisplay/MenuItemNetwork.tsx
index 6027ea0dd5..9cdc2cdb8a 100644
--- a/src/components/ui/menus/AccountDisplay/MenuItemNetwork.tsx
+++ b/src/components/ui/menus/AccountDisplay/MenuItemNetwork.tsx
@@ -52,13 +52,7 @@ export function MenuItemNetwork() {
               key={chain.chainId}
               value={chain.chainId}
             >
-              <Box
-                w="1rem"
-                h="1rem"
-                bg={chain.color}
-                rounded="full"
-              />
-              <Text textStyle="text-base-mono-medium">{chain.name}</Text>
+              {chain.name}
             </option>
           ))}
         </Select>
diff --git a/src/hooks/DAO/loaders/governance/useERC20Claim.ts b/src/hooks/DAO/loaders/governance/useERC20Claim.ts
index cd7625e84b..bc9272cc0c 100644
--- a/src/hooks/DAO/loaders/governance/useERC20Claim.ts
+++ b/src/hooks/DAO/loaders/governance/useERC20Claim.ts
@@ -26,7 +26,8 @@ export function useERC20Claim() {
     const tokenClaimArray = await possibleTokenClaimContract
       .queryFilter(tokenClaimFilter)
       .catch(() => []);
-    if (!tokenClaimArray.length && tokenClaimArray[0].args[1] === tokenContract.asSigner.address) {
+
+    if (!tokenClaimArray.length || tokenClaimArray[0].args[1] === tokenContract.asSigner.address) {
       return;
     }
     // action to governance
diff --git a/src/providers/NetworkConfig/rainbow-kit.config.ts b/src/providers/NetworkConfig/rainbow-kit.config.ts
index db6c2d6ff6..4eab2805ee 100644
--- a/src/providers/NetworkConfig/rainbow-kit.config.ts
+++ b/src/providers/NetworkConfig/rainbow-kit.config.ts
@@ -10,7 +10,6 @@ import {
 import { Chain, configureChains, createClient, createStorage, mainnet } from 'wagmi';
 import { hardhat } from 'wagmi/chains';
 import { jsonRpcProvider } from 'wagmi/providers/jsonRpc';
-import { publicProvider } from 'wagmi/providers/public';
 import { APP_NAME } from '../../constants/common';
 import { supportedChains } from './NetworkConfigProvider';
 import { testWallet } from './testWallet';
@@ -31,7 +30,6 @@ export const { chains, provider } = configureChains(supportedWagmiChains, [
       return { http: `https://${networkUrl}`, webSocket: `wss://${networkUrl}` };
     },
   }),
-  publicProvider(),
 ]);
 
 const defaultWallets = [