Merge pull request #198 from Adamant-im/FixDeliveredMark

Fix cosmetic bugs for fast ETH-sending

Author: RealGoodProgrammer

src/components/chat/ChatEntryTemplate.vue

@@ -48,7 +48,7 @@ export default {
   },
   mounted () {
     let innerText = this.$refs.chatEntry.innerText
-    const currencies = ['ADM', 'ETH', 'BNB']
+    const currencies = ['ADM', 'ETH', 'BNB', 'BZ', 'DOGE']
     let checkCurrency = false
     currencies.forEach(currency => {
       checkCurrency = checkForCurrency(innerText, currency)

src/components/chat/EthTransfer.vue

@@ -4,6 +4,7 @@
     :direction="message.direction"
     :timestamp="message.timestamp"
     :brief="brief"
+    :amount="message.message.amount"
   >
     <p>{{ $t("chats." + (message.direction === "from" ? "sent_label" : "received_label")) }}</p>
     <p class='transaction-amount' v-on:click="goToTransaction()">
@@ -12,7 +13,7 @@
     <p><em v-text="message.message.comments"></em></p>
 
     <template slot="brief-view">
-      <span>{{ $t("chats." + (message.direction === "from" ? "sent_label" : "received_label")) }}</span>&nbsp;
+      <span>{{ $t("chats." + (message.direction === "from" ? "sent_label" : "received_label")) }} </span>
       <span v-text="message.message.amount"></span> {{ crypto }}
     </template>
   </chat-entry-template>
@@ -68,8 +69,7 @@ export default {
       const type = this.message.message && this.message.message.type
       if (!type) return Cryptos.ETH
 
-      const crypto = type.substr(0, type.indexOf('_')).toUpperCase()
-      return crypto
+      return type.substr(0, type.indexOf('_')).toUpperCase()
     }
   }
 }

src/store/index.js

@@ -647,7 +647,7 @@ const store = {
         updateLastChatMessage(currentDialogs, payload, confirmClass, direction, payload.id)
       }
 
-      if (currentDialogs.last_message.id === payload.message.hash) {
+      if (currentDialogs.last_message.id === payload.message.hash && payload.direction === 'to') {
         updateLastChatMessage(currentDialogs, payload, confirmClass, direction, payload.message.hash)
       }
 

src/store/modules/eth-base/eth-base-actions.js

@@ -12,6 +12,14 @@ const MAX_ATTEMPTS = 150
 
 const CHUNK_SIZE = 25
 
+function checkBlockCount (transaction, rootState) {
+  if (transaction.blockNumber) {
+    return Number(transaction.blockNumber) !== 0 && (Number(transaction.blockNumber) < Number(rootState.eth.blockNumber))
+  } else {
+    return false
+  }
+}
+
 export default function createActions (config) {
   const endpoint = getEndpointUrl('ETH')
   const api = new Web3(new Web3.providers.HttpProvider(endpoint, 2000))
@@ -103,7 +111,6 @@ export default function createActions (config) {
 
           return admApi.sendSpecialMessage(admAddress, msg).then(result => {
             if (result.success) {
-              console.log('ADM message has been sent', msg, result.transactionId)
               return serialized
             } else {
               console.log(`Failed to send "${type}"`, result)
@@ -163,20 +170,22 @@ export default function createActions (config) {
       const key = 'transaction:' + payload.hash
       const supplier = () => api.eth.getTransaction.request(payload.hash, (err, tx) => {
         if (!err && tx && tx.input) {
-          const transaction = parseTransaction(context, tx)
-
+          let transaction = parseTransaction(context, tx)
           if (transaction) {
+            // Override transaction status until getting at least one confirmation from backend
+            if (transaction.status === 'SUCCESS' && !checkBlockCount(transaction, context.rootState)) {
+              transaction.status = 'PENDING'
+            }
             context.commit('transactions', [transaction])
 
             // Fetch receipt details: status and actual gas consumption
             const { attempt, ...receiptPayload } = payload
             context.dispatch('getTransactionReceipt', receiptPayload)
           }
         }
-
         if (!tx && payload.attempt === MAX_ATTEMPTS) {
           // Give up, if transaction could not be found after so many attempts
-          context.commit('transactions', [{ hash: tx.hash, status: 'ERROR' }])
+          context.commit('transactions', [{ hash: payload.hash, status: 'ERROR' }])
         } else if (err || (tx && !tx.blockNumber) || (!tx && payload.isNew)) {
           // In case of an error or a pending transaction fetch its details once again later
           // Increment attempt counter, if no transaction was found so far
@@ -200,7 +209,22 @@ export default function createActions (config) {
       const gasPrice = transaction.gasPrice
 
       const supplier = () => api.eth.getTransactionReceipt.request(payload.hash, (err, tx) => {
-        if (!err && tx) {
+        if (!err && tx && checkBlockCount(tx, context.rootState)) {
+          // For sync last chat message with transaction state
+          if (tx.from === context.rootState.eth.address) {
+            let contacts = Object.entries(context.rootGetters.getContacts.list)
+            let ADMAddress
+            contacts.forEach((contact) => {
+              const ethAddress = contact[1].ETH
+              if (ethAddress && ethAddress.toString().toUpperCase() === tx.to.toUpperCase()) {
+                ADMAddress = contact[0]
+                let currentDialogs = context.rootState.chats[ADMAddress]
+                if (currentDialogs.last_message.id === tx.transactionHash) {
+                  currentDialogs.last_message.confirm_class = 'confirmed'
+                }
+              }
+            })
+          }
           context.commit('transactions', [{
             hash: payload.hash,
             fee: utils.calculateFee(tx.gasUsed, gasPrice),
@@ -210,7 +234,7 @@ export default function createActions (config) {
         if (!tx && payload.attempt === MAX_ATTEMPTS) {
           // Give up, if transaction could not be found after so many attempts
           context.commit('transactions', [{ hash: tx.hash, status: 'ERROR' }])
-        } else if (err || (tx && !tx.blockNumber) || (!tx && payload.isNew)) {
+        } else if (err || (tx && !tx.blockNumber) || (!tx && payload.isNew) || !checkBlockCount(tx, context.rootState)) {
           // In case of an error or a pending transaction fetch its receipt once again later
           // Increment attempt counter, if no transaction was found so far
           const newPayload = tx ? payload : { ...payload, attempt: 1 + (payload.attempt || 0) }

src/views/Chats.vue

@@ -32,7 +32,7 @@
                       <div v-if="(chat.last_message.amount > 0 && chat.last_message.direction === 'from') || chat.last_message.direction === 'from'" class="message-status-block" :message-status="chat.last_message.confirm_class"></div>
                       <chat-entry v-if="chat.last_message.amount > 0 && chat.last_message.direction === 'from'" :message="chat.last_message" :brief="true"></chat-entry>
                       <chat-entry v-else :message="chat.last_message" :brief="true" class="for-received"></chat-entry>
-                      <div v-if="chat.last_message.amount > 0 && chat.last_message.direction === 'to'" class="message-status-block-for-received" :message-status="chat.last_message.confirm_class"></div>
+                      <div v-if="(chat.last_message.amount || chat.last_message.message.amount > 0) && chat.last_message.direction === 'to'" class="message-status-block-for-received" :message-status="chat.last_message.confirm_class"></div>
                     </div>
                     <span class="dt" v-if="chat.last_message.timestamp">{{ $formatDate(chat.last_message.timestamp) }}</span>
                 </div>

src/views/Transfer.vue

@@ -61,6 +61,7 @@
               @close="onClose"
               ref="confirm_transfer_dialog">
       </md-dialog-confirm>
+      <Spinner v-if="showLoader"></Spinner>
   </div>
 </template>
 
@@ -96,27 +97,32 @@ export default {
       }
       if (type !== 'ok') return
       this.isWaiting = true
+      this.showLoader = true
       this.sendTokens().then(
         hash => {
           this.isWaiting = false
 
           if (!hash) {
             // No hash: transaction has been rejected
             this.errorMessage('error_transaction_send')
+            this.showLoader = false
             return
           }
 
           if (this.fixedAddress) {
             // Go back to chat if we came from there
+            this.showLoader = false
             this.$router.push({ name: 'Chat', params: { partner: this.fixedAddress } })
           } else {
             // View the newly created transaction
             const params = { crypto: this.crypto, tx_id: hash }
+            this.showLoader = false
             this.$router.push({ name: 'Transaction', params })
           }
         },
         err => {
           console.error(err)
+          this.showLoader = false
           this.isWaiting = false
           this.errorMessage('error_transaction_send')
         }
@@ -303,7 +309,8 @@ export default {
       targetAmount: '',
       crypto: this.fixedCrypto || Cryptos.ADM,
       comments: '',
-      isWaiting: false
+      isWaiting: false,
+      showLoader: false
     }
   },
   props: ['fixedCrypto', 'fixedAddress']