diff options
| author | Roman Rodov <roman.rodov@iag.com.au> | 2017-09-04 09:09:50 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-19 02:51:17 +0800 |
| commit | f6f7798828cd7f6325800b96d10a823a3338cdb0 (patch) | |
| tree | 5a7b2b29b13f2e4f52ffe4d00b7c151ef9996b8d /ui | |
| parent | 51f0911f8734745bed452e07f7bf1e5dc7211235 (diff) | |
| download | tangerine-wallet-browser-f6f7798828cd7f6325800b96d10a823a3338cdb0.tar.gz tangerine-wallet-browser-f6f7798828cd7f6325800b96d10a823a3338cdb0.tar.zst tangerine-wallet-browser-f6f7798828cd7f6325800b96d10a823a3338cdb0.zip | |
Resolve merge conflicts for currency sort merge.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/config.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/app/config.js b/ui/app/config.js index cc74b29db..06a1c2899 100644 --- a/ui/app/config.js +++ b/ui/app/config.js @@ -167,7 +167,9 @@ function currentConversionInformation (metamaskState, state) { state.dispatch(actions.setCurrentCurrency(newCurrency)) }, 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}`) }) ), |