Merge pull request #289 from Conflux-Chain/Version-v0.5.7

Conflux-Chain · Nov 18, 2020 · 175f6c1 · 175f6c1
2 parents 94b58e4 + 99e7f9d
commit 175f6c1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Current Develop Branch
 
+## 0.5.7 Wed Nov 18 2020
+
+- fix(tx): finished tx status
+
 ## 0.5.6 Wed Nov 18 2020
 
 - fix(rpc): undefined block tag

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "ConfluxPortal",
   "short_name": "ConfluxPortal",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "manifest_version": 2,
   "author": "https://conflux-chain.org",
   "description": "__MSG_appDescription__",

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
@@ -185,7 +185,7 @@ class TransactionController extends EventEmitter {
         `${initialTxMeta.id}:finished`,
         finishedTxMeta => {
           switch (finishedTxMeta.status) {
-            case 'confirmed':
+            case 'submitted':
               return resolve(finishedTxMeta.hash)
             case 'rejected':
               return reject(

diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -511,7 +511,7 @@ class TransactionStateManager extends EventEmitter {
         this.updateTx(txMeta, `txStateManager: setting status to ${status}`)
         this.emit(`${txMeta.id}:${status}`, txId)
         this.emit(`tx:status-update`, txId, status)
-        if (['confirmed', 'rejected', 'failed'].includes(status)) {
+        if (['submitted', 'rejected', 'failed'].includes(status)) {
           this.emit(`${txMeta.id}:finished`, txMeta)
         }
         this.emit('update:badge')

diff --git a/test/unit/app/controllers/transactions/tx-controller-test.js b/test/unit/app/controllers/transactions/tx-controller-test.js
@@ -252,7 +252,7 @@ describe('Transaction Controller', function() {
       txController.once('newUnapprovedTx', txMetaFromEmit => {
         setTimeout(() => {
           txController.setTxHash(txMetaFromEmit.id, '0x0')
-          txController.txStateManager.setTxStatusConfirmed(txMetaFromEmit.id)
+          txController.txStateManager.setTxStatusSubmitted(txMetaFromEmit.id)
         }, 10)
       })