Fix conflict

1 files changed, 6 insertions, 14 deletions

diff --git a/ui/app/components/account-panel.js b/ui/app/components/account-panel.js
index 5583d06ae..112b897d5 100644
--- a/ui/app/components/account-panel.js
+++ b/ui/app/components/account-panel.js
@@ -1,30 +1,24 @@
 const inherits = require('util').inherits
-const ethUtil = require('ethereumjs-util')
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const formatBalance = require('../util').formatBalance
-const Identicon = require('./identicon')
 const addressSummary = require('../util').addressSummary
 
 const Panel = require('./panel')
 
 module.exports = AccountPanel
 
-
 inherits(AccountPanel, Component)
-function AccountPanel() {
+function AccountPanel () {
   Component.call(this)
 }
 
-AccountPanel.prototype.render = function() {
+AccountPanel.prototype.render = function () {
   var state = this.props
   var identity = state.identity || {}
   var account = state.account || {}
   var isFauceting = state.isFauceting
 
-  var identicon = new Identicon(identity.address, 46).toString()
-  var identiconSrc = `data:image/png;base64,${identicon}`
-
   var panelOpts = {
     key: `accountPanel${identity.address}`,
     onClick: (event) => {
@@ -40,21 +34,19 @@ AccountPanel.prototype.render = function() {
         value: addressSummary(identity.address),
       },
       balanceOrFaucetingIndication(account, isFauceting),
-    ]
+    ],
   }
 
   return h(Panel, panelOpts,
   !state.onShowDetail ? null : h('.arrow-right.cursor-pointer', [
     h('i.fa.fa-chevron-right.fa-lg'),
   ]))
-
 }
 
-function balanceOrFaucetingIndication(account, isFauceting) {
-
+function balanceOrFaucetingIndication (account, isFauceting) {
   // Temporarily deactivating isFauceting indication
   // because it shows fauceting for empty restored accounts.
-  if (/*isFauceting*/ false) {
+  if (/* isFauceting*/ false) {
     return {
       key: 'Account is auto-funding.',
       value: 'Please wait.',
@@ -62,7 +54,7 @@ function balanceOrFaucetingIndication(account, isFauceting) {
   } else {
     return {
       key: 'BALANCE',
-      value: formatBalance(account.balance)
+      value: formatBalance(account.balance),
     }
   }
 }