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

Resolve merge conflicts for currency sort merge.

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

4
ui/app/config.js
View File

@ -167,7 +167,9 @@ function currentConversionInformation (metamaskState, state) {
state.dispatch(actions.setCurrentCurrency(newCurrency)) state.dispatch(actions.setCurrentCurrency(newCurrency))
}, },
defaultValue: currentCurrency, defaultValue: currentCurrency,
}, infuraCurrencies.map((currency) => { }, infuraCurrencies.sort((a, b) => {
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}`)
}) })
), ),