aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-01-12 04:23:00 +0800
committerFrankie <frankie.diamond@gmail.com>2017-01-12 04:23:00 +0800
commitbbd2f2738b5b260f0e666b9cfb8d0c843342abb2 (patch)
tree07d58da5c1e08e90868c1561f6b7b114bd545d2e
parent0b59dafc344994838b3fbd146c55c73ce0cb76af (diff)
downloadtangerine-wallet-browser-bbd2f2738b5b260f0e666b9cfb8d0c843342abb2.tar
tangerine-wallet-browser-bbd2f2738b5b260f0e666b9cfb8d0c843342abb2.tar.gz
tangerine-wallet-browser-bbd2f2738b5b260f0e666b9cfb8d0c843342abb2.tar.bz2
tangerine-wallet-browser-bbd2f2738b5b260f0e666b9cfb8d0c843342abb2.tar.lz
tangerine-wallet-browser-bbd2f2738b5b260f0e666b9cfb8d0c843342abb2.tar.xz
tangerine-wallet-browser-bbd2f2738b5b260f0e666b9cfb8d0c843342abb2.tar.zst
tangerine-wallet-browser-bbd2f2738b5b260f0e666b9cfb8d0c843342abb2.zip
Add to CHANGELOG
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/scripts/transaction-manager.js10
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f1ec6823..113d2f7cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## Current Master
+- Create visible difference in transaction history between a approved but not yet included in a block transaction and a transaction who has been confirmed.
- Fix memory leak in RPC Cache
- Override RPC commands eth_syncing and web3_clientVersion
- Remove certain non-essential permissions from certain builds.
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js
index a279ba23a..f83bc41c9 100644
--- a/app/scripts/transaction-manager.js
+++ b/app/scripts/transaction-manager.js
@@ -262,12 +262,18 @@ module.exports = class TransactionManager extends EventEmitter {
var txHash = tx.hash
var txId = tx.id
if (!txHash) {
- tx.err = { errCode: 'No hash was provided', message: 'Tx could possibly have not been submitted or an error accrued during signing'}
+ tx.err = {
+ errCode: 'No hash was provided',
+ message: 'Tx could possibly have not been submitted or an error accrued during signing',
+ }
return this.updateTx(tx)
}
this.txProviderUtils.query.getTransactionByHash(txHash, (err, txMeta) => {
if (err) {
- tx.err = {errorCode: err, message: 'Tx could possibly have not been submitted to the block chain',}
+ tx.err = {
+ errorCode: err,
+ message: 'Tx could possibly have not been submitted to the block chain',
+ }
this.updateTx(tx)
return console.error(err)
}