Merge pull request #103 from hansmrtn/temp-gnosis-workaround

gnosis-workaround
moonshotcollective · Jan 13, 2022 · aef1831 · aef1831
2 parents e569189 + b935605
commit aef1831
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/packages/react-app/src/routes/party/components/Distribute.jsx b/packages/react-app/src/routes/party/components/Distribute.jsx
@@ -47,7 +47,6 @@ export const Distribute = ({
         }
       },
     );
-    setHasApprovedAllowance(false);
   };
 
   const handleApproval = res => {
@@ -63,7 +62,7 @@ export const Distribute = ({
 
   // Approve total token amount
   const approve = async () => {
-    // setIsApprovalLoading(true);
+    setIsApprovalLoading(true);
     tx(tokenInstance?.approve(readContracts.Distributor.address, total), handleApproval);
   };
 
@@ -95,6 +94,11 @@ export const Distribute = ({
       setAmounts(amts);
       setAddresses(adrs);
     }
+    // Check ERC20 allowance
+    // if (total && tokenInstance) {
+    //   const allowance = await tokenInstance.allowance(address, readContracts.Distributor.address);
+    //   setHasApprovedAllowance(allowance.gte(total));
+    // }
   };
 
   const handleReceipt = res => {
@@ -137,15 +141,14 @@ export const Distribute = ({
   const DistributeButton = () => {
     return (
       <>
-        {tokenInstance && !hasApprovedAllowance ? (
+        {tokenInstance && (
           <Button onClick={approve} isLoading={isApprovalLoading}>
             Approve
           </Button>
-        ) : (
-          <Button onClick={distribute} isLoading={isDistributionLoading}>
-            Distribute
-          </Button>
         )}
+        <Button onClick={distribute} isLoading={isDistributionLoading}>
+          Distribute
+        </Button>
       </>
     );
   };