aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/balance.js
diff options
context:
space:
mode:
authorАнна <anna@MacBook-Air-Anna.local>2018-07-05 11:15:28 +0800
committerАнна <anna@MacBook-Air-Anna.local>2018-07-05 11:15:28 +0800
commit90934bca46cf990554cbf9be9e302ab5e2fc8041 (patch)
treeee68fa3d98e8c0e072980fd07397b3a9bd40d640 /app/scripts/controllers/balance.js
parent1f6bf0a80d43252d7b84e8e0247a524b77569810 (diff)
parentfd218142acb6dab0b2f921b9729f17ff90cffc2d (diff)
downloadtangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.gz
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.bz2
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.lz
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.xz
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.zst
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.zip
Merge branch 'develop' into to-autocomplete
Diffstat (limited to 'app/scripts/controllers/balance.js')
-rw-r--r--app/scripts/controllers/balance.js4
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.