diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-07-23 01:15:39 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-07-23 01:15:39 +0800 |
commit | 22528002e1edef84ade67d5bc30b2580e6542c05 (patch) | |
tree | a9729348b3e35daa28bffae629bec724fa78bde9 | |
parent | a612fcee64422ca43c470d7832a263f5e490611d (diff) | |
download | tangerine-wallet-browser-22528002e1edef84ade67d5bc30b2580e6542c05.tar tangerine-wallet-browser-22528002e1edef84ade67d5bc30b2580e6542c05.tar.gz tangerine-wallet-browser-22528002e1edef84ade67d5bc30b2580e6542c05.tar.bz2 tangerine-wallet-browser-22528002e1edef84ade67d5bc30b2580e6542c05.tar.lz tangerine-wallet-browser-22528002e1edef84ade67d5bc30b2580e6542c05.tar.xz tangerine-wallet-browser-22528002e1edef84ade67d5bc30b2580e6542c05.tar.zst tangerine-wallet-browser-22528002e1edef84ade67d5bc30b2580e6542c05.zip |
Linting!
-rw-r--r-- | app/scripts/lib/config-manager.js | 2 | ||||
-rw-r--r-- | app/scripts/metamask-controller.js | 6 | ||||
-rw-r--r-- | ui/app/actions.js | 4 | ||||
-rw-r--r-- | ui/app/reducers/metamask.js | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 14caa80c8..e0f389ed4 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -296,7 +296,7 @@ ConfigManager.prototype.updateConversionRate = function () { ConfigManager.prototype.setConversionPrice = function(price) { var data = this.getData() - data.conversionRate = Number(parsedResponse.ticker.price) + data.conversionRate = Number(price) this.setData(data) } diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index e121fad6a..0537bda97 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -251,7 +251,7 @@ module.exports = class MetamaskController { } cb(data) } catch (e) { - cb(null,e) + cb(null, e) } } @@ -260,7 +260,9 @@ module.exports = class MetamaskController { clearInterval(this.conversionInterval) } this.conversionInterval = setInterval(() => { - console.log("Updated currency!") + console.log('=================') + console.log('Updated currency!') + console.log('=================') this.configManager.updateConversionRate() }, 1000) } diff --git a/ui/app/actions.js b/ui/app/actions.js index 50b711f3b..8bf4d1c30 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -55,7 +55,7 @@ var actions = { SHOW_CONF_MSG_PAGE: 'SHOW_CONF_MSG_PAGE', REVEAL_ACCOUNT: 'REVEAL_ACCOUNT', revealAccount: revealAccount, - SET_CURRENT_FIAT: 'SET_CURRENT_FIAT', + SET_CURRENT_FIAT: 'SET_CURRENT_FIAT', setCurrentFiat: setCurrentFiat, // account detail screen SHOW_SEND_PAGE: 'SHOW_SEND_PAGE', @@ -220,7 +220,7 @@ function setCurrentFiat (fiat) { currentFiat: data.currentFiat, conversionRate: data.conversionRate, conversionDate: data.conversionDate, - } + }, }) }) } diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 50b9e0819..46397edd4 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -110,7 +110,7 @@ function reduceMetamask (state, action) { return extend(metamaskState, { identities }) case actions.SET_CURRENT_FIAT: - return extend(metaMaskState, { + return extend(metamaskState, { currentFiat: action.value.currentFiat, conversionRate: action.value.conversionRate, conversionDate: action.value.conversionDate, |