aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/scripts/lib/config-manager.js27
-rw-r--r--app/scripts/lib/idStore.js4
-rw-r--r--app/scripts/metamask-controller.js15
-rw-r--r--test/unit/config-manager-test.js82
-rw-r--r--ui/app/actions.js18
-rw-r--r--ui/app/reducers/metamask.js6
6 files changed, 150 insertions, 2 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index caaae8a75..a5b319325 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -1,6 +1,7 @@
const Migrator = require('pojo-migrator')
const MetamaskConfig = require('../config.js')
const migrations = require('./migrations')
+const rp = require('request-promise')
const TESTNET_RPC = MetamaskConfig.network.testnet
const MAINNET_RPC = MetamaskConfig.network.mainnet
@@ -270,3 +271,29 @@ ConfigManager.prototype.getConfirmed = function () {
return ('isConfirmed' in data) && data.isConfirmed
}
+ConfigManager.prototype.setCurrentFiat = function (currency) {
+ var data = this.getData()
+ data.fiatCurrency = currency
+ this.setData(data)
+}
+
+ConfigManager.prototype.getCurrentFiat = function () {
+ var data = this.getData()
+ return ('fiatCurrency' in data) && data.fiatCurrency
+}
+
+ConfigManager.prototype.setConversionRate = function () {
+ var data = this.getData()
+ return rp(`https://www.cryptonator.com/api/ticker/eth-${data.fiatCurrency}`)
+ .then(function (response) {
+ data.conversionRate = Number(JSON.parse(response).ticker.price)
+ this.setData(data)
+ }.bind(this)).catch(function (err) {
+ console.log('Error in conversion.', err)
+ })
+}
+
+ConfigManager.prototype.getConversionRate = function () {
+ var data = this.getData()
+ return ('conversionRate' in data) && data.conversionRate
+}
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 2c8e9108b..94aaad1d1 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -99,6 +99,8 @@ IdentityStore.prototype.getState = function () {
unconfMsgs: messageManager.unconfirmedMsgs(),
messages: messageManager.getMsgList(),
selectedAddress: configManager.getSelectedAccount(),
+ currentFiat: configManager.getCurrentFiat(),
+ currentConversion: configManager.getConversionRate(),
}))
}
@@ -199,7 +201,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
time: time,
status: 'unconfirmed',
}
-
+
console.log('addUnconfirmedTransaction:', txData)
// keep the onTxDoneCb around for after approval/denial (requires user interaction)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 17af4cc29..7bf8fd5ea 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -40,6 +40,7 @@ module.exports = class MetamaskController {
setProviderType: this.setProviderType.bind(this),
useEtherscanProvider: this.useEtherscanProvider.bind(this),
agreeToDisclaimer: this.agreeToDisclaimer.bind(this),
+ setCurrentFiat: this.setCurrentFiat.bind(this),
// forward directly to idStore
createNewVault: idStore.createNewVault.bind(idStore),
recoverFromSeed: idStore.recoverFromSeed.bind(idStore),
@@ -237,6 +238,20 @@ module.exports = class MetamaskController {
}
}
+ setCurrentFiat (fiat, cb) {
+ try {
+ this.configManager.setCurrentFiat(fiat)
+ this.configManager.setConversionRate()
+ const data = {
+ conversionRate: this.configManager.getConversionRate,
+ currentFiat: this.configManager.getCurrentFiat,
+ }
+ cb(data)
+ } catch (e) {
+ cb(null,e)
+ }
+ }
+
// called from popup
setRpcTarget (rpcTarget) {
this.configManager.setRpcTarget(rpcTarget)
diff --git a/test/unit/config-manager-test.js b/test/unit/config-manager-test.js
index 8974a6bc5..cf8362108 100644
--- a/test/unit/config-manager-test.js
+++ b/test/unit/config-manager-test.js
@@ -3,6 +3,7 @@ const extend = require('xtend')
const STORAGE_KEY = 'metamask-persistance-key'
var configManagerGen = require('../lib/mock-config-manager')
var configManager
+const rp = require('request-promise')
describe('config-manager', function() {
@@ -11,6 +12,86 @@ describe('config-manager', function() {
configManager = configManagerGen()
})
+ describe('currency conversions', function() {
+
+ describe('#getCurrentFiat', function() {
+ it('should return false if no previous key exists', function() {
+ var result = configManager.getCurrentFiat()
+ assert.ok(!result)
+ })
+ })
+
+ describe('#setCurrentFiat', function() {
+ it('should make getCurrentFiat return true once set', function() {
+ assert.equal(configManager.getCurrentFiat(), false)
+ configManager.setCurrentFiat('usd')
+ var result = configManager.getCurrentFiat()
+ assert.equal(result, 'usd')
+ })
+
+ it('should work with other currencies as well', function() {
+ assert.equal(configManager.getCurrentFiat(), false)
+ configManager.setCurrentFiat('jpy')
+ var result = configManager.getCurrentFiat()
+ assert.equal(result, 'jpy')
+ })
+ })
+
+ describe('#getConversionRate', function() {
+ it('should return false if non-existent', function() {
+ var result = configManager.getConversionRate()
+ assert.ok(!result)
+ })
+ })
+
+ describe('#setConversionRate', function() {
+ it('should retrieve an update for ETH to USD and set it in memory', function(done) {
+ this.timeout(15000)
+ assert.equal(configManager.getConversionRate(), false)
+ var promise = new Promise(
+ function (resolve, reject) {
+ configManager.setCurrentFiat('usd')
+ configManager.setConversionRate().then(function() {
+ resolve()
+ })
+ })
+
+ promise.then(function() {
+ var result = configManager.getConversionRate()
+ assert.equal(typeof result, 'number')
+ done()
+ }).catch(function(err) {
+ console.log(err)
+ })
+
+ })
+
+ it('should work for JPY as well.', function() {
+ this.timeout(15000)
+ assert.equal(configManager.getConversionRate(), false)
+ var promise = new Promise(
+ function (resolve, reject) {
+ configManager.setCurrentFiat('jpy')
+ configManager.setConversionRate().then(function() {
+ resolve()
+ })
+ })
+
+ promise.then(function() {
+ var result = configManager.getConversionRate()
+ assert.equal(typeof result, 'number')
+ done()
+ }).catch(function(err) {
+ console.log(err)
+ })
+ })
+
+ xit('should activate every time the currency is changed.', function() {
+
+ })
+ })
+ })
+
describe('confirmation', function() {
describe('#getConfirmed', function() {
@@ -215,4 +296,3 @@ describe('config-manager', function() {
})
})
})
-
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 3e0fe55c0..c5fd2df08 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -55,6 +55,8 @@ var actions = {
SHOW_CONF_MSG_PAGE: 'SHOW_CONF_MSG_PAGE',
REVEAL_ACCOUNT: 'REVEAL_ACCOUNT',
revealAccount: revealAccount,
+ SET_CURRENT_FIAT: 'SET_CURRENT_FIAT',
+ setCurrentFiat: setCurrentFiat,
// account detail screen
SHOW_SEND_PAGE: 'SHOW_SEND_PAGE',
showSendPage: showSendPage,
@@ -207,6 +209,22 @@ function revealAccount () {
}
}
+function setCurrentFiat (fiat) {
+ return (dispatch) => {
+ dispatch(this.showLoadingIndication())
+ _accountManager.setCurrentFiat(fiat, (data, err) => {
+ dispatch(this.hideLoadingIndication())
+ dispatch({
+ type: this.SET_CURRENT_FIAT,
+ value: {
+ currentFiat: data.currentFiat,
+ conversionRate: data.conversionRate,
+ }
+ })
+ })
+ }
+}
+
function signMsg (msgData) {
return (dispatch) => {
dispatch(actions.showLoadingIndication())
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index f3ef8eb11..d5d17135f 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -109,6 +109,12 @@ function reduceMetamask (state, action) {
var identities = extend(metamaskState.identities, id)
return extend(metamaskState, { identities })
+ case actions.SET_CURRENT_FIAT:
+ return extend(metaMaskState, {
+ currentFiat: action.value.currentFiat,
+ conversionRate: action.value.conversionRate,
+ })
+
default:
return metamaskState
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 22:15:14 +0800