diff --git a/components/BountyList/index.jsx b/components/BountyList/index.jsx index a24cf0742..f73899704 100755 --- 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 index ffc73abba..5cf67f032 100644 --- 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 (
- {bounty.tierWinners?.[index] ? ( + {githubUserId ? (
{githubUser?.url ? ( @@ -176,7 +177,7 @@ const IndividualClaim = ({ ) : ( 'Loading...' )}{' '} - ({bounty.tierWinners?.[index]}) + ({githubUserId})
) : (
Not Yet Assigned
diff --git a/components/Claim/ClaimsTracking/index.js b/components/Claim/ClaimsTracking/index.js index 8be1ca3f0..72991b2b6 100644 --- 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 }) => {
Total # of Payouts: {loading ? 'Loading...' : nbPayouts}
-
Total Payout Volume: {formatCurrency(payout)}
-
Total TVL for the hackathon: {formatCurrency(TVL)}
+
Total Payout Volume: {formatCurrency(payout || 0)}
+
Total TVL for the hackathon: {formatCurrency(TVL || 0)}
@@ -328,7 +332,8 @@ const ClaimsTracking = ({ fetchFilters, TVLBalances, payoutBalances }) => {
{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 (
should match DOM Snapshot 1`] = ` diff --git a/components/Layout/Footer/index.jsx b/components/Layout/Footer/index.jsx index 2316a4aa0..448ad1c59 100755 --- a/components/Layout/Footer/index.jsx +++ b/components/Layout/Footer/index.jsx @@ -142,7 +142,7 @@ const Footer = () => {

HELP ME

{ 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 index de46f869a..26de992ab 100644 --- 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 index cc5b99109..a21c817f6 100755 --- 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 index b14a3f4b5..473ab9f54 100755 --- 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);