General updates and fixes for demo

richContracts.json

@@ -58,7 +58,7 @@
     "title": "Swapr fees",
     "tags": ["DXgov", "Guilds", "permissions"],
     "networks": {
-      "5": "0x7d5Cc70B1d1778B8bEdeaD40283056CDb71E32B2",
+      "5": "0x885b28d6b93087623483af5e5f7362bd6d8a0a6b",
       "1337": "0x0000000000000000000000000000000000000000"
     },
     "functions": [
@@ -80,7 +80,7 @@
             "name": "swapFee",
             "title": "Swap Fee %",
             "defaultValue": "",
-            "description": "Address of contract / receiver in case of asset"
+            "description": "Fee to be set for pair (10 = 0.1%)"
           }
         ],
         "shortDescription": "Sets the swap fee for a given pool on swapr",

src/Modules/Guilds/Wrappers/GuildSidebarWrapper.tsx

@@ -16,8 +16,9 @@ import { useState } from 'react';
 import { WalletModal } from 'components/Web3Modals';
 import useTotalLocked from 'hooks/Guilds/ether-swr/guild/useTotalLocked';
 import StakeTokensModalWrapper from './StakeTokensModalWrapper';
-import { useAccount, useEnsAvatar, useEnsName } from 'wagmi';
+import { useAccount } from 'wagmi';
 import { isReadOnly } from 'provider/wallets';
+import useENSAvatar from 'hooks/Guilds/ens/useENSAvatar';
 
 const GuildSidebarWrapper = () => {
   const [isStakeModalOpen, setIsStakeModalOpen] = useState(false);
@@ -29,8 +30,7 @@ const GuildSidebarWrapper = () => {
   const { data: guildToken } = useERC20Info(guildConfig?.token);
   const { data: numberOfMembers } = useGuildMemberTotal(guildAddress);
   const { address: userAddress, connector } = useAccount();
-  const { data: ensName } = useEnsName({ address: userAddress });
-  const { data: ensAvatar } = useEnsAvatar({ addressOrName: userAddress });
+  const { ensName, imageUrl } = useENSAvatar(userAddress);
   const { data: unlockedAt } = useVoterLockTimestamp(guildAddress, userAddress);
   const { data: userVotingPower } = useVotingPowerOf({
     contractAddress: guildAddress,
@@ -65,7 +65,7 @@ const GuildSidebarWrapper = () => {
               guildToken={guildToken}
               isRepGuild={isRepGuild}
               userWalletAddress={userAddress}
-              userEnsAvatar={{ ensName, imageUrl: ensAvatar }}
+              userEnsAvatar={{ ensName, imageUrl }}
               userVotingPower={userVotingPower}
               userVotingPowerPercent={votingPowerPercent}
               unlockedAt={unlockedAt}

src/components/ActionsBuilder/SupportedActions/ERC20Transfer/ERC20TransferInfoLine.tsx

@@ -26,7 +26,9 @@ const ERC20TransferInfoLine: React.FC<ActionViewProps> = ({
     if (!decodedCall) return null;
 
     if (decodedCall.callType === SupportedAction.ERC20_TRANSFER) {
-      const token = tokens.find(token => token.address === decodedCall.to);
+      const token = tokens.find(
+        token => token.address?.toLowerCase() === decodedCall.to?.toLowerCase()
+      );
       return {
         source: decodedCall.from,
         token,

src/components/ActionsBuilder/SupportedActions/SetPermissions/SetPermissionsInfoLine.tsx

@@ -9,6 +9,7 @@ import { Flex } from 'components/primitives/Layout';
 import { useNetwork } from 'wagmi';
 import { useTokenList } from 'hooks/Guilds/tokens/useTokenList';
 import { resolveUri } from 'utils/url';
+import { shortenAddress } from 'utils';
 
 const SetPermissionsInfoLine: React.FC<ActionViewProps> = ({
   decodedCall,
@@ -36,7 +37,10 @@ const SetPermissionsInfoLine: React.FC<ActionViewProps> = ({
   const { tokens } = useTokenList(chain?.id);
 
   let currentToken = useMemo(() => {
-    return tokens.filter(token => token?.address === parsedData?.asset)[0];
+    return tokens.filter(
+      token =>
+        token?.address?.toLowerCase() === parsedData?.asset?.toLowerCase()
+    )[0];
   }, [tokens, parsedData]);
 
   return (
@@ -56,7 +60,7 @@ const SetPermissionsInfoLine: React.FC<ActionViewProps> = ({
             <Flex margin={'0 0.5rem'}>{currentToken.symbol}</Flex>
           </>
         ) : (
-          t('anyToken')
+          shortenAddress(parsedData?.to)
         )}
       </Segment>
     </>

src/components/ActionsBuilder/SupportedActions/SetPermissions/validateSetPermissions.ts

@@ -29,7 +29,6 @@ const validateAssetTransferPermission = (
     amount: null,
     functionName: null,
   };
-  const allowedAmount = BigNumber.from(amount);
   if (activeTab === 0) {
     if (!tokenAddress || tokenAddress === ZERO_ADDRESS) {
       errors.tokenAddress = t('tokenAddressIsRequired');
@@ -63,13 +62,8 @@ const validateAssetTransferPermission = (
   }
 
   if (activeTab === TABS.FUNCTION_CALL) {
-    // only validate for function_call. asset transfer set maxAmount by default.
     if (!amount || !BigNumber.isBigNumber(amount)) {
       errors.amount = t('amountIsRequired');
-    } else {
-      if (allowedAmount && allowedAmount?.lte(0)) {
-        errors.amount = t('amountCannotBeZero');
-      }
     }
   }
 

src/components/AddressButton/AddressButton.tsx

@@ -33,7 +33,9 @@ const AddressButton: React.FC<AddressButtonProps> = ({
       </IconHolder>
       {isDesktop && (
         <AddressText>
-          {ensName || address ? (
+          {ensName ? (
+            ensName
+          ) : address ? (
             showFullAddress ? (
               address
             ) : (

src/components/AddressButton/__snapshots__/AddressButton.test.tsx.snap

@@ -152,7 +152,7 @@ exports[`AddressButton Should render properly with full props 1`] = `
     <span
       class="c6"
     >
-      0x7970...0928
+      test.eth
     </span>
     <div
       class="c7 c8"
@@ -290,7 +290,7 @@ exports[`AddressButton Should render properly with partial props 1`] = `
     <span
       class="c6"
     >
-      0x7970...0928
+      test.eth
     </span>
   </button>
 

src/components/Header/Header.tsx

@@ -22,7 +22,7 @@ const Header = () => {
           onClick={() => navigate(`/${chain.network}`)}
           size={2}
         >
-          <strong>{t('guilds.guilds')}</strong>
+          <strong>{t('projectDavi.projectDavi')}</strong>
         </ClickableHeading>
         <MenuItems>
           <NetworkButton />

src/components/Header/__snapshots__/Header.test.tsx.snap

@@ -133,7 +133,7 @@ exports[`Header Should match snapshot 1`] = `
         size="2"
       >
         <strong>
-          guilds.guilds
+          projectDavi.projectDavi
         </strong>
       </h2>
       <div

src/components/SwaprPicker/SwaprPicker.test.tsx

@@ -83,9 +83,7 @@ describe('SwaprPicker', () => {
     const optionOne = await waitFor(() => result.getByText('XDOGE - DON'));
     fireEvent.click(optionOne);
 
-    const addressButton = await waitFor(() =>
-      result.getByText('0x003a...6c1b')
-    );
+    const addressButton = await waitFor(() => result.getByText('test.eth'));
 
     expect(addressButton).toBeInTheDocument();
   });

src/components/WalletButton/WalletButton.test.tsx

@@ -1,6 +1,6 @@
 import WalletButton from './WalletButton';
 import { render } from 'utils/tests';
-import { shortenAddress, ZERO_ADDRESS } from 'utils';
+import { ZERO_ADDRESS } from 'utils';
 import { mockChain } from 'components/Web3Modals/fixtures';
 import wagmi from 'wagmi';
 
@@ -57,6 +57,6 @@ describe('WalletButton', () => {
 
     const { container, getByText } = render(<WalletButton />);
     expect(container).toMatchSnapshot();
-    expect(getByText(shortenAddress(mockAddress))).toBeInTheDocument();
+    expect(getByText('test.eth')).toBeInTheDocument();
   });
 });

src/components/WalletButton/__snapshots__/WalletButton.test.tsx.snap

@@ -177,7 +177,7 @@ exports[`WalletButton Should match snapshot and display connected address 1`] =
     <span
       class="c6"
     >
-      0x0000...0000
+      test.eth
     </span>
   </button>
 

src/configs/goerli/config.json

@@ -9,12 +9,20 @@
   },
   "tokens": [
     {
-      "address": "0x2c212B56cE6c73646f7259EF1daAA52e515e73C6",
+      "address": "0x2f9343cf18baacf57ac4a4e20188b9b00cfce3f1",
       "name": "SWAPR",
       "decimals": 18,
       "symbol": "SWPR",
       "fetchPrice": true,
       "logoURI": "https://s2.coinmarketcap.com/static/img/coins/200x200/12368.png"
+    },
+    {
+      "address": "0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6",
+      "name": "Wrapped ETH",
+      "decimals": 18,
+      "symbol": "WETH",
+      "fetchPrice": true,
+      "logoURI": "https://assets.coingecko.com/coins/images/2518/thumb/weth.png?1547036627"
     }
   ],
   "version": 1

src/configs/index.ts

@@ -1 +1 @@
-export const RICH_CONTRACT_DATA_REGISTRY = 'QmfV1ughR6ZDHbt5rB5E7vvcYGCJis5ei4Whh2wFD864jN';
+export const RICH_CONTRACT_DATA_REGISTRY = 'QmVnfCaowKgZrFV5vpx7w77GU7sxsPkgUrHeRbZZVpTtWi';

src/hooks/Guilds/contracts/useDecodedCall.ts

@@ -129,9 +129,11 @@ export const decodeCall = async (
     };
   }
 
-  // Detect using the Guild calls registry.
+  // Detect using the rich contract data registry.
   const matchedRichContractData = contracts?.find(
-    contract => contract.networks[chainId] === call.to
+    contract =>
+      contract.networks[chainId].toLocaleLowerCase() ===
+      call.to.toLocaleLowerCase()
   );
   let matchedContract = matchedRichContractData
     ? getContractInterfaceFromRichContractData(matchedRichContractData)

src/hooks/Guilds/ens/useENSPublicResolverContract.ts

@@ -20,6 +20,7 @@ export function useENSAvatarUri(ensName: string, chainId?: number) {
     contractInterface: ensPublicResolver.abi,
     functionName: 'text',
     args: [convertToNameHash(ensName), 'avatar'],
+    chainId: supportedChainId,
   });
   return {
     avatarUri: data?.toString(),

src/hooks/Guilds/ens/utils.ts

@@ -1,8 +1,6 @@
-import { isSupportedChainId } from 'components/ActionsBuilder/SupportedActions/UpdateENSContent/utils';
-import { MAINNET_ID, GOERLI_ID } from 'utils';
+import { MAINNET_ID } from 'utils';
 
 export const isAvailableOnENS = (chainId: number) => {
-  const validChainId = isSupportedChainId(chainId);
-  const ensNetworks = [MAINNET_ID, GOERLI_ID];
-  return ensNetworks.includes(validChainId);
+  const ensNetworks = [MAINNET_ID];
+  return ensNetworks.includes(chainId);
 };

src/hooks/Guilds/ether-swr/guild/useSnapshotId.ts

@@ -13,6 +13,7 @@ type UseSnapshotIdHook = (args: UseSnapshotIdProps) => SWRResponse<BigNumber>;
 
 const useSnapshotId: UseSnapshotIdHook = ({ contractAddress, proposalId }) => {
   const { isSnapshotGuild } = useGuildImplementationTypeConfig(contractAddress);
+
   return useEtherSWR(
     isSnapshotGuild && proposalId && contractAddress
       ? [contractAddress, 'getProposalSnapshotId', proposalId]

src/hooks/Guilds/useSwaprFetchPairs/index.ts

@@ -31,7 +31,7 @@ export const useSwaprFetchPairs = async (
 ): Promise<[SwaprFetchPairsInterface[], string]> => {
   const networkApiPair = {
     1: 'https://api.thegraph.com/subgraphs/name/dxgraphs/swapr-mainnet-v2', //mainnet
-    5: 'https://api.thegraph.com/subgraphs/name/dxgraphs/swapr-xdai-v2', // goerly
+    5: 'https://api.thegraph.com/subgraphs/name/dxgraphs/swapr-goerli', // goerly
     100: 'https://api.thegraph.com/subgraphs/name/dxgraphs/swapr-xdai-v2', // gnosis
     1337: 'https://api.thegraph.com/subgraphs/name/dxgraphs/swapr-xdai-v2', //localhost
     42161:

src/locales/en/translation.json

@@ -4,6 +4,9 @@
     "guild": "Guild",
     "guilds": "Guilds"
   },
+  "projectDavi": {
+    "projectDavi": "Project-DAVI"
+  },
   "proposals": "Proposals",
   "proposals_zero": "No proposals",
   "proposals_one": "{{count}} proposal",
@@ -57,9 +60,8 @@
   "mint": "Mint",
   "toAddress": "To Address",
   "anyAddress": "Any Address",
-  "anyToken": "any token",
   "maxValue": "Max Value",
-  "unkownToken": "Unknown token",
+  "unknownToken": "Unknown token",
   "functionName": "Function Name",
   "functionSignature": "Function Signature",
   "assetTransfer": "Asset Transfer",