Holding off on select formatting for now. Renamed keys for options.

feature/default_network_editable
Kevin Serrano 8 years ago
parent ccd85d19e3
commit be76b05726
  1. 2
      development/states.js
  2. 2
      development/states/config.json
  3. 8
      ui/app/config.js
  4. 2
      ui/app/reducers/metamask.js

File diff suppressed because one or more lines are too long

@ -1,6 +1,6 @@
{
"metamask": {
"currentFiat": "jpy",
"currentFiat": "JPY",
"conversionRate": "N/A",
"conversionDate": "N/A",
"isInitialized": true,

@ -3,7 +3,7 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('react-redux').connect
const actions = require('./actions')
const select = require('react-select')
const Select = require('react-select')
module.exports = connect(mapStateToProps)(ConfigScreen)
@ -114,9 +114,9 @@ function currentConversionInformation (metamaskState, state) {
value: currentFiat,
defaultValue: currentFiat,
}, [
h('option', {key: 'usd', value: 'usd'}, 'usd'),
h('option', {key: 'eur', value: 'eur'}, 'eur'),
h('option', {key: 'jpy', value: 'jpy'}, 'jpy'),
h('option', {key: 'USD', value: 'USD'}, 'USD'),
h('option', {key: 'EUR', value: 'EUR'}, 'EUR'),
h('option', {key: 'JPY', value: 'JPY'}, 'JPY'),
]
),
]

@ -14,7 +14,7 @@ function reduceMetamask (state, action) {
rpcTarget: 'https://rawtestrpc.metamask.io/',
identities: {},
unconfTxs: {},
currentFiat: 'PENDING',
currentFiat: 'USD',
conversionRate: 'N/A',
conversionDate: 'N/A',
}, state.metamask)

Loading…
Cancel
Save