From cce1adbc4309628c5e8fb2e4ab4d136660a9df12 Mon Sep 17 00:00:00 2001
From: andytudhope <tuddy0525@gmail.com>
Date: Wed, 14 Aug 2019 20:21:40 +0200
Subject: [PATCH] Fix tooltips #22

---
 src/modules/Submit/Submit.reducer.js                        | 4 ++--
 src/modules/TransactionStatus/TransactionStatus.jsx         | 4 +++-
 src/modules/TransactionStatus/TransactionStatus.reducer.js  | 6 +++---
 .../TransactionStatus/TransactionStatus.utilities.js        | 4 +++-
 src/modules/Vote/Vote.reducer.js                            | 4 ++--
 src/modules/Withdraw/Withdraw.reducer.js                    | 2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/modules/Submit/Submit.reducer.js b/src/modules/Submit/Submit.reducer.js
index 5b74327..524b7f2 100644
--- a/src/modules/Submit/Submit.reducer.js
+++ b/src/modules/Submit/Submit.reducer.js
@@ -167,7 +167,7 @@ export const submitAction = (dapp, sntValue) => {
         return
       }
       dispatch(onReceiveTransactionInfoAction(id, tx))
-      dispatch(checkTransactionStatusAction(tx))
+      dispatch(checkTransactionStatusAction(tx, 'Published'))
     } catch (e) {
       dispatch(hideAction())
       dispatch(showAlertAction(e.message))
@@ -201,7 +201,7 @@ export const updateAction = (dappId, metadata, email) => {
         metadata.email,
       )
       dispatch(onReceiveTransactionInfoAction(dappId, tx))
-      dispatch(checkTransactionStatusAction(tx))
+      dispatch(checkTransactionStatusAction(tx, 'Updated'))
     } catch (e) {
       dispatch(hideAction())
       dispatch(showAlertAction(e.message))
diff --git a/src/modules/TransactionStatus/TransactionStatus.jsx b/src/modules/TransactionStatus/TransactionStatus.jsx
index 0f0921d..307af1c 100644
--- a/src/modules/TransactionStatus/TransactionStatus.jsx
+++ b/src/modules/TransactionStatus/TransactionStatus.jsx
@@ -24,6 +24,7 @@ class TransactionStatus extends React.Component {
       published,
       publishedEmpty,
       progress,
+      message,
       failed,
       hide,
     } = this.props
@@ -51,7 +52,7 @@ class TransactionStatus extends React.Component {
               ✓ Thank you for submitting. Your dapp will be reviewed soon.
             </div>
           )}
-          {published && <div className={styles.status}>✓ Published</div>}
+          {published && <div className={styles.status}>✓ {message}</div>}
           {progress && (
             <div className={styles.status}>
               <img src={loadingSpinner} alt="Loading..." />
@@ -78,6 +79,7 @@ TransactionStatus.propTypes = {
   progress: PropTypes.bool.isRequired,
   published: PropTypes.bool.isRequired,
   publishedEmpty: PropTypes.bool.isRequired,
+  message: PropTypes.string.isRequired,
   failed: PropTypes.bool.isRequired,
   hide: PropTypes.func.isRequired,
   checkTransactionStatus: PropTypes.func.isRequired,
diff --git a/src/modules/TransactionStatus/TransactionStatus.reducer.js b/src/modules/TransactionStatus/TransactionStatus.reducer.js
index 7be4592..906b8f6 100644
--- a/src/modules/TransactionStatus/TransactionStatus.reducer.js
+++ b/src/modules/TransactionStatus/TransactionStatus.reducer.js
@@ -37,7 +37,7 @@ export const onChangeTransactionStatusDataAction = transactionStatus => ({
   payload: transactionStatus,
 })
 
-export const checkTransactionStatusAction = tx => {
+export const checkTransactionStatusAction = (tx, message) => {
   return async dispatch => {
     const transacationStatus = transactionStatusFetchedInstance()
     if (tx === undefined) {
@@ -61,7 +61,7 @@ export const checkTransactionStatusAction = tx => {
         break
       default:
       case 1:
-        transacationStatus.setPublished(true)
+        transacationStatus.setPublished(true, message)
         try {
           const blockchain = await BlockchainSDK.getInstance()
           dapp = await blockchain.DiscoverService.getDAppDataById(
@@ -81,7 +81,7 @@ export const checkTransactionStatusAction = tx => {
       case 2:
         transacationStatus.setProgress(true)
         setTimeout(() => {
-          dispatch(checkTransactionStatusAction(tx))
+          dispatch(checkTransactionStatusAction(tx, message))
         }, 2000)
         break
     }
diff --git a/src/modules/TransactionStatus/TransactionStatus.utilities.js b/src/modules/TransactionStatus/TransactionStatus.utilities.js
index d3bd91b..fc4149c 100644
--- a/src/modules/TransactionStatus/TransactionStatus.utilities.js
+++ b/src/modules/TransactionStatus/TransactionStatus.utilities.js
@@ -16,6 +16,7 @@ class TransactionStatus {
     this.dappImg = ''
     this.type = TYPE_NONE
     this.progress = false
+    this.message = ''
     this.published = false
     this.publishedEmpty = false
     this.failed = false
@@ -44,9 +45,10 @@ class TransactionStatus {
     this.persistTransactionData()
   }
 
-  setPublished(published) {
+  setPublished(published, message) {
     this.progress = false
     this.published = published
+    this.message = message
     this.publishedEmpty = false
     this.failed = false
     this.persistTransactionData()
diff --git a/src/modules/Vote/Vote.reducer.js b/src/modules/Vote/Vote.reducer.js
index 6d85cff..4a9f35a 100644
--- a/src/modules/Vote/Vote.reducer.js
+++ b/src/modules/Vote/Vote.reducer.js
@@ -164,7 +164,7 @@ export const upVoteAction = (dapp, amount) => {
       const blockchain = await BlockchainSDK.getInstance()
       const tx = await blockchain.DiscoverService.upVote(dapp.id, amount)
       dispatch(onReceiveTransactionInfoAction(dapp.id, tx))
-      dispatch(checkTransactionStatusAction(tx))
+      dispatch(checkTransactionStatusAction(tx, 'Upvoted'))
     } catch (e) {
       dispatch(showAlertAction(e.message))
     }
@@ -188,7 +188,7 @@ export const downVoteAction = (dapp, amount) => {
       const blockchain = await BlockchainSDK.getInstance()
       const tx = await blockchain.DiscoverService.downVote(dapp.id)
       dispatch(onReceiveTransactionInfoAction(dapp.id, tx))
-      dispatch(checkTransactionStatusAction(tx))
+      dispatch(checkTransactionStatusAction(tx, 'Downvoted'))
     } catch (e) {
       dispatch(showAlertAction(e.message))
     }
diff --git a/src/modules/Withdraw/Withdraw.reducer.js b/src/modules/Withdraw/Withdraw.reducer.js
index d969675..a77ba26 100644
--- a/src/modules/Withdraw/Withdraw.reducer.js
+++ b/src/modules/Withdraw/Withdraw.reducer.js
@@ -66,7 +66,7 @@ export const withdrawAction = (dapp, sntValue) => {
       const blockchain = await BlockchainSDK.getInstance()
       const tx = await blockchain.DiscoverService.withdraw(dapp.id, sntValue)
       dispatch(onReceiveTransactionInfoAction(dapp.id, tx))
-      dispatch(checkTransactionStatusAction(tx))
+      dispatch(checkTransactionStatusAction(tx, 'Withdrawn'))
     } catch (e) {
       dispatch(hideAction())
       dispatch(showAlertAction(e.message))