m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

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

Browse Source
This commit is contained in:
Kevin Serrano 2016-08-04 23:27:30 -07:00
parent ccd85d19e3
commit be76b05726
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/states.js
View File

File diff suppressed because one or more lines are too long

2
development/states/config.json
View File

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

8
ui/app/config.js
View File

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

2
ui/app/reducers/metamask.js
View File

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