fix: set allowed flag only in one place

Geo-Web-Project · Oct 10, 2022 · bb915e7 · bb915e7
1 parent 05832bf
commit bb915e7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/components/ApproveButton.tsx b/components/ApproveButton.tsx
@@ -92,7 +92,6 @@ export function ApproveButton(props: ApproveButtonProps) {
       );
       setIsActing(false);
       setDidFail(true);
-      setIsAllowed(false);
       return false;
     }
 
@@ -125,7 +124,6 @@ export function ApproveButton(props: ApproveButtonProps) {
       );
       setIsActing(false);
       setDidFail(true);
-      setIsAllowed(false);
       return false;
     }
 
@@ -153,7 +151,6 @@ export function ApproveButton(props: ApproveButtonProps) {
       if (requiredPayment && BigNumber.from(allowance).lt(requiredPayment)) {
         _approvals.push(approvePayment);
         _approvalStr = `Allow ${PAYMENT_TOKEN} Transfer`;
-        setIsAllowed(false);
       }
 
       // Check flow allowance
@@ -177,8 +174,12 @@ export function ApproveButton(props: ApproveButtonProps) {
           _approvals.length > 1
             ? `Allow ${PAYMENT_TOKEN} Transfer + Stream`
             : `Allow ${PAYMENT_TOKEN} Stream`;
-      } else {
+      }
+
+      if (_approvals.length === 0) {
         setIsAllowed(true);
+      } else {
+        setIsAllowed(false);
       }
 
       setApprovals(_approvals);

diff --git a/components/PerformButton.tsx b/components/PerformButton.tsx
@@ -25,7 +25,13 @@ export function PerformButton(props: PerformButtonProps) {
 
   return (
     <Button
-      variant={isAllowed || isDisabled ? "success" : "info"}
+      variant={
+        !isAllowed
+          ? "info"
+          : buttonText === "Reject Bid"
+          ? "danger"
+          : "success"
+      }
       className="w-100"
       onClick={() => submit()}
       disabled={isDisabled || !isAllowed}