diff options
author | Esteban MIno <efmino@uc.cl> | 2018-07-04 01:23:15 +0800 |
---|---|---|
committer | Esteban MIno <efmino@uc.cl> | 2018-07-04 01:23:15 +0800 |
commit | 0494b2fc8a84a533227d25e869a95226f99734af (patch) | |
tree | da39134cf8d82c4e208f9461a9f4391b8f47fd28 /app/scripts/controllers/balance.js | |
parent | 03fd4355af8ceae9a1d2cad04e12a4f86a9f36b7 (diff) | |
parent | 1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff) | |
download | tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.gz tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.zst tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.zip |
Merge branch 'develop' into detectTokenFeature
Diffstat (limited to 'app/scripts/controllers/balance.js')
-rw-r--r-- | app/scripts/controllers/balance.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/controllers/balance.js b/app/scripts/controllers/balance.js index 86619fce1..4c97810a3 100644 --- a/app/scripts/controllers/balance.js +++ b/app/scripts/controllers/balance.js @@ -60,7 +60,7 @@ class BalanceController { * Sets up listeners and subscriptions which should trigger an update of ethBalance. These updates include: * - when a transaction changes state to 'submitted', 'confirmed' or 'failed' * - when the current account changes (i.e. a new account is selected) - * - when there is a block update + * - when there is a block update * * @private * @@ -100,7 +100,7 @@ class BalanceController { /** * Gets the pending transactions (i.e. those with a 'submitted' status). These are accessed from the - * TransactionController passed to this BalanceController during construction. + * TransactionController passed to this BalanceController during construction. * * @private * @returns {Promise<array>} Promises an array of transaction objects. |