From e89cb7c5f9b3b6700ac245c0b8f7e044f456fbe9 Mon Sep 17 00:00:00 2001
From: Vadim Arasev <varasev@gmail.com>
Date: Mon, 2 Jul 2018 11:53:37 +0300
Subject: [PATCH] (Fix) Checking transaction status

---
 src/components/BallotCard.jsx | 26 ++++++++++++++++++--------
 src/components/NewBallot.jsx  |  2 +-
 src/messages.js               |  6 +++++-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/BallotCard.jsx b/src/components/BallotCard.jsx
index f79e6b5..fc5ca9f 100644
--- a/src/components/BallotCard.jsx
+++ b/src/components/BallotCard.jsx
@@ -181,11 +181,16 @@ export class BallotCard extends React.Component {
             return;
         }
         this.getContract(contractsStore, votingType).vote(id, choice, contractsStore.votingKey)
-        .on("receipt", () => {
+        .on("receipt", (tx) => {
             commonStore.hideLoading();
-            swal("Congratulations!", messages.VOTED_SUCCESS_MSG, "success").then((result) => {
-                push(`${commonStore.rootPath}`);
-            });
+            if (tx.status === true || tx.status === '0x1') {
+                swal("Congratulations!", messages.VOTED_SUCCESS_MSG, "success").then((result) => {
+                    push(`${commonStore.rootPath}`);
+                });
+            } else {
+                swal("Warning!", messages.VOTE_FAILED_TX, "warning").then((result) => {
+                });
+            }
         })
         .on("error", (e) => {
             commonStore.hideLoading();
@@ -225,11 +230,16 @@ export class BallotCard extends React.Component {
             return;
         }
         this.getContract(contractsStore, votingType).finalize(id, contractsStore.votingKey)
-        .on("receipt", () => {
+        .on("receipt", (tx) => {
             commonStore.hideLoading();
-            swal("Congratulations!", messages.FINALIZED_SUCCESS_MSG, "success").then((result) => {
-                push(`${commonStore.rootPath}`);
-            });
+            if (tx.status === true || tx.status === '0x1') {
+                swal("Congratulations!", messages.FINALIZED_SUCCESS_MSG, "success").then((result) => {
+                    push(`${commonStore.rootPath}`);
+                });
+            } else {
+                swal("Warning!", messages.FINALIZE_FAILED_TX, "warning").then((result) => {
+                });
+            }
         })
         .on("error", (e) => {
             commonStore.hideLoading();
diff --git a/src/components/NewBallot.jsx b/src/components/NewBallot.jsx
index 0e10e7f..f74595b 100644
--- a/src/components/NewBallot.jsx
+++ b/src/components/NewBallot.jsx
@@ -231,7 +231,7 @@ export class NewBallot extends React.Component {
             push(`${commonStore.rootPath}`);
           });
         } else {
-          swal("Warning!", messages.FAILED_TX, "warning").then((result) => {
+          swal("Warning!", messages.BALLOT_CREATE_FAILED_TX, "warning").then((result) => {
           });
         }
       })
diff --git a/src/messages.js b/src/messages.js
index b3c22f3..d0e5b57 100644
--- a/src/messages.js
+++ b/src/messages.js
@@ -30,8 +30,12 @@ messages.SHOULD_BE_MORE_THAN_MIN_DURATION = (minDuration, duration, neededHours,
 messages.SHOULD_BE_LESS_OR_EQUAL_14_DAYS = (duration) => {
 	return `Ballot end time should not be more than 14 days from now in UTC time. Current duration is ${duration} hours.`;
 }
-messages.FAILED_TX = `Your transaction was failed. Please make sure you set correct parameters for ballot creation.
+messages.BALLOT_CREATE_FAILED_TX = `Your transaction was failed. Please make sure you set correct parameters for ballot creation.
 Make sure you don't have Transaction Error. Exception thrown in contract code message in metamask before you sign it.`
+messages.VOTE_FAILED_TX = `Your transaction was failed. Please make sure you haven't already voted for this ballot.
+Make sure you don't have Transaction Error. Exception thrown in contract code message in metamask before you sign it.`
+messages.FINALIZE_FAILED_TX = `Your transaction was failed. Make sure you don't have Transaction Error.
+Exception thrown in contract code message in metamask before you sign it.`
 messages.DESCRIPTION_IS_EMPTY = "Description cannot be empty";
 messages.wrongRepo = (repo) => {
 	return `There is no contracts.json in configured repo ${repo}`;