aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-08-10 07:49:15 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-08-10 07:49:15 +0800
commitcb0c1f25bacab5f6ee9348dbc3dc112f4d77560f (patch)
tree3927022da9dd257834f0f52afed1ea0df38a413a
parent637d3978b716a7f32cf603b70155d8db90509af2 (diff)
downloadtangerine-wallet-browser-cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f.tar
tangerine-wallet-browser-cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f.tar.gz
tangerine-wallet-browser-cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f.tar.bz2
tangerine-wallet-browser-cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f.tar.lz
tangerine-wallet-browser-cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f.tar.xz
tangerine-wallet-browser-cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f.tar.zst
tangerine-wallet-browser-cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f.zip
Did not previously call functions before!
-rw-r--r--app/scripts/metamask-controller.js6
-rw-r--r--ui/app/actions.js3
2 files changed, 6 insertions, 3 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 1550f0937..b5052e438 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -252,9 +252,9 @@ module.exports = class MetamaskController {
this.configManager.updateConversionRate()
this.scheduleConversionInterval()
const data = {
- conversionRate: this.configManager.getConversionRate,
- currentFiat: this.configManager.getCurrentFiat,
- conversionDate: this.configManager.getConversionDate,
+ conversionRate: this.configManager.getConversionRate(),
+ currentFiat: this.configManager.getCurrentFiat(),
+ conversionDate: this.configManager.getConversionDate(),
}
cb(data)
} catch (e) {
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 14cbeac42..17171e8e2 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -223,6 +223,9 @@ function setCurrentFiat (fiat) {
dispatch(this.showLoadingIndication())
_accountManager.setCurrentFiat(fiat, (data, err) => {
dispatch(this.hideLoadingIndication())
+ console.log("NEW THINGS")
+ console.log("==========")
+ console.log(data.currentFiat, data.conversionRate, data.conversionDate)
dispatch({
type: this.SET_CURRENT_FIAT,
value: {