Merge pull request #811 from nounsDAO/soli-fix-future-query-error

Fix Future Block Query Issue
nounsDAO · Nov 6, 2023 · b7bf7e9 · b7bf7e9
2 parents 31b2a95 + 36c350e
commit b7bf7e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/nouns-webapp/src/components/ProposalHeader/index.tsx b/packages/nouns-webapp/src/components/ProposalHeader/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useEffect } from 'react';
 import { useBlockNumber } from '@usedapp/core';
 import { Alert, Button } from 'react-bootstrap';
@@ -66,13 +66,17 @@ const ProposalHeader: React.FC<ProposalHeaderProps> = props => {
   const [updatedTimestamp, setUpdatedTimestamp] = React.useState<number | null>(null);
   const [createdTimestamp, setCreatedTimestamp] = React.useState<number | null>(null);
   const isMobile = isMobileScreen();
-  const availableVotes = useUserVotesAsOfBlock(proposal?.createdBlock) ?? 0;
+  const currentBlock = useBlockNumber();
+  const currentOrSnapshotBlock = useMemo(() =>
+    Math.min(proposal?.voteSnapshotBlock, (currentBlock ? currentBlock - 1 : 0)) || undefined,
+    [proposal, currentBlock]
+  );
+  const availableVotes = useUserVotesAsOfBlock(currentOrSnapshotBlock) ?? 0;
   const hasVoted = useHasVotedOnProposal(proposal?.id);
   const proposalVote = useProposalVote(proposal?.id);
   const proposalCreationTimestamp = useBlockTimestamp(proposal?.createdBlock);
   const disableVoteButton = !isWalletConnected || !availableVotes || hasVoted;
   const activeLocale = useActiveLocale();
-  const currentBlock = useBlockNumber();
   const hasManyVersions = props.proposalVersions && props.proposalVersions.length > 1;
   const isDaoGteV3 = useIsDaoGteV3();
   useEffect(() => {

diff --git a/packages/nouns-webapp/src/pages/Vote/index.tsx b/packages/nouns-webapp/src/pages/Vote/index.tsx
@@ -26,7 +26,7 @@ import timezone from 'dayjs/plugin/timezone';
 import advanced from 'dayjs/plugin/advancedFormat';
 import en from 'dayjs/locale/en';
 import VoteModal from '../../components/VoteModal';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useAppDispatch, useAppSelector } from '../../hooks';
 import clsx from 'clsx';
 import ProposalHeader from '../../components/ProposalHeader';
@@ -160,8 +160,12 @@ const VotePage = ({
   const againstPercentage = proposal && totalVotes ? (proposal.againstCount * 100) / totalVotes : 0;
   const abstainPercentage = proposal && totalVotes ? (proposal.abstainCount * 100) / totalVotes : 0;
 
-  // Use user votes as of proposal snapshot block pulled from subgraph
-  const userVotes = useUserVotesAsOfBlock(proposal?.voteSnapshotBlock);
+  // Use user votes as of the current or proposal snapshot block
+  const currentOrSnapshotBlock = useMemo(() =>
+    Math.min(proposal?.voteSnapshotBlock ?? 0, (currentBlock ? currentBlock - 1 : 0)) || undefined,
+    [proposal, currentBlock]
+  );
+  const userVotes = useUserVotesAsOfBlock(currentOrSnapshotBlock);
 
   // Get user votes as of current block to use in vote signals
   const userVotesNow = useUserVotes() || 0;