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

Another merge conflict resolved.

Browse Source
This commit is contained in:
Roman Rodov 2017-09-08 10:56:43 +10:00 committed by Kevin Serrano
parent f6f7798828
commit 9af52ee1c5
No known key found for this signature in database
GPG Key ID: BF999DEFC7371BA1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/app/config.js
View File

@ -3,7 +3,9 @@ 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 infuraCurrencies = require('./infura-conversion.json').objects const infuraCurrencies = require('./infura-conversion.json').sort((a, b) => {
return a.name.toLocaleLowerCase().localeCompare(b.name.toLocaleLowerCase())
})
const validUrl = require('valid-url') const validUrl = require('valid-url')
const exportAsFile = require('./util').exportAsFile const exportAsFile = require('./util').exportAsFile
@ -167,9 +169,7 @@ function currentConversionInformation (metamaskState, state) {
state.dispatch(actions.setCurrentCurrency(newCurrency)) state.dispatch(actions.setCurrentCurrency(newCurrency))
}, },
defaultValue: currentCurrency, defaultValue: currentCurrency,
}, infuraCurrencies.sort((a, b) => { }, infuraCurrencies.map((currency) => {
return a.quote.name.toLocaleLowerCase().localeCompare(b.quote.name.toLocaleLowerCase())
}).map((currency) => {
return h('option', {key: currency.symbol, value: currency.symbol}, `${currency.quote.code.toUpperCase()} - ${currency.quote.name}`) return h('option', {key: currency.symbol, value: currency.symbol}, `${currency.quote.code.toUpperCase()} - ${currency.quote.name}`)
}) })
), ),