Merge pull request #2530 from MetaMask/uat

Merge uat into NewUI-flat

36 files changed, 234 insertions, 254 deletions

diff --git a/ui/app/components/customize-gas-modal/gas-modal-card.js b/ui/app/components/customize-gas-modal/gas-modal-card.js
index de181dc67..23754d819 100644
--- a/ui/app/components/customize-gas-modal/gas-modal-card.js
+++ b/ui/app/components/customize-gas-modal/gas-modal-card.js
@@ -2,7 +2,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const InputNumber = require('../input-number.js')
-const GasSlider = require('./gas-slider.js')
+// const GasSlider = require('./gas-slider.js')
 
 module.exports = GasModalCard
 
@@ -13,8 +13,7 @@ function GasModalCard () {
 
 GasModalCard.prototype.render = function () {
   const {
-    memo,
-    identities,
+    // memo,
     onChange,
     unitLabel,
     value,
@@ -22,7 +21,7 @@ GasModalCard.prototype.render = function () {
     // max,
     step,
     title,
-    copy
+    copy,
   } = this.props
 
   return h('div.send-v2__gas-modal-card', [
@@ -48,8 +47,8 @@ GasModalCard.prototype.render = function () {
     //   min,
     //   onChange,
     // }),
-    
+
   ])
-    
+
 }
 
diff --git a/ui/app/components/customize-gas-modal/gas-slider.js b/ui/app/components/customize-gas-modal/gas-slider.js
index e76e96545..69fd6f985 100644
--- a/ui/app/components/customize-gas-modal/gas-slider.js
+++ b/ui/app/components/customize-gas-modal/gas-slider.js
@@ -1,50 +1,50 @@
-const Component = require('react').Component
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-
-module.exports = GasSlider
-
-inherits(GasSlider, Component)
-function GasSlider () {
-  Component.call(this)
-}
-
-GasSlider.prototype.render = function () {
-  const {
-    memo,
-    identities,
-    onChange,
-    unitLabel,
-    value,
-    id,
-    step,
-    max,
-    min,
-  } = this.props
-
-  return h('div.gas-slider', [
-
-    h('input.gas-slider__input', {
-      type: 'range',
-      step,
-      max,
-      min,
-      value,
-      id: 'gasSlider',
-      onChange: event => onChange(event.target.value),
-    }, []),
-
-    h('div.gas-slider__bar', [
-
-      h('div.gas-slider__low'),
-
-      h('div.gas-slider__mid'),
-
-      h('div.gas-slider__high'),
-
-    ]),
-    
-  ])
-    
-}
+// const Component = require('react').Component
+// const h = require('react-hyperscript')
+// const inherits = require('util').inherits
+
+// module.exports = GasSlider
+
+// inherits(GasSlider, Component)
+// function GasSlider () {
+//   Component.call(this)
+// }
+
+// GasSlider.prototype.render = function () {
+//   const {
+//     memo,
+//     identities,
+//     onChange,
+//     unitLabel,
+//     value,
+//     id,
+//     step,
+//     max,
+//     min,
+//   } = this.props
+
+//   return h('div.gas-slider', [
+
+//     h('input.gas-slider__input', {
+//       type: 'range',
+//       step,
+//       max,
+//       min,
+//       value,
+//       id: 'gasSlider',
+//       onChange: event => onChange(event.target.value),
+//     }, []),
+
+//     h('div.gas-slider__bar', [
+
+//       h('div.gas-slider__low'),
+
+//       h('div.gas-slider__mid'),
+
+//       h('div.gas-slider__high'),
+
+//     ]),
+
+//   ])
+
+// }
 
diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js
index 80ea98cc8..101a19d9f 100644
--- a/ui/app/components/customize-gas-modal/index.js
+++ b/ui/app/components/customize-gas-modal/index.js
@@ -2,7 +2,6 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const connect = require('react-redux').connect
-const ethUtil = require('ethereumjs-util')
 const actions = require('../../actions')
 const GasModalCard = require('./gas-modal-card')
 
@@ -59,7 +58,7 @@ function mapDispatchToProps (dispatch) {
   }
 }
 
-function getOriginalState(props) {
+function getOriginalState (props) {
   const gasPrice = props.gasPrice || MIN_GAS_PRICE_DEC
   const gasLimit = props.gasLimit || MIN_GAS_LIMIT_DEC
 
@@ -91,7 +90,7 @@ CustomizeGasModal.prototype.save = function (gasPrice, gasLimit, gasTotal) {
     updateGasPrice,
     updateGasLimit,
     hideModal,
-    updateGasTotal
+    updateGasTotal,
   } = this.props
 
   updateGasPrice(gasPrice)
@@ -127,9 +126,9 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
   })
 
   if (!balanceIsSufficient) {
-    error = 'Insufficient balance for current gas total' 
+    error = 'Insufficient balance for current gas total'
   }
-  
+
   const gasLimitTooLow = gasLimit && conversionGreaterThan(
     {
       value: MIN_GAS_LIMIT_DEC,
@@ -143,7 +142,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
   )
 
   if (gasLimitTooLow) {
-    error = 'Gas limit must be at least 21000' 
+    error = 'Gas limit must be at least 21000'
   }
 
   this.setState({ error })
@@ -191,7 +190,7 @@ CustomizeGasModal.prototype.convertAndSetGasPrice = function (newGasPrice) {
 }
 
 CustomizeGasModal.prototype.render = function () {
-  const { hideModal, conversionRate } = this.props
+  const { hideModal } = this.props
   const { gasPrice, gasLimit, gasTotal, error } = this.state
 
   const convertedGasPrice = conversionUtil(gasPrice, {
@@ -220,7 +219,7 @@ CustomizeGasModal.prototype.render = function () {
       ]),
 
       h('div.send-v2__customize-gas__body', {}, [
-        
+
         h(GasModalCard, {
           value: convertedGasPrice,
           min: MIN_GAS_PRICE_GWEI,
@@ -248,7 +247,7 @@ CustomizeGasModal.prototype.render = function () {
         error && h('div.send-v2__customize-gas__error-message', [
           error,
         ]),
-        
+
         h('div.send-v2__customize-gas__revert', {
           onClick: () => this.revert(),
         }, ['Revert']),
@@ -261,7 +260,7 @@ CustomizeGasModal.prototype.render = function () {
           h(`div.send-v2__customize-gas__save${error ? '__error' : ''}`, {
             onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal),
           }, ['SAVE']),
-        ])
+        ]),
 
       ]),
 
diff --git a/ui/app/components/dropdowns/account-dropdown-mini.js b/ui/app/components/dropdowns/account-dropdown-mini.js
index 96057d2b4..a3d41af90 100644
--- a/ui/app/components/dropdowns/account-dropdown-mini.js
+++ b/ui/app/components/dropdowns/account-dropdown-mini.js
@@ -1,7 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const Identicon = require('../identicon')
 const AccountListItem = require('../send/account-list-item')
 
 module.exports = AccountDropdownMini
@@ -38,13 +37,13 @@ AccountDropdownMini.prototype.renderDropdown = function () {
       ...accounts.map(account => h(AccountListItem, {
         account,
         displayBalance: false,
-        displayAddress: false, 
+        displayAddress: false,
         handleClick: () => {
           onSelect(account)
           closeDropdown()
-        }, 
+        },
         icon: this.getListItemIcon(account, selectedAccount),
-      }))
+      })),
 
     ]),
 
@@ -53,10 +52,8 @@ AccountDropdownMini.prototype.renderDropdown = function () {
 
 AccountDropdownMini.prototype.render = function () {
   const {
-    accounts,
     selectedAccount,
     openDropdown,
-    closeDropdown,
     dropdownOpen,
   } = this.props
 
@@ -67,12 +64,12 @@ AccountDropdownMini.prototype.render = function () {
       handleClick: openDropdown,
       displayBalance: false,
       displayAddress: false,
-      icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } })
+      icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } }),
     }),
 
     dropdownOpen && this.renderDropdown(),
 
   ])
-    
+
 }
 
diff --git a/ui/app/components/dropdowns/account-options-dropdown.js b/ui/app/components/dropdowns/account-options-dropdown.js
index 50e793d87..f74c0a2d4 100644
--- a/ui/app/components/dropdowns/account-options-dropdown.js
+++ b/ui/app/components/dropdowns/account-options-dropdown.js
@@ -19,7 +19,7 @@ AccountOptionsDropdown.prototype.render = function () {
   return h(AccountDropdowns, {
     enableAccountOptions: true,
     enableAccountsSelector: false,
-    selected: selectedAddress,
+    selected,
     network,
     identities,
     style: style || {},
diff --git a/ui/app/components/dropdowns/account-selection-dropdown.js b/ui/app/components/dropdowns/account-selection-dropdown.js
index 7a8502d18..2f6452b15 100644
--- a/ui/app/components/dropdowns/account-selection-dropdown.js
+++ b/ui/app/components/dropdowns/account-selection-dropdown.js
@@ -19,7 +19,7 @@ AccountSelectionDropdown.prototype.render = function () {
   return h(AccountDropdowns, {
     enableAccountOptions: false,
     enableAccountsSelector: true,
-    selected: selectedAddress,
+    selected,
     network,
     identities,
     style: style || {},
diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js
index e2eed1e4b..58326b13c 100644
--- a/ui/app/components/dropdowns/components/account-dropdowns.js
+++ b/ui/app/components/dropdowns/components/account-dropdowns.js
@@ -425,6 +425,21 @@ AccountDropdowns.propTypes = {
   identities: PropTypes.objectOf(PropTypes.object),
   selected: PropTypes.string,
   keyrings: PropTypes.array,
+  accounts: PropTypes.object,
+  menuItemStyles: PropTypes.object,
+  actions: PropTypes.object,
+  // actions.showAccountDetail: ,
+  useCssTransition: PropTypes.bool,
+  innerStyle: PropTypes.object,
+  sidebarOpen: PropTypes.bool,
+  dropdownWrapperStyle: PropTypes.string,
+  // actions.showAccountDetailModal: ,
+  network: PropTypes.number,
+  // actions.showExportPrivateKeyModal: ,
+  style: PropTypes.object,
+  enableAccountsSelector: PropTypes.bool,
+  enableAccountOption: PropTypes.bool,
+  enableAccountOptions: PropTypes.bool,
 }
 
 const mapDispatchToProps = (dispatch) => {
diff --git a/ui/app/components/dropdowns/components/dropdown.js b/ui/app/components/dropdowns/components/dropdown.js
index ca68e55f7..ddcb7998f 100644
--- a/ui/app/components/dropdowns/components/dropdown.js
+++ b/ui/app/components/dropdowns/components/dropdown.js
@@ -68,6 +68,7 @@ Dropdown.propTypes = {
   onClickOutside: PropTypes.func,
   innerStyle: PropTypes.object,
   useCssTransition: PropTypes.bool,
+  containerClassName: PropTypes.string,
 }
 
 class DropdownMenuItem extends Component {
diff --git a/ui/app/components/dropdowns/simple-dropdown.js b/ui/app/components/dropdowns/simple-dropdown.js
index 8cea78518..7bb48e57b 100644
--- a/ui/app/components/dropdowns/simple-dropdown.js
+++ b/ui/app/components/dropdowns/simple-dropdown.js
@@ -1,4 +1,5 @@
-const { Component, PropTypes } = require('react')
+const { Component } = require('react')
+const PropTypes = require('react').PropTypes
 const h = require('react-hyperscript')
 const classnames = require('classnames')
 const R = require('ramda')
diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js
index 7234a9b21..dc7a985e3 100644
--- a/ui/app/components/dropdowns/token-menu-dropdown.js
+++ b/ui/app/components/dropdowns/token-menu-dropdown.js
@@ -10,7 +10,7 @@ function mapDispatchToProps (dispatch) {
   return {
     showHideTokenConfirmationModal: (token) => {
       dispatch(actions.showModal({ name: 'HIDE_TOKEN_CONFIRMATION', token }))
-    }
+    },
   }
 }
 
@@ -36,14 +36,14 @@ TokenMenuDropdown.prototype.render = function () {
     }),
     h('div.token-menu-dropdown__container', {}, [
       h('div.token-menu-dropdown__options', {}, [
-        
+
         h('div.token-menu-dropdown__option', {
           onClick: (e) => {
             e.stopPropagation()
             showHideTokenConfirmationModal(this.props.token)
             this.props.onClose()
           },
-        }, 'Hide Token')
+        }, 'Hide Token'),
 
       ]),
     ]),
diff --git a/ui/app/components/loading.js b/ui/app/components/loading.js
index e6d841aa0..587212015 100644
--- a/ui/app/components/loading.js
+++ b/ui/app/components/loading.js
@@ -1,5 +1,6 @@
 const { Component } = require('react')
 const h = require('react-hyperscript')
+const PropTypes = require('react').PropTypes
 
 class LoadingIndicator extends Component {
   renderMessage () {
@@ -35,4 +36,8 @@ class LoadingIndicator extends Component {
   }
 }
 
+LoadingIndicator.propTypes = {
+  loadingMessage: PropTypes.string,
+}
+
 module.exports = LoadingIndicator
diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js
index e3c936702..4bf671834 100644
--- a/ui/app/components/modals/account-details-modal.js
+++ b/ui/app/components/modals/account-details-modal.js
@@ -4,7 +4,7 @@ const inherits = require('util').inherits
 const connect = require('react-redux').connect
 const actions = require('../../actions')
 const AccountModalContainer = require('./account-modal-container')
-const { getSelectedIdentity, getSelectedAddress } = require('../../selectors')
+const { getSelectedIdentity } = require('../../selectors')
 const genAccountLink = require('../../../lib/account-link.js')
 const QrView = require('../qr-code')
 const EditableLabel = require('../editable-label')
diff --git a/ui/app/components/modals/export-private-key-modal.js b/ui/app/components/modals/export-private-key-modal.js
index 2d8470634..193755df5 100644
--- a/ui/app/components/modals/export-private-key-modal.js
+++ b/ui/app/components/modals/export-private-key-modal.js
@@ -92,7 +92,6 @@ ExportPrivateKeyModal.prototype.renderButtons = function (privateKey, password,
 ExportPrivateKeyModal.prototype.render = function () {
   const {
     selectedIdentity,
-    network,
     warning,
     showAccountDetailModal,
     hideModal,
diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js
index e15dd6c1b..842081f40 100644
--- a/ui/app/components/modals/modal.js
+++ b/ui/app/components/modals/modal.js
@@ -220,7 +220,7 @@ Modal.prototype.render = function () {
 
   const children = modal.contents
   const modalStyle = modal[isMobileView() ? 'mobileModalStyle' : 'laptopModalStyle']
-  const contentStyle = modal.contentStyle || {};
+  const contentStyle = modal.contentStyle || {}
 
   return h(FadeModal,
     {
diff --git a/ui/app/components/modals/shapeshift-deposit-tx-modal.js b/ui/app/components/modals/shapeshift-deposit-tx-modal.js
index 1fd1ade00..24af5a0de 100644
--- a/ui/app/components/modals/shapeshift-deposit-tx-modal.js
+++ b/ui/app/components/modals/shapeshift-deposit-tx-modal.js
@@ -35,6 +35,6 @@ ShapeshiftDepositTxModal.prototype.render = function () {
   }, [
     h('div', {}, [
       h(QrView, {key: 'qr', Qr}),
-    ])
+    ]),
   ])
 }
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index 229d02e36..915818009 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -1,6 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
-const classnames = require('classnames');
+const classnames = require('classnames')
 const inherits = require('util').inherits
 const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
 
diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index 19826f47c..3b8ae7f7f 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -10,7 +10,6 @@ const clone = require('clone')
 const Identicon = require('../identicon')
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
-const hexToBn = require('../../../../app/scripts/lib/hex-to-bn')
 const {
   conversionUtil,
   multiplyCurrencies,
@@ -20,7 +19,6 @@ const {
 const { MIN_GAS_PRICE_HEX } = require('../send/send-constants')
 
 const {
-  getSelectedTokenExchangeRate,
   getTokenExchangeRate,
   getSelectedAddress,
 } = require('../../selectors')
@@ -36,7 +34,6 @@ function mapStateToProps (state, ownProps) {
     identities,
     currentCurrency,
   } = state.metamask
-  const accounts = state.metamask.accounts
   const selectedAddress = getSelectedAddress(state)
   const tokenExchangeRate = getTokenExchangeRate(state, symbol)
 
@@ -147,7 +144,7 @@ ConfirmSendToken.prototype.getData = function () {
   const { value } = params[0] || {}
   const txMeta = this.gatherTxMeta()
   const txParams = txMeta.txParams || {}
-  
+
   return {
     from: {
       address: txParams.from,
@@ -245,7 +242,6 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
 ConfirmSendToken.prototype.render = function () {
   const { backToAccountDetail, selectedAddress } = this.props
   const txMeta = this.gatherTxMeta()
-  const txParams = txMeta.txParams || {}
 
   const {
     from: {
diff --git a/ui/app/components/send-token/index.js b/ui/app/components/send-token/index.js
index a95a0a6d8..99d078251 100644
--- a/ui/app/components/send-token/index.js
+++ b/ui/app/components/send-token/index.js
@@ -144,16 +144,15 @@ SendTokenScreen.prototype.validate = function () {
 }
 
 SendTokenScreen.prototype.setErrorsFor = function (field) {
-  const { balance, selectedToken } = this.props
   const { errors: previousErrors } = this.state
 
   const {
     isValid,
-    errors: newErrors
+    errors: newErrors,
   } = this.validate()
 
   const nextErrors = Object.assign({}, previousErrors, {
-    [field]: newErrors[field] || null
+    [field]: newErrors[field] || null,
   })
 
   if (!isValid) {
@@ -167,7 +166,7 @@ SendTokenScreen.prototype.setErrorsFor = function (field) {
 SendTokenScreen.prototype.clearErrorsFor = function (field) {
   const { errors: previousErrors } = this.state
   const nextErrors = Object.assign({}, previousErrors, {
-    [field]: null
+    [field]: null,
   })
 
   this.setState({
@@ -429,7 +428,7 @@ SendTokenScreen.prototype.render = function () {
       this.renderAmountInput(),
       this.renderGasInput(),
       this.renderMemoInput(),
-      warning && h('div.send-screen-input-wrapper--error', {}, 
+      warning && h('div.send-screen-input-wrapper--error', {},
         h('div.send-screen-input-wrapper__error-message', [
           warning,
         ])
diff --git a/ui/app/components/send/account-list-item.js b/ui/app/components/send/account-list-item.js
index cc514cbd4..2378a4671 100644
--- a/ui/app/components/send/account-list-item.js
+++ b/ui/app/components/send/account-list-item.js
@@ -68,4 +68,4 @@ AccountListItem.prototype.render = function () {
     }, name),
 
   ])
-}
\ No newline at end of file
+}
diff --git a/ui/app/components/send/currency-display.js b/ui/app/components/send/currency-display.js
index 5dba6a8dd..45986e371 100644
--- a/ui/app/components/send/currency-display.js
+++ b/ui/app/components/send/currency-display.js
@@ -1,7 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const Identicon = require('../identicon')
 const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
 
 module.exports = CurrencyDisplay
@@ -48,8 +47,6 @@ CurrencyDisplay.prototype.render = function () {
     conversionRate,
     primaryCurrency,
     convertedCurrency,
-    convertedPrefix = '',
-    placeholder = '0',
     readOnly = false,
     inError = false,
     value: initValue,
@@ -74,7 +71,7 @@ CurrencyDisplay.prototype.render = function () {
     conversionRate,
   })
 
-  const inputSizeMultiplier = readOnly ? 1 : 1.2;
+  const inputSizeMultiplier = readOnly ? 1 : 1.2
 
   return h('div', {
     className,
@@ -98,15 +95,13 @@ CurrencyDisplay.prototype.render = function () {
 
             if (newValue === '') {
               newValue = '0'
-            }
-            else if (newValue.match(/^0[1-9]$/)) {
+            } else if (newValue.match(/^0[1-9]$/)) {
               newValue = newValue.match(/[1-9]/)[0]
             }
 
             if (newValue && !isValidInput(newValue)) {
               event.preventDefault()
-            }
-            else {
+            } else {
               validate(this.getAmount(newValue))
               this.setState({ value: newValue })
             }
@@ -125,6 +120,6 @@ CurrencyDisplay.prototype.render = function () {
     }, `${convertedValue} ${convertedCurrency.toUpperCase()}`),
 
   ])
-    
+
 }
 
diff --git a/ui/app/components/send/eth-fee-display.js b/ui/app/components/send/eth-fee-display.js
index 8b4cec16c..9eda5ec62 100644
--- a/ui/app/components/send/eth-fee-display.js
+++ b/ui/app/components/send/eth-fee-display.js
@@ -30,8 +30,8 @@ EthFeeDisplay.prototype.render = function () {
       color: '#5d5d5d',
       fontSize: '16px',
       fontFamily: 'DIN OT',
-      lineHeight: '22.4px'
-    }
+      lineHeight: '22.4px',
+    },
   })
 }
 
diff --git a/ui/app/components/send/from-dropdown.js b/ui/app/components/send/from-dropdown.js
index 6f2b9da68..bcae5ede8 100644
--- a/ui/app/components/send/from-dropdown.js
+++ b/ui/app/components/send/from-dropdown.js
@@ -1,7 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const Identicon = require('../identicon')
 const AccountListItem = require('./account-list-item')
 
 module.exports = FromDropdown
@@ -36,13 +35,13 @@ FromDropdown.prototype.renderDropdown = function () {
     h('div.send-v2__from-dropdown__list', {}, [
 
       ...accounts.map(account => h(AccountListItem, {
-        account, 
+        account,
         handleClick: () => {
           onSelect(account)
           closeDropdown()
-        }, 
+        },
         icon: this.getListItemIcon(account, selectedAccount),
-      }))
+      })),
 
     ]),
 
@@ -51,10 +50,8 @@ FromDropdown.prototype.renderDropdown = function () {
 
 FromDropdown.prototype.render = function () {
   const {
-    accounts,
     selectedAccount,
     openDropdown,
-    closeDropdown,
     dropdownOpen,
   } = this.props
 
@@ -63,12 +60,12 @@ FromDropdown.prototype.render = function () {
     h(AccountListItem, {
       account: selectedAccount,
       handleClick: openDropdown,
-      icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } })
+      icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } }),
     }),
 
     dropdownOpen && this.renderDropdown(),
 
   ])
-    
+
 }
 
diff --git a/ui/app/components/send/gas-fee-display-v2.js b/ui/app/components/send/gas-fee-display-v2.js
index 0e23b63ac..806c33f0a 100644
--- a/ui/app/components/send/gas-fee-display-v2.js
+++ b/ui/app/components/send/gas-fee-display-v2.js
@@ -23,21 +23,20 @@ GasFeeDisplay.prototype.render = function () {
 
     gasTotal
       ? h(CurrencyDisplay, {
-        primaryCurrency: 'ETH',
+        primaryCurrency,
         convertedCurrency,
         value: gasTotal,
         conversionRate,
         convertedPrefix: '$',
         readOnly: true,
       })
-      : h('div.currency-display', 'Loading...')
-    ,
+      : h('div.currency-display', 'Loading...'),
 
     h('div.send-v2__sliders-icon-container', {
       onClick,
     }, [
       h('i.fa.fa-sliders.send-v2__sliders-icon'),
-    ])
+    ]),
 
   ])
 }
diff --git a/ui/app/components/send/memo-textarea.js b/ui/app/components/send/memo-textarea.js
index 4005b9493..f4bb24bf8 100644
--- a/ui/app/components/send/memo-textarea.js
+++ b/ui/app/components/send/memo-textarea.js
@@ -1,33 +1,33 @@
-const Component = require('react').Component
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-const Identicon = require('../identicon')
-
-module.exports = MemoTextArea
-
-inherits(MemoTextArea, Component)
-function MemoTextArea () {
-  Component.call(this)
-}
-
-MemoTextArea.prototype.render = function () {
-  const { memo, identities, onChange } = this.props
-
-  return h('div.send-v2__memo-text-area', [
-
-    h('textarea.send-v2__memo-text-area__input', {
-      placeholder: 'Optional',
-      value: memo,
-      onChange,
-      // onBlur: () => {
-      //   this.setErrorsFor('memo')
-      // },
-      onFocus: event => {
-        // this.clearErrorsFor('memo')
-      },
-    }),
-
-  ])
-    
-}
+// const Component = require('react').Component
+// const h = require('react-hyperscript')
+// const inherits = require('util').inherits
+// const Identicon = require('../identicon')
+
+// module.exports = MemoTextArea
+
+// inherits(MemoTextArea, Component)
+// function MemoTextArea () {
+//   Component.call(this)
+// }
+
+// MemoTextArea.prototype.render = function () {
+//   const { memo, identities, onChange } = this.props
+
+//   return h('div.send-v2__memo-text-area', [
+
+//     h('textarea.send-v2__memo-text-area__input', {
+//       placeholder: 'Optional',
+//       value: memo,
+//       onChange,
+//       // onBlur: () => {
+//       //   this.setErrorsFor('memo')
+//       // },
+//       onFocus: event => {
+//         // this.clearErrorsFor('memo')
+//       },
+//     }),
+
+//   ])
+
+// }
 
diff --git a/ui/app/components/send/send-constants.js b/ui/app/components/send/send-constants.js
index 471e01e2a..0a4f85bc9 100644
--- a/ui/app/components/send/send-constants.js
+++ b/ui/app/components/send/send-constants.js
@@ -1,5 +1,4 @@
 const ethUtil = require('ethereumjs-util')
-const Identicon = require('../identicon')
 const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
 
 const MIN_GAS_PRICE_HEX = (100000000).toString(16)
diff --git a/ui/app/components/send/send-utils.js b/ui/app/components/send/send-utils.js
index bf096d610..6ec04a223 100644
--- a/ui/app/components/send/send-utils.js
+++ b/ui/app/components/send/send-utils.js
@@ -1,6 +1,6 @@
 const { addCurrencies, conversionGreaterThan } = require('../../conversion-util')
 
-function isBalanceSufficient({
+function isBalanceSufficient ({
   amount,
   gasTotal,
   balance,
@@ -27,7 +27,6 @@ function isBalanceSufficient({
       fromNumericBase: 'hex',
       conversionRate: amountConversionRate,
       fromCurrency: selectedToken || primaryCurrency,
-      conversionRate: amountConversionRate,
     },
   )
 
@@ -36,4 +35,4 @@ function isBalanceSufficient({
 
 module.exports = {
   isBalanceSufficient,
-}
\ No newline at end of file
+}
diff --git a/ui/app/components/send/send-v2-container.js b/ui/app/components/send/send-v2-container.js
index fb2634de2..5a6e83ae6 100644
--- a/ui/app/components/send/send-v2-container.js
+++ b/ui/app/components/send/send-v2-container.js
@@ -3,17 +3,12 @@ const actions = require('../../actions')
 const abi = require('ethereumjs-abi')
 const SendEther = require('../../send-v2')
 
-const { multiplyCurrencies } = require('../../conversion-util')
-
 const {
   accountsWithSendEtherInfoSelector,
   getCurrentAccountWithSendEtherInfo,
   conversionRateSelector,
   getSelectedToken,
-  getSelectedTokenExchangeRate,
   getSelectedAddress,
-  getGasPrice,
-  getGasLimit,
   getAddressBook,
   getSendFrom,
   getCurrentCurrency,
@@ -26,12 +21,11 @@ function mapStateToProps (state) {
   const fromAccounts = accountsWithSendEtherInfoSelector(state)
   const selectedAddress = getSelectedAddress(state)
   const selectedToken = getSelectedToken(state)
-  const tokenExchangeRates = state.metamask.tokenExchangeRates
   const conversionRate = conversionRateSelector(state)
 
-  let data;
-  let primaryCurrency;
-  let tokenToFiatRate;
+  let data
+  let primaryCurrency
+  let tokenToFiatRate
   if (selectedToken) {
     data = Array.prototype.map.call(
       abi.rawEncode(['address', 'uint256'], [selectedAddress, '0x0']),
@@ -76,6 +70,6 @@ function mapDispatchToProps (dispatch) {
     updateSendMemo: newMemo => dispatch(actions.updateSendMemo(newMemo)),
     updateSendErrors: newError => dispatch(actions.updateSendErrors(newError)),
     goHome: () => dispatch(actions.goHome()),
-    clearSend: () => dispatch(actions.clearSend())
+    clearSend: () => dispatch(actions.clearSend()),
   }
 }
diff --git a/ui/app/components/send/to-autocomplete.js b/ui/app/components/send/to-autocomplete.js
index fdb093baa..fef8d5ccb 100644
--- a/ui/app/components/send/to-autocomplete.js
+++ b/ui/app/components/send/to-autocomplete.js
@@ -1,7 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const Identicon = require('../identicon')
 const AccountListItem = require('./account-list-item')
 
 module.exports = ToAutoComplete
@@ -23,7 +22,6 @@ ToAutoComplete.prototype.getListItemIcon = function (listItemAddress, toAddress)
 
 ToAutoComplete.prototype.renderDropdown = function () {
   const {
-    accounts,
     closeDropdown,
     onChange,
     to,
@@ -39,15 +37,15 @@ ToAutoComplete.prototype.renderDropdown = function () {
     h('div.send-v2__from-dropdown__list', {}, [
 
       ...accountsToRender.map(account => h(AccountListItem, {
-        account, 
+        account,
         handleClick: () => {
           onChange(account.address)
           closeDropdown()
-        }, 
+        },
         icon: this.getListItemIcon(account.address, to),
         displayBalance: false,
         displayAddress: true,
-      }))
+      })),
 
     ]),
 
@@ -69,8 +67,7 @@ ToAutoComplete.prototype.handleInputEvent = function (event = {}, cb) {
     this.setState({ accountsToRender: [] })
     event.target && event.target.select()
     closeDropdown()
-  }
-  else {
+  } else {
     this.setState({ accountsToRender: matchingAccounts })
     openDropdown()
   }
@@ -86,9 +83,6 @@ ToAutoComplete.prototype.componentDidUpdate = function (nextProps, nextState) {
 ToAutoComplete.prototype.render = function () {
   const {
     to,
-    accounts,
-    openDropdown,
-    closeDropdown,
     dropdownOpen,
     onChange,
     inError,
@@ -98,13 +92,13 @@ ToAutoComplete.prototype.render = function () {
 
     h('input.send-v2__to-autocomplete__input', {
       placeholder: 'Recipient Address',
-      className: inError ? `send-v2__error-border` : '', 
+      className: inError ? `send-v2__error-border` : '',
       value: to,
       onChange: event => onChange(event.target.value),
       onFocus: event => this.handleInputEvent(event),
       style: {
         borderColor: inError ? 'red' : null,
-      }
+      },
     }),
 
     !to && h(`i.fa.fa-caret-down.fa-lg.send-v2__to-autocomplete__down-caret`, {
diff --git a/ui/app/components/send/usd-fee-display.js b/ui/app/components/send/usd-fee-display.js
index 6ee38f1b5..4cf31a493 100644
--- a/ui/app/components/send/usd-fee-display.js
+++ b/ui/app/components/send/usd-fee-display.js
@@ -28,8 +28,8 @@ USDFeeDisplay.prototype.render = function () {
       color: '#5d5d5d',
       fontSize: '16px',
       fontFamily: 'DIN OT',
-      lineHeight: '22.4px'
-    }
+      lineHeight: '22.4px',
+    },
   })
 }
 
diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js
index e617fdbd6..c5cc23aa8 100644
--- a/ui/app/components/signature-request.js
+++ b/ui/app/components/signature-request.js
@@ -6,9 +6,7 @@ const connect = require('react-redux').connect
 const ethUtil = require('ethereumjs-util')
 const classnames = require('classnames')
 
-const PendingTxDetails = require('./pending-personal-msg-details')
 const AccountDropdownMini = require('./dropdowns/account-dropdown-mini')
-const BinaryRenderer = require('./binary-renderer')
 
 const actions = require('../actions')
 const { conversionUtil } = require('../conversion-util')
@@ -29,13 +27,13 @@ function mapStateToProps (state) {
     requester: null,
     requesterAddress: null,
     accounts: accountsWithSendEtherInfoSelector(state),
-    conversionRate: conversionRateSelector(state)
+    conversionRate: conversionRateSelector(state),
   }
 }
 
 function mapDispatchToProps (dispatch) {
   return {
-    goHome: () => dispatch(actions.goHome())
+    goHome: () => dispatch(actions.goHome()),
   }
 }
 
@@ -86,7 +84,7 @@ SignatureRequest.prototype.renderAccountDropdown = function () {
       dropdownOpen: accountDropdownOpen,
       openDropdown: () => this.setState({ accountDropdownOpen: true }),
       closeDropdown: () => this.setState({ accountDropdownOpen: false }),
-    })
+    }),
 
   ])
 }
@@ -115,7 +113,7 @@ SignatureRequest.prototype.renderAccountInfo = function () {
   return h('div.request-signature__account-info', [
 
     this.renderAccountDropdown(),
-    
+
     this.renderRequestIcon(),
 
     this.renderBalance(),
@@ -130,18 +128,16 @@ SignatureRequest.prototype.renderRequestIcon = function () {
     h(Identicon, {
       diameter: 40,
       address: requesterAddress,
-    })
+    }),
   ])
 }
 
 SignatureRequest.prototype.renderRequestInfo = function () {
-  const { requester } = this.props
-
   return h('div.request-signature__request-info', [
 
     h('div.request-signature__headline', [
       `Your signature is being requested`,
-    ])
+    ]),
 
   ])
 }
@@ -165,11 +161,9 @@ SignatureRequest.prototype.renderBody = function () {
 
   if (type === 'personal_sign') {
     rows = [{ name: 'Message', value: this.msgHexToText(data) }]
-  }
-  else if (type === 'eth_signTypedData') {
+  } else if (type === 'eth_signTypedData') {
     rows = data
-  }
-  else if (type === 'eth_sign') {
+  } else if (type === 'eth_sign') {
     rows = [{ name: 'Message', value: data }]
     notice = `Signing this message can have
     dangerous side effects. Only sign messages from
@@ -187,14 +181,14 @@ SignatureRequest.prototype.renderBody = function () {
       className: classnames({
         'request-signature__notice': type === 'personal_sign' || type === 'eth_signTypedData',
         'request-signature__warning': type === 'eth_sign',
-      })
+      }),
     }, [notice]),
 
     h('div.request-signature__rows', [
 
       ...rows.map(({ name, value }) => {
         return h('div.request-signature__row', [
-          h('div.request-signature__row-title', [`${name}:`]), 
+          h('div.request-signature__row-title', [`${name}:`]),
           h('div.request-signature__row-value', value),
         ])
       }),
@@ -206,7 +200,6 @@ SignatureRequest.prototype.renderBody = function () {
 
 SignatureRequest.prototype.renderFooter = function () {
   const {
-    goHome,
     signPersonalMessage,
     signTypedMessage,
     cancelPersonalMessage,
@@ -223,12 +216,10 @@ SignatureRequest.prototype.renderFooter = function () {
   if (type === 'personal_sign') {
     cancel = cancelPersonalMessage
     sign = signPersonalMessage
-  }
-  else if (type === 'eth_signTypedData') {
+  } else if (type === 'eth_signTypedData') {
     cancel = cancelTypedMessage
     sign = signTypedMessage
-  }
-  else if (type === 'eth_sign') {
+  } else if (type === 'eth_sign') {
     cancel = cancelMessage
     sign = signMessage
   }
diff --git a/ui/app/components/tab-bar.js b/ui/app/components/tab-bar.js
index fe4076ed0..0edced119 100644
--- a/ui/app/components/tab-bar.js
+++ b/ui/app/components/tab-bar.js
@@ -1,5 +1,6 @@
 const { Component } = require('react')
 const h = require('react-hyperscript')
+const PropTypes = require('react').PropTypes
 const classnames = require('classnames')
 
 class TabBar extends Component {
@@ -37,4 +38,10 @@ class TabBar extends Component {
   }
 }
 
+TabBar.propTypes = {
+  defaultTab: PropTypes.string,
+  tabs: PropTypes.array,
+  tabSelected: PropTypes.func,
+}
+
 module.exports = TabBar
diff --git a/ui/app/components/token-cell.js b/ui/app/components/token-cell.js
index f55e23f9e..b40c0ec0d 100644
--- a/ui/app/components/token-cell.js
+++ b/ui/app/components/token-cell.js
@@ -67,11 +67,11 @@ TokenCell.prototype.render = function () {
     currentCurrency,
     // userAddress,
   } = props
-  
-  const pair = `${symbol.toLowerCase()}_eth`;
 
-  let currentTokenToFiatRate;
-  let currentTokenInFiat;
+  const pair = `${symbol.toLowerCase()}_eth`
+
+  let currentTokenToFiatRate
+  let currentTokenInFiat
   let formattedFiat = ''
 
   if (tokenExchangeRates[pair]) {
@@ -86,11 +86,11 @@ TokenCell.prototype.render = function () {
       numberOfDecimals: 2,
       conversionRate: currentTokenToFiatRate,
     })
-    formattedFiat = `${currentTokenInFiat} ${currentCurrency.toUpperCase()}`;
+    formattedFiat = `${currentTokenInFiat} ${currentCurrency.toUpperCase()}`
   }
 
   const showFiat = Boolean(currentTokenInFiat) && currentCurrency.toUpperCase() !== symbol
- 
+
   return (
     h('div.token-list-item', {
       className: `token-list-item ${selectedTokenAddress === address ? 'token-list-item--active' : ''}`,
diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js
index 4959f1cd5..b6a27fd5a 100644
--- a/ui/app/components/token-list.js
+++ b/ui/app/components/token-list.js
@@ -3,7 +3,6 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const TokenTracker = require('eth-token-tracker')
 const TokenCell = require('./token-cell.js')
-const normalizeAddress = require('eth-sig-util').normalize
 const connect = require('react-redux').connect
 const selectors = require('../selectors')
 
@@ -38,6 +37,7 @@ function TokenList () {
 }
 
 TokenList.prototype.render = function () {
+  const { userAddress } = this.props
   const state = this.state
   const { tokens, isLoading, error } = state
 
@@ -162,15 +162,15 @@ TokenList.prototype.componentWillUnmount = function () {
   this.tracker.stop()
 }
 
-function uniqueMergeTokens (tokensA, tokensB = []) {
-  const uniqueAddresses = []
-  const result = []
-  tokensA.concat(tokensB).forEach((token) => {
-    const normal = normalizeAddress(token.address)
-    if (!uniqueAddresses.includes(normal)) {
-      uniqueAddresses.push(normal)
-      result.push(token)
-    }
-  })
-  return result
-}
+// function uniqueMergeTokens (tokensA, tokensB = []) {
+//   const uniqueAddresses = []
+//   const result = []
+//   tokensA.concat(tokensB).forEach((token) => {
+//     const normal = normalizeAddress(token.address)
+//     if (!uniqueAddresses.includes(normal)) {
+//       uniqueAddresses.push(normal)
+//       result.push(token)
+//     }
+//   })
+//   return result
+// }
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 21f2b8236..255f0e5eb 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -142,7 +142,7 @@ function formatDate (date) {
 }
 
 function renderErrorOrWarning (transaction) {
-  const { status, err, warning } = transaction
+  const { status } = transaction
 
   // show rejected
   if (status === 'rejected') {
@@ -151,31 +151,31 @@ function renderErrorOrWarning (transaction) {
   if (transaction.err || transaction.warning) {
     const { err, warning = {} } = transaction
     const errFirst = !!((err && warning) || err)
-    const message = errFirst ? err.message : warning.message
 
     errFirst ? err.message : warning.message
 
-  // show error
-  if (err) {
-    const message = err.message || ''
-    return (
-        h(Tooltip, {
-          title: message,
-          position: 'bottom',
-        }, [
-          h(`span.error`, ` (Failed)`),
-        ])
-    )
-  }
-
-  // show warning
-  if (warning) {
-    const message = warning.message
-    return h(Tooltip, {
-      title: message,
-      position: 'bottom',
-    }, [
-      h(`span.warning`, ` (Warning)`),
-    ])
+    // show error
+    if (err) {
+      const message = err.message || ''
+      return (
+          h(Tooltip, {
+            title: message,
+            position: 'bottom',
+          }, [
+            h(`span.error`, ` (Failed)`),
+          ])
+      )
+    }
+
+    // show warning
+    if (warning) {
+      const message = warning.message
+      return h(Tooltip, {
+        title: message,
+        position: 'bottom',
+      }, [
+        h(`span.warning`, ` (Warning)`),
+      ])
+    }
   }
 }
diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js
index a59b6509b..26de19f15 100644
--- a/ui/app/components/tx-list-item.js
+++ b/ui/app/components/tx-list-item.js
@@ -6,7 +6,6 @@ const classnames = require('classnames')
 const abi = require('human-standard-token-abi')
 const abiDecoder = require('abi-decoder')
 abiDecoder.addABI(abi)
-const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
 const Identicon = require('./identicon')
 const contractMap = require('eth-contract-metadata')
 
@@ -127,7 +126,6 @@ TxListItem.prototype.getTokenInfo = async function () {
 TxListItem.prototype.getSendTokenTotal = async function () {
   const {
     txParams = {},
-    tokens,
     conversionRate,
     tokenExchangeRates,
     currentCurrency,
@@ -140,8 +138,8 @@ TxListItem.prototype.getSendTokenTotal = async function () {
   const multiplier = Math.pow(10, Number(decimals || 0))
   const total = Number(value / multiplier)
 
-  const pair = symbol && `${symbol.toLowerCase()}_eth`;
-  
+  const pair = symbol && `${symbol.toLowerCase()}_eth`
+
   let tokenToFiatRate
   let totalInFiat
 
@@ -244,6 +242,6 @@ TxListItem.prototype.render = function () {
 
         ]),
       ]),
-    ]) // holding on icon from design
+    ]), // holding on icon from design
   ])
 }
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index 2f6c1fee8..70722f43e 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -6,7 +6,7 @@ const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
 const selectors = require('../selectors')
 const TxListItem = require('./tx-list-item')
 const ShiftListItem = require('./shift-list-item')
-const { formatBalance, formatDate } = require('../util')
+const { formatDate } = require('../util')
 const { showConfTxPage } = require('../actions')
 const classnames = require('classnames')
 const { tokenInfoGetter } = require('../token-util')
@@ -22,7 +22,7 @@ function mapStateToProps (state) {
 
 function mapDispatchToProps (dispatch) {
   return {
-    showConfTxPage: ({ id }) => dispatch(showConfTxPage({ id }))
+    showConfTxPage: ({ id }) => dispatch(showConfTxPage({ id })),
   }
 }
 
@@ -36,9 +36,6 @@ TxList.prototype.componentWillMount = function () {
 }
 
 TxList.prototype.render = function () {
-
-  const { txsToRender, showConfTxPage } = this.props
-
   return h('div.flex-column.tx-list-container', {}, [
 
     h('div.flex-row.tx-list-header-wrapper', [
@@ -98,7 +95,6 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
     txParams: transaction.txParams,
     transactionStatus,
     transActionId,
-    key: transActionId,
     dateString,
     address,
     transactionAmount,
@@ -107,7 +103,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
     tokenInfoGetter: this.tokenInfoGetter,
   }
 
-  const isUnapproved = transactionStatus === 'unapproved';
+  const isUnapproved = transactionStatus === 'unapproved'
 
   if (isUnapproved) {
     opts.onClick = () => showConfTxPage({id: transActionId})