Merge pull request #97 from hansmrtn/api-bugfix

updated to use api v1.0.1
moonshotcollective · Jan 7, 2022 · 45a2954 · 45a2954
2 parents 3dce976 + 78961e9
commit 45a2954
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/packages/react-app/src/controllers/mongodbController.js b/packages/react-app/src/controllers/mongodbController.js
@@ -18,4 +18,12 @@ export default class MongoDBController {
     const url = `${process.env.REACT_APP_API_URL}/party/${id}`;
     return this.http.put(url, data);
   }
+  async addPartyReceipt(id, data) {
+    const url = `${process.env.REACT_APP_API_URL}/party/${id}/distribute`;
+    return this.http.put(url, data);
+  }
+  async addPartyBallot(id, data) {
+    const url = `${process.env.REACT_APP_API_URL}/party/${id}/vote`;
+    return this.http.put(url, data);
+  }
 }
diff --git a/packages/react-app/src/routes/party/components/Distribute.jsx b/packages/react-app/src/routes/party/components/Distribute.jsx
@@ -98,17 +98,15 @@ export const Distribute = ({
   };
 
   const handleReceipt = res => {
-    if (res && (res.status === "confirmed" || res.status === 1)) {
+    if (res && res.hash && (res.status === "confirmed" || res.status === 1)) {
       console.log(" 🍾 Transaction " + res.hash + " finished!");
       const receipt = {
         account: address,
         amount: total,
         token: tokenInstance?.address,
         txn: res.hash,
       };
-      partyData.receipts.push(receipt);
-      // NOTE: When updating the party, be sure include ALL the updated data
-      dbInstance.updateParty(partyData.id, { ballots: partyData.ballots, receipts: partyData.receipts });
+      dbInstance.addPartyReceipt(partyData.id, receipt);
     }
     setIsDistributionLoading(false);
   };

diff --git a/packages/react-app/src/routes/party/components/Vote.jsx b/packages/react-app/src/routes/party/components/Vote.jsx
@@ -72,14 +72,13 @@ export const Vote = ({ dbInstance, partyData, address, userSigner, targetNetwork
           // TODO: Check if account has already submitted a ballot
           if (cast.length === 0) {
             // Push a ballot to the parties sumbitted ballots array
-            ballots.push({ signature: sig, data: ballot });
-            return ballots;
+            return { signature: sig, data: ballot };
           } else {
             throw "Error: Account already voted!";
           }
         })
-        .then(ballots => {
-          dbInstance.updateParty(partyData.id, { ballots: ballots, receipts: partyData.receipts });
+        .then(b => {
+          dbInstance.addPartyBallot(partyData.id, b);
         })
         .catch(err => {
           console.log(err);