aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-03-15 08:52:03 +0800
committerGitHub <noreply@github.com>2017-03-15 08:52:03 +0800
commita186e40d179d230fc1e81f7f507a5232d23ad462 (patch)
tree91d9cbb8baa26efa462a86e9ecda460792f90996 /app/scripts/metamask-controller.js
parentfcee7723e99c13b3fddcb97853dfdd771b42de14 (diff)
parent570cc891b5386dc04462737de4df6f2adf5059c9 (diff)
downloadtangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar
tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.gz
tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.bz2
tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.lz
tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.xz
tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.tar.zst
tangerine-wallet-browser-a186e40d179d230fc1e81f7f507a5232d23ad462.zip
Merge branch 'master' into i1165-predictive
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 1fcee61da..25f9d9e5d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -636,7 +636,7 @@ module.exports = class MetamaskController extends EventEmitter {
this.currencyController.updateConversionRate()
const data = {
conversionRate: this.currencyController.getConversionRate(),
- currentFiat: this.currencyController.getCurrentCurrency(),
+ currentCurrency: this.currencyController.getCurrentCurrency(),
conversionDate: this.currencyController.getConversionDate(),
}
cb(null, data)