From 9af52ee1c58db23728d9240f3d5ec472a6adf68f Mon Sep 17 00:00:00 2001
From: Roman Rodov <roman.rodov@iag.com.au>
Date: Fri, 8 Sep 2017 10:56:43 +1000
Subject: Another merge conflict resolved.

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

diff --git a/ui/app/config.js b/ui/app/config.js
index 06a1c2899..4b0218692 100644
--- a/ui/app/config.js
+++ b/ui/app/config.js
@@ -3,7 +3,9 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 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 exportAsFile = require('./util').exportAsFile
 
@@ -167,9 +169,7 @@ function currentConversionInformation (metamaskState, state) {
         state.dispatch(actions.setCurrentCurrency(newCurrency))
       },
       defaultValue: currentCurrency,
-    }, infuraCurrencies.sort((a, b) => {
-      return a.quote.name.toLocaleLowerCase().localeCompare(b.quote.name.toLocaleLowerCase())
-    }).map((currency) => {
+    }, infuraCurrencies.map((currency) => {
       return h('option', {key: currency.symbol, value: currency.symbol}, `${currency.quote.code.toUpperCase()} - ${currency.quote.name}`)
     })
   ),
-- 
cgit