Resolve merge conflicts for currency sort merge.

7 years ago · f6f7798828
parent 51f0911f87
commit f6f7798828
1 changed files with 3 additions and 1 deletions
--- 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}`)
    })
  ),