Merge pull request #288 from 1Hive/timer_bug

Timer bug
1Hive · May 23, 2022 · 9b7ae45 · 9b7ae45
2 parents 0a08f54 + 1465682
commit 9b7ae45
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/packages/react-app/src/components/claim-list.tsx b/packages/react-app/src/components/claim-list.tsx
@@ -43,18 +43,12 @@ const BoxStyled = styled(Box)`
 type Props = {
   questData: QuestModel;
   challengeDeposit: TokenAmountModel;
-  questTotalBounty?: TokenAmountModel | null;
   isLoading?: boolean;
 };
 
 const loadingClaim = { state: ENUM_CLAIM_STATE.None } as ClaimModel;
 
-export default function ClaimList({
-  questData,
-  challengeDeposit,
-  questTotalBounty,
-  isLoading = false,
-}: Props) {
+export default function ClaimList({ questData, challengeDeposit, isLoading = false }: Props) {
   const [claims, setClaims] = useState<ClaimModel[]>([loadingClaim]);
   const [isLoadingState, setIsLoading] = useState(isLoading);
   const { transaction } = useTransactionContext();
@@ -139,7 +133,6 @@ export default function ClaimList({
             <Claim
               claim={claim}
               challengeDeposit={challengeDeposit}
-              questTotalBounty={questTotalBounty}
               isLoading={isLoadingState}
               questData={questData}
             />,

diff --git a/packages/react-app/src/components/claim.tsx b/packages/react-app/src/components/claim.tsx
@@ -31,18 +31,11 @@ const AddressWrapperStyled = styled.div<{ isSmallScreen: boolean }>`
 type Props = {
   claim: ClaimModel;
   isLoading?: boolean;
-  questTotalBounty?: TokenAmountModel | null;
   challengeDeposit: TokenAmountModel;
   questData: QuestModel;
 };
 
-export default function Claim({
-  claim,
-  isLoading,
-  questTotalBounty,
-  challengeDeposit,
-  questData,
-}: Props) {
+export default function Claim({ claim, isLoading, challengeDeposit, questData }: Props) {
   const { walletAddress } = useWallet();
   const { transaction } = useTransactionContext();
   const [state, setState] = useState(claim.state);
@@ -61,7 +54,7 @@ export default function Claim({
         setActionButton(
           <ExecuteClaimModal
             claim={claim}
-            questTotalBounty={questTotalBounty}
+            questTotalBounty={questData.bounty}
             onClose={onActionClose}
           />,
         );

diff --git a/packages/react-app/src/components/quest.tsx b/packages/react-app/src/components/quest.tsx
@@ -115,7 +115,7 @@ export default function Quest({
 }: Props) {
   const { walletAddress } = useWallet();
   const history = useHistory();
-  const [bounty, setBounty] = useState<TokenAmountModel | null>();
+  const [bounty, setBounty] = useState<TokenAmountModel | undefined | null>(questData?.bounty);
   const [highlight, setHighlight] = useState<boolean>(true);
   const [claimDeposit, setClaimDeposit] = useState<TokenAmountModel | undefined>();
   const [isDepositReleased, setIsDepositReleased] = useState<boolean>(false);
@@ -321,10 +321,9 @@ export default function Quest({
             />
             {isSummary && fieldsRow}
           </ContentWrapperStyled>
-          {!isSummary && challengeDeposit && (
+          {!isSummary && challengeDeposit && bounty && (
             <ClaimList
-              questData={questData}
-              questTotalBounty={bounty}
+              questData={{ ...questData, bounty }}
               challengeDeposit={challengeDeposit}
               isLoading={isLoading}
             />