Merge pull request #1853 from ArcAnya/improve

Miscellaneous
OpenQDev · Apr 27, 2023 · cf837ff · cf837ff
2 parents 1cfc473 + 2e6f049
commit cf837ff
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 34 deletions.
diff --git a/components/BountyList/index.jsx b/components/BountyList/index.jsx
@@ -22,7 +22,6 @@ const BountyList = ({ watchedBounties, addCarousel, contractToggle, types, pagin
     return true;
   };
   const getItems = async (oldCursor, batch, ordering, filters = {}) => {
-    console.log(filters, 'my filters');
     return await fetchBountiesWithServiceArg(appState, oldCursor, batch, ordering, filters);
   };
   const paginationObjWithFunctions = { ...paginationObj, filterFunction: filterBounties, getItems };
@@ -85,7 +84,6 @@ const BountyList = ({ watchedBounties, addCarousel, contractToggle, types, pagin
     setSortOrder(toggleTo);
   };
   const handleSearchInput = (e) => {
-    console.log(e.target.value);
     setSearch(e.target.value);
   };
   const enter = () => {

diff --git a/components/Claim/ClaimsTracking/ClaimsPerBounty/IndividualClaim/index.js b/components/Claim/ClaimsTracking/ClaimsPerBounty/IndividualClaim/index.js
@@ -33,7 +33,8 @@ const IndividualClaim = ({
     ethers.BigNumber.from(payout.toString()),
     parseInt(token.decimals) || 18
   );
-  const githubUser = winnersInfo?.find((winner) => winner.id === bounty.tierWinners?.[index]);
+  const githubUserId = bounty.tierWinners?.[index];
+  const githubUser = winnersInfo && winnersInfo?.find((winner) => winner.id === githubUserId);
   const [associatedAddress, setAssociatedAddress] = useState('');
   const [requested, setRequested] = useState(false);
   const [message, setMessage] = useState('');
@@ -46,7 +47,7 @@ const IndividualClaim = ({
   const walletFilter = filters?.walletAddress;
   const [w8Status, setW8Status] = useState('NOT SENT');
   const [walletCondition, setWalletCondition] = useState(true);
-  const githubCondition = githubIdFilter && bounty.tierWinners?.[index] !== githubIdFilter;
+  const githubCondition = githubIdFilter && githubUserId !== githubIdFilter;
   const [claimed, setClaimed] = useState(false);
   const [claimCondition, setClaimCondition] = useState(true);
   const w8Condition = w8Filter !== 'all' && w8Filter !== w8Status.toLowerCase();
@@ -67,17 +68,17 @@ const IndividualClaim = ({
   });
 
   useEffect(() => {
-    tierClaimed();
-  }, [bounty]);
+    if (isOnCorrectNetwork) tierClaimed();
+  }, [bounty, isOnCorrectNetwork]);
   useEffect(() => {
     const claimCondition = (claimFilter == 'true' && !claimed) || (claimFilter == 'false' && claimed);
     setClaimCondition(claimCondition);
   }, [claimFilter, claimed]);
   useEffect(() => {
     const checkRequested = async () => {
-      if (githubUser?.id) {
+      if (githubUserId) {
         try {
-          const user = await appState[0].openQPrismaClient.getPublicUser(githubUser.id);
+          const user = await appState[0].openQPrismaClient.getPublicUser(githubUserId);
           if (user) {
             const request = bounty.requests?.nodes?.find((node) => node.requestingUser.id === user.id);
             setRequested(request);
@@ -87,26 +88,26 @@ const IndividualClaim = ({
             }
           }
         } catch (err) {
-          appState[0].logger.error(err, 'IndividualClaim.js3');
+          appState[0].logger.error(err, 'IndividualClaim.js1');
         }
       }
     };
     const checkAssociatedAddress = async () => {
-      if (githubUser?.id) {
+      if (githubUserId) {
         try {
-          const associatedAddressSubgraph = await appState[0].openQSubgraphClient.getUserByGithubId(githubUser.id);
+          const associatedAddressSubgraph = await appState[0].openQSubgraphClient.getUserByGithubId(githubUserId);
           const associatedAddress = associatedAddressSubgraph?.id;
           if (associatedAddress !== zeroAddress) {
             setAssociatedAddress(associatedAddress);
           }
         } catch (err) {
-          appState[0].logger.error(err, 'IndividualClaim.js4');
+          appState[0].logger.error(err, 'IndividualClaim.js2');
         }
       }
     };
     checkRequested();
     checkAssociatedAddress();
-  }, [githubUser]);
+  }, [githubUserId]);
   useEffect(() => {
     const currentW8Status = bounty.supportingDocumentsCompleted?.[index]
       ? 'APPROVED'
@@ -152,7 +153,7 @@ const IndividualClaim = ({
         setKYC(true);
       }
     } catch (err) {
-      appState[0].logger.error(err, 'IndividualClaim.js4');
+      appState[0].logger.error(err, 'IndividualClaim.js3');
     }
   };
   const tierClaimed = async () => {
@@ -162,12 +163,12 @@ const IndividualClaim = ({
         setClaimed(true);
       }
     } catch (err) {
-      appState[0].logger.error(err, 'IndividualClaim.js5');
+      appState[0].logger.error(err, 'IndividualClaim.js4');
     }
   };
   return (
     <div className={`${hide} text-sm items-center gap-4 ${gridFormat}`}>
-      {bounty.tierWinners?.[index] ? (
+      {githubUserId ? (
         <div className='flex gap-2 '>
           {githubUser?.url ? (
             <Link href={githubUser?.url} target='_blank' className=' text-link-colour hover:underline '>
@@ -176,7 +177,7 @@ const IndividualClaim = ({
           ) : (
             'Loading...'
           )}{' '}
-          ({bounty.tierWinners?.[index]})
+          ({githubUserId})
         </div>
       ) : (
         <div className='text-gray-500'> Not Yet Assigned</div>

diff --git a/components/Claim/ClaimsTracking/index.js b/components/Claim/ClaimsTracking/index.js
@@ -119,21 +119,25 @@ const ClaimsTracking = ({ fetchFilters, TVLBalances, payoutBalances }) => {
       setLoading(false);
       // get all github info from winners in one query
       let winnerIds = [];
-      initialItems.map((item) => (winnerIds = [...new Set([...winnerIds, ...item.tierWinners])]));
+      initialItems.map((item) => item.tierWinners && (winnerIds = [...new Set([...winnerIds, ...item.tierWinners])]));
       let allWinners = [];
       const getWinners = async (githubIdsArray) => {
         let loopArray = githubIdsArray.filter((id) => id !== '');
         while (loopArray.length > 0) {
-          const winnersGithubInfo = await appState.githubRepository.fetchUsersByIds(loopArray.splice(0, 100));
-          if (winnersGithubInfo) allWinners = [...allWinners, ...winnersGithubInfo];
+          let result = null;
+          try {
+            result = await appState.githubRepository.fetchUsersByIds(loopArray.splice(0, 100));
+            if (result?.data?.nodes) {
+              const addArray = result.data.nodes.filter((item) => item !== null);
+              allWinners = [...allWinners, ...addArray];
+            }
+          } catch (err) {
+            appState[0].logger.error(err, 'ClaimsTracking.js1');
+          }
         }
         setWinners(allWinners);
       };
-      try {
-        getWinners(winnerIds);
-      } catch (err) {
-        appState[0].logger.error(err, 'ClaimsTracking.js1');
-      }
+      getWinners(winnerIds);
     }
   }, [initialItems]);
 
@@ -226,8 +230,8 @@ const ClaimsTracking = ({ fetchFilters, TVLBalances, payoutBalances }) => {
             <div>Total # of Payouts: {loading ? 'Loading...' : nbPayouts} </div>
           </div>
           <div className='flex flex-wrap gap-4 w-full items-center mb-2'>
-            <div>Total Payout Volume: {formatCurrency(payout)}</div>
-            <div>Total TVL for the hackathon: {formatCurrency(TVL)}</div>
+            <div>Total Payout Volume: {formatCurrency(payout || 0)}</div>
+            <div>Total TVL for the hackathon: {formatCurrency(TVL || 0)}</div>
           </div>
           <div className='lg:col-start-2 justify-between justify-self-center space-y-4 w-full pb-8 max-w-[960px] mx-auto'>
             <div className='flex flex-wrap gap-4 w-full items-center'>
@@ -328,7 +332,8 @@ const ClaimsTracking = ({ fetchFilters, TVLBalances, payoutBalances }) => {
               </div>
             </div>
             {filteredItems.map((item) => {
-              const bountyWinners = winners.filter((winner) => item.tierWinners.includes(winner.id));
+              const bountyWinners =
+                winners?.length > 0 && winners.filter((winner) => item.tierWinners?.includes(winner.id));
               return (
                 <div key={item.bountyId}>
                   <ClaimsPerBounty

diff --git a/components/Layout/Footer/__snapshots__/Footer.test.jsx.snap b/components/Layout/Footer/__snapshots__/Footer.test.jsx.snap
@@ -108,7 +108,7 @@ exports[`Footer > should match DOM Snapshot 1`] = `
       </h1>
       <ForwardRef(LinkComponent)
         className=" lg:justify-self-center"
-        href="mailto:[email protected]"
+        href="https://discord.gg/uUUdywtBqh"
         rel="noopener noreferrer"
         target="_blank"
       >

diff --git a/components/Layout/Footer/index.jsx b/components/Layout/Footer/index.jsx
@@ -142,7 +142,7 @@ const Footer = () => {
         <div className='flex flex-col pb-8'>
           <h1 className='font-bold pb-2'>HELP ME</h1>
           <Link
-            href={'mailto:[email protected]'}
+            href={'https://discord.gg/uUUdywtBqh'}
             className=' lg:justify-self-center'
             target='_blank'
             rel='noopener noreferrer'

diff --git a/components/ShowCase/ShowCasePage/index.jsx b/components/ShowCase/ShowCasePage/index.jsx
@@ -23,7 +23,7 @@ const ShowCasePage = ({ pr }) => {
     const result = await appState.openQPrismaClient.getPr(pr.id);
     if (result.pr) {
       const userResult = await appState.githubRepository.fetchUsersByIds(result.pr.contributorIds);
-      const contributors = userResult.map((githubData) => {
+      const contributors = userResult.data.nodes.map((githubData) => {
         const address = result.pr.contributors.find((contributor) => contributor.userId === githubData.id);
         return { ...githubData, address };
       });

diff --git a/pages/batchSetSupportingDocumentsComplete.js b/pages/batchSetSupportingDocumentsComplete.js
@@ -61,7 +61,6 @@ function BatchSetSupportingDocumentsComplete() {
 
       // Convert CSV data to JSON
       const jsonData = convertCsvToJson(csvData);
-      console.log('jsonData', jsonData);
 
       // Populate the transaction template
       let transactions = [];

diff --git a/services/github/GithubRepository.js b/services/github/GithubRepository.js
@@ -513,8 +513,9 @@ class GithubRepository {
           variables: {
             ids,
           },
+          errorPolicy: 'all',
         });
-        resolve(result.data.nodes);
+        resolve(result);
       } catch (e) {
         reject(e);
       }

diff --git a/services/utils/Utils.js b/services/utils/Utils.js
@@ -276,7 +276,7 @@ class Utils {
     }
     try {
       const prismaResult = await openQPrismaClient.getUser(accountData, types, category, { fetchPolicy: 'no-cache' });
-      console.log(prismaResult, 'my result');
+
       prismaContracts = prismaResult?.watchedBounties.nodes || [];
       const watchedBountyAddresses = prismaContracts?.map((contract) => contract.address.toLowerCase());
       const watchedBountyIds = prismaContracts?.map((contract) => contract.bountyId);