From f6f7798828cd7f6325800b96d10a823a3338cdb0 Mon Sep 17 00:00:00 2001
From: Roman Rodov <roman.rodov@iag.com.au>
Date: Mon, 4 Sep 2017 11:09:50 +1000
Subject: Resolve merge conflicts for currency sort merge.

---
 ui/app/config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ui')

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}`)
     })
   ),
-- 
cgit