Enable indent linting via ESLint (#6936)

* Enable indent linting via ESLint

* yarn run lint:fix

65 files changed, 820 insertions, 820 deletions

diff --git a/ui/app/components/app/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js b/ui/app/components/app/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js
index c8507985d..95ca8144a 100644
--- a/ui/app/components/app/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js
+++ b/ui/app/components/app/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js
@@ -27,7 +27,7 @@ describe('Confirm Detail Row Component', function () {
     )
   })
 
-	describe('render', () => {
+  describe('render', () => {
     it('should render a div with a confirm-detail-row class', () => {
       assert.equal(wrapper.find('div.confirm-detail-row').length, 1)
     })
@@ -60,5 +60,5 @@ describe('Confirm Detail Row Component', function () {
       wrapper.find('.confirm-detail-row__header-text').props().onClick()
       assert.equal(assert.equal(propsMethodSpies.onHeaderClick.callCount, 1))
     })
-	})
+  })
 })
diff --git a/ui/app/components/app/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js b/ui/app/components/app/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
index 8327f997b..c24d24b17 100755
--- a/ui/app/components/app/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
+++ b/ui/app/components/app/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
@@ -6,9 +6,9 @@ const ConfirmPageContainerNavigation = props => {
 
   return (
     <div className="confirm-page-container-navigation"
-        style={{
-          display: showNavigation ? 'flex' : 'none',
-        }}
+      style={{
+        display: showNavigation ? 'flex' : 'none',
+      }}
     >
       <div className="confirm-page-container-navigation__container"
         style={{
diff --git a/ui/app/components/app/confirm-page-container/confirm-page-container.component.js b/ui/app/components/app/confirm-page-container/confirm-page-container.component.js
index 326e4f83e..1ff797fa1 100644
--- a/ui/app/components/app/confirm-page-container/confirm-page-container.component.js
+++ b/ui/app/components/app/confirm-page-container/confirm-page-container.component.js
@@ -106,16 +106,16 @@ export default class ConfirmPageContainer extends Component {
     return (
       <div className="page-container">
         <ConfirmPageContainerNavigation
-            totalTx={totalTx}
-            positionOfCurrentTx={positionOfCurrentTx}
-            nextTxId={nextTxId}
-            prevTxId={prevTxId}
-            showNavigation={showNavigation}
-            onNextTx={(txId) => onNextTx(txId)}
-            firstTx={firstTx}
-            lastTx={lastTx}
-            ofText={ofText}
-            requestsWaitingText={requestsWaitingText}
+          totalTx={totalTx}
+          positionOfCurrentTx={positionOfCurrentTx}
+          nextTxId={nextTxId}
+          prevTxId={prevTxId}
+          showNavigation={showNavigation}
+          onNextTx={(txId) => onNextTx(txId)}
+          firstTx={firstTx}
+          lastTx={lastTx}
+          ofText={ofText}
+          requestsWaitingText={requestsWaitingText}
         />
         <ConfirmPageContainerHeader
           showEdit={showEdit}
diff --git a/ui/app/components/app/dropdowns/account-details-dropdown.js b/ui/app/components/app/dropdowns/account-details-dropdown.js
index a4c33620a..cf2aa8ae8 100644
--- a/ui/app/components/app/dropdowns/account-details-dropdown.js
+++ b/ui/app/components/app/dropdowns/account-details-dropdown.js
@@ -59,7 +59,7 @@ AccountDetailsDropdown.prototype.render = function () {
     viewOnEtherscan,
     showRemoveAccountConfirmationModal,
     rpcPrefs,
-   } = this.props
+  } = this.props
 
   const address = selectedIdentity.address
 
diff --git a/ui/app/components/app/dropdowns/network-dropdown.js b/ui/app/components/app/dropdowns/network-dropdown.js
index 7a656d5b9..e6a24ef11 100644
--- a/ui/app/components/app/dropdowns/network-dropdown.js
+++ b/ui/app/components/app/dropdowns/network-dropdown.js
@@ -353,12 +353,12 @@ NetworkDropdown.prototype.renderCommonRpc = function (rpcListDetail, provider) {
             },
           }, nickname || rpc),
           h('i.fa.fa-times.delete',
-          {
-            onClick: (e) => {
-              e.stopPropagation()
-              props.delRpcTarget(rpc)
-            },
-          }),
+            {
+              onClick: (e) => {
+                e.stopPropagation()
+                props.delRpcTarget(rpc)
+              },
+            }),
         ]
       )
     }
diff --git a/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.component.js b/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.component.js
index d942fd150..7b87b3033 100644
--- a/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.component.js
+++ b/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.component.js
@@ -131,8 +131,8 @@ export default class AdvancedTabContent extends Component {
         </div>
         { isInError
           ? <div className={`advanced-gas-inputs__gas-edit-row__${errorType}-text`}>
-              { errorText }
-            </div>
+            { errorText }
+          </div>
           : null }
       </div>
     )
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js b/ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js
index 3924d26ad..88d28b9ed 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js
@@ -104,8 +104,8 @@ export default class AdvancedTabContent extends Component {
         </div>
         { isInError
           ? <div className={`advanced-tab__gas-edit-row__${errorType}-text`}>
-              { errorText }
-            </div>
+            { errorText }
+          </div>
           : null }
       </div>
     )
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/basic-tab-content/basic-tab-content.component.js b/ui/app/components/app/gas-customization/gas-modal-page-container/basic-tab-content/basic-tab-content.component.js
index 5f3925fa5..931611460 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/basic-tab-content/basic-tab-content.component.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/basic-tab-content/basic-tab-content.component.js
@@ -21,12 +21,12 @@ export default class BasicTabContent extends Component {
         <div className="basic-tab-content__title">{ t('estimatedProcessingTimes') }</div>
         <div className="basic-tab-content__blurb">{ t('selectAHigherGasFee') }</div>
         {!gasPriceButtonGroupProps.loading
-            ? <GasPriceButtonGroup
-              className="gas-price-button-group--alt"
-              showCheck={true}
-              {...gasPriceButtonGroupProps}
-            />
-            : <Loading />
+          ? <GasPriceButtonGroup
+            className="gas-price-button-group--alt"
+            showCheck={true}
+            {...gasPriceButtonGroupProps}
+          />
+          : <Loading />
         }
         <div className="basic-tab-content__footer-blurb">{ t('acceleratingATransaction') }</div>
       </div>
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js b/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
index e18c1067e..5e557f660 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
@@ -47,7 +47,7 @@ export default class GasModalPageContainer extends Component {
     const promise = this.props.hideBasic
       ? Promise.resolve(this.props.blockTime)
       : this.props.fetchBasicGasAndTimeEstimates()
-          .then(basicEstimates => basicEstimates.blockTime)
+        .then(basicEstimates => basicEstimates.blockTime)
 
     promise
       .then(blockTime => {
@@ -144,11 +144,11 @@ export default class GasModalPageContainer extends Component {
     return (
       <Tabs>
         {tabsToRender.map(({ name, content }, i) => <Tab name={this.context.t(name)} key={`gas-modal-tab-${i}`}>
-            <div className="gas-modal-content">
-              { content }
-              { this.renderInfoRows(newTotalFiat, newTotalEth, sendAmount, transactionFee) }
-            </div>
-          </Tab>
+          <div className="gas-modal-content">
+            { content }
+            { this.renderInfoRows(newTotalFiat, newTotalEth, sendAmount, transactionFee) }
+          </div>
+        </Tab>
         )}
       </Tabs>
     )
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js b/ui/app/components/app/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
index 03d254eee..d5f3837a9 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
@@ -341,44 +341,44 @@ describe('gas-modal-page-container container', () => {
   })
 
   describe('mergeProps', () => {
-      let stateProps
-      let dispatchProps
-      let ownProps
-
-      beforeEach(() => {
-        stateProps = {
-          gasPriceButtonGroupProps: {
-            someGasPriceButtonGroupProp: 'foo',
-            anotherGasPriceButtonGroupProp: 'bar',
-          },
-          isConfirm: true,
-          someOtherStateProp: 'baz',
-          transaction: {},
-        }
-        dispatchProps = {
-          updateCustomGasPrice: sinon.spy(),
-          hideGasButtonGroup: sinon.spy(),
-          setGasData: sinon.spy(),
-          updateConfirmTxGasAndCalculate: sinon.spy(),
-          someOtherDispatchProp: sinon.spy(),
-          createSpeedUpTransaction: sinon.spy(),
-          hideSidebar: sinon.spy(),
-          hideModal: sinon.spy(),
-          cancelAndClose: sinon.spy(),
-        }
-        ownProps = { someOwnProp: 123 }
-      })
+    let stateProps
+    let dispatchProps
+    let ownProps
 
-      afterEach(() => {
-        dispatchProps.updateCustomGasPrice.resetHistory()
-        dispatchProps.hideGasButtonGroup.resetHistory()
-        dispatchProps.setGasData.resetHistory()
-        dispatchProps.updateConfirmTxGasAndCalculate.resetHistory()
-        dispatchProps.someOtherDispatchProp.resetHistory()
-        dispatchProps.createSpeedUpTransaction.resetHistory()
-        dispatchProps.hideSidebar.resetHistory()
-        dispatchProps.hideModal.resetHistory()
-      })
+    beforeEach(() => {
+      stateProps = {
+        gasPriceButtonGroupProps: {
+          someGasPriceButtonGroupProp: 'foo',
+          anotherGasPriceButtonGroupProp: 'bar',
+        },
+        isConfirm: true,
+        someOtherStateProp: 'baz',
+        transaction: {},
+      }
+      dispatchProps = {
+        updateCustomGasPrice: sinon.spy(),
+        hideGasButtonGroup: sinon.spy(),
+        setGasData: sinon.spy(),
+        updateConfirmTxGasAndCalculate: sinon.spy(),
+        someOtherDispatchProp: sinon.spy(),
+        createSpeedUpTransaction: sinon.spy(),
+        hideSidebar: sinon.spy(),
+        hideModal: sinon.spy(),
+        cancelAndClose: sinon.spy(),
+      }
+      ownProps = { someOwnProp: 123 }
+    })
+
+    afterEach(() => {
+      dispatchProps.updateCustomGasPrice.resetHistory()
+      dispatchProps.hideGasButtonGroup.resetHistory()
+      dispatchProps.setGasData.resetHistory()
+      dispatchProps.updateConfirmTxGasAndCalculate.resetHistory()
+      dispatchProps.someOtherDispatchProp.resetHistory()
+      dispatchProps.createSpeedUpTransaction.resetHistory()
+      dispatchProps.hideSidebar.resetHistory()
+      dispatchProps.hideModal.resetHistory()
+    })
     it('should return the expected props when isConfirm is true', () => {
       const result = mergeProps(stateProps, dispatchProps, ownProps)
 
diff --git a/ui/app/components/app/gas-customization/gas-price-chart/gas-price-chart.utils.js b/ui/app/components/app/gas-customization/gas-price-chart/gas-price-chart.utils.js
index 55512ce09..b941f1cf9 100644
--- a/ui/app/components/app/gas-customization/gas-price-chart/gas-price-chart.utils.js
+++ b/ui/app/components/app/gas-customization/gas-price-chart/gas-price-chart.utils.js
@@ -210,17 +210,17 @@ export function generateChart (gasPrices, estimatedTimes, gasPricesMax, estimate
     },
     padding: {left: 20, right: 15, top: 6, bottom: 10},
     data: {
-        x: 'x',
-        columns: [
-            ['x', ...gasPrices],
-            ['data1', ...estimatedTimes],
-        ],
-        types: {
-          data1: 'area',
-        },
-        selection: {
-          enabled: false,
-        },
+      x: 'x',
+      columns: [
+        ['x', ...gasPrices],
+        ['data1', ...estimatedTimes],
+      ],
+      types: {
+        data1: 'area',
+      },
+      selection: {
+        enabled: false,
+      },
     },
     color: {
       data1: '#259de5',
@@ -254,13 +254,13 @@ export function generateChart (gasPrices, estimatedTimes, gasPricesMax, estimate
       },
     },
     legend: {
-        show: false,
+      show: false,
     },
     grid: {
-        x: {},
-        lines: {
-          front: false,
-        },
+      x: {},
+      lines: {
+        front: false,
+      },
     },
     point: {
       focus: {
@@ -296,8 +296,8 @@ export function generateChart (gasPrices, estimatedTimes, gasPricesMax, estimate
         const flipTooltip = circleY - circleWidth < chartYStart + 5
 
         d3
-        .select('.tooltip-arrow')
-        .style('margin-top', flipTooltip ? '-16px' : '4px')
+          .select('.tooltip-arrow')
+          .style('margin-top', flipTooltip ? '-16px' : '4px')
 
         return {
           top: bigNumMinus(circleY, chartYStart).minus(19).plus(flipTooltip ? circleWidth + 38 : 0).toNumber(),
diff --git a/ui/app/components/app/modals/account-details-modal/account-details-modal.component.js b/ui/app/components/app/modals/account-details-modal/account-details-modal.component.js
index e3919edcf..1b9a6a718 100644
--- a/ui/app/components/app/modals/account-details-modal/account-details-modal.component.js
+++ b/ui/app/components/app/modals/account-details-modal/account-details-modal.component.js
@@ -72,14 +72,14 @@ export default class AccountDetailsModal extends Component {
         </Button>
 
         {exportPrivateKeyFeatureEnabled
-            ? <Button
-                type="secondary"
-                className="account-modal__button"
-                onClick={() => showExportPrivateKeyModal()}
-              >
-                {this.context.t('exportPrivateKey')}
-              </Button>
-            : null
+          ? <Button
+            type="secondary"
+            className="account-modal__button"
+            onClick={() => showExportPrivateKeyModal()}
+          >
+            {this.context.t('exportPrivateKey')}
+          </Button>
+          : null
         }
       </AccountModalContainer>
     )
diff --git a/ui/app/components/app/modals/deposit-ether-modal.js b/ui/app/components/app/modals/deposit-ether-modal.js
index 20c4d018c..ff2411209 100644
--- a/ui/app/components/app/modals/deposit-ether-modal.js
+++ b/ui/app/components/app/modals/deposit-ether-modal.js
@@ -87,8 +87,8 @@ DepositEtherModal.prototype.renderRow = function ({
   }
 
   return h('div', {
-      className: className || 'deposit-ether-modal__buy-row',
-    }, [
+    className: className || 'deposit-ether-modal__buy-row',
+  }, [
 
     onBackClick && showBackButton && h('div.deposit-ether-modal__buy-row__back', {
       onClick: onBackClick,
@@ -100,22 +100,22 @@ DepositEtherModal.prototype.renderRow = function ({
 
     h('div.deposit-ether-modal__buy-row__logo-container', [logo]),
 
-      h('div.deposit-ether-modal__buy-row__description', [
+    h('div.deposit-ether-modal__buy-row__description', [
 
-        !hideTitle && h('div.deposit-ether-modal__buy-row__description__title', [title]),
+      !hideTitle && h('div.deposit-ether-modal__buy-row__description__title', [title]),
 
-        h('div.deposit-ether-modal__buy-row__description__text', [text]),
+      h('div.deposit-ether-modal__buy-row__description__text', [text]),
 
-      ]),
+    ]),
 
-      !hideButton && h('div.deposit-ether-modal__buy-row__button', [
-        h(Button, {
-          type: 'secondary',
-          className: 'deposit-ether-modal__deposit-button',
-          large: true,
-          onClick: onButtonClick,
-        }, [buttonLabel]),
-      ]),
+    !hideButton && h('div.deposit-ether-modal__buy-row__button', [
+      h(Button, {
+        type: 'secondary',
+        className: 'deposit-ether-modal__deposit-button',
+        large: true,
+        onClick: onButtonClick,
+      }, [buttonLabel]),
+    ]),
 
   ])
 }
diff --git a/ui/app/components/app/modals/export-private-key-modal.js b/ui/app/components/app/modals/export-private-key-modal.js
index c3098a16c..43d7bcd74 100644
--- a/ui/app/components/app/modals/export-private-key-modal.js
+++ b/ui/app/components/app/modals/export-private-key-modal.js
@@ -86,12 +86,12 @@ ExportPrivateKeyModal.prototype.renderPasswordInput = function (privateKey) {
 
   return privateKey
     ? h(ReadOnlyInput, {
-        wrapperClass: 'private-key-password-display-wrapper',
-        inputClass: 'private-key-password-display-textarea',
-        textarea: true,
-        value: plainKey,
-        onClick: () => copyToClipboard(plainKey),
-      })
+      wrapperClass: 'private-key-password-display-wrapper',
+      inputClass: 'private-key-password-display-textarea',
+      textarea: true,
+      value: plainKey,
+      onClick: () => copyToClipboard(plainKey),
+    })
     : h('input.private-key-password-input', {
       type: 'password',
       onChange: event => this.setState({ password: event.target.value }),
@@ -109,14 +109,14 @@ ExportPrivateKeyModal.prototype.renderButtons = function (privateKey, address, h
 
     (privateKey
       ? (
-          h(Button, {
+        h(Button, {
           type: 'secondary',
           large: true,
           className: 'export-private-key__button',
           onClick: () => hideModal(),
         }, this.context.t('done'))
       ) : (
-          h(Button, {
+        h(Button, {
           type: 'secondary',
           large: true,
           className: 'export-private-key__button',
@@ -149,29 +149,29 @@ ExportPrivateKeyModal.prototype.render = function () {
     backButtonAction: () => showAccountDetailModal(),
   }, [
 
-      h('span.account-name', name),
+    h('span.account-name', name),
 
-      h(ReadOnlyInput, {
-        wrapperClass: 'ellip-address-wrapper',
-        inputClass: 'qr-ellip-address ellip-address',
-        value: checksumAddress(address),
-      }),
+    h(ReadOnlyInput, {
+      wrapperClass: 'ellip-address-wrapper',
+      inputClass: 'qr-ellip-address ellip-address',
+      value: checksumAddress(address),
+    }),
 
-      h('div.account-modal-divider'),
+    h('div.account-modal-divider'),
 
-      h('span.modal-body-title', this.context.t('showPrivateKeys')),
+    h('span.modal-body-title', this.context.t('showPrivateKeys')),
 
-      h('div.private-key-password', {}, [
-        this.renderPasswordLabel(privateKey),
+    h('div.private-key-password', {}, [
+      this.renderPasswordLabel(privateKey),
 
-        this.renderPasswordInput(privateKey),
+      this.renderPasswordInput(privateKey),
 
-        showWarning && warning ? h('span.private-key-password-error', warning) : null,
-      ]),
+      showWarning && warning ? h('span.private-key-password-error', warning) : null,
+    ]),
 
-      h('div.private-key-password-warning', this.context.t('privateKeyWarning')),
+    h('div.private-key-password-warning', this.context.t('privateKeyWarning')),
 
-      this.renderButtons(privateKey, address, hideModal),
+    this.renderButtons(privateKey, address, hideModal),
 
   ])
 }
diff --git a/ui/app/components/app/modals/new-account-modal.js b/ui/app/components/app/modals/new-account-modal.js
index 27c81a701..4b18c52ba 100644
--- a/ui/app/components/app/modals/new-account-modal.js
+++ b/ui/app/components/app/modals/new-account-modal.js
@@ -69,7 +69,7 @@ NewAccountModal.propTypes = {
   showImportPage: PropTypes.func,
   createAccount: PropTypes.func,
   numberOfExistingAccounts: PropTypes.number,
-    t: PropTypes.func,
+  t: PropTypes.func,
 }
 
 const mapStateToProps = state => {
diff --git a/ui/app/components/app/modals/notification-modal.js b/ui/app/components/app/modals/notification-modal.js
index b8503ec1a..84d9004b7 100644
--- a/ui/app/components/app/modals/notification-modal.js
+++ b/ui/app/components/app/modals/notification-modal.js
@@ -62,7 +62,7 @@ NotificationModal.propTypes = {
   showCancelButton: PropTypes.bool,
   showConfirmButton: PropTypes.bool,
   onConfirm: PropTypes.func,
-    t: PropTypes.func,
+  t: PropTypes.func,
 }
 
 const mapDispatchToProps = dispatch => {
diff --git a/ui/app/components/app/modals/qr-scanner/qr-scanner.component.js b/ui/app/components/app/modals/qr-scanner/qr-scanner.component.js
index cb8b07ff1..afeaef0da 100644
--- a/ui/app/components/app/modals/qr-scanner/qr-scanner.component.js
+++ b/ui/app/components/app/modals/qr-scanner/qr-scanner.component.js
@@ -75,23 +75,23 @@ export default class QrScanner extends Component {
         clearTimeout(this.permissionChecker)
         this.checkPermisisions()
         this.codeReader.decodeFromInputVideoDevice(undefined, 'video')
-        .then(content => {
-          const result = this.parseContent(content.text)
-          if (result.type !== 'unknown') {
-            this.props.qrCodeDetected(result)
-            this.stopAndClose()
-          } else {
-            this.setState({msg: this.context.t('unknownQrCode')})
-          }
-        })
-        .catch(err => {
-          if (err && err.name === 'NotAllowedError') {
-            this.setState({msg: this.context.t('youNeedToAllowCameraAccess')})
-            clearTimeout(this.permissionChecker)
-            this.needsToReinit = true
-            this.checkPermisisions()
-          }
-        })
+          .then(content => {
+            const result = this.parseContent(content.text)
+            if (result.type !== 'unknown') {
+              this.props.qrCodeDetected(result)
+              this.stopAndClose()
+            } else {
+              this.setState({msg: this.context.t('unknownQrCode')})
+            }
+          })
+          .catch(err => {
+            if (err && err.name === 'NotAllowedError') {
+              this.setState({msg: this.context.t('youNeedToAllowCameraAccess')})
+              clearTimeout(this.permissionChecker)
+              this.needsToReinit = true
+              this.checkPermisisions()
+            }
+          })
       }).catch(err => {
         console.error('[QR-SCANNER]: getVideoInputDevices threw an exception: ', err)
       })
diff --git a/ui/app/components/app/network-display/network-display.component.js b/ui/app/components/app/network-display/network-display.component.js
index 9ef5341b0..266476267 100644
--- a/ui/app/components/app/network-display/network-display.component.js
+++ b/ui/app/components/app/network-display/network-display.component.js
@@ -39,12 +39,12 @@ export default class NetworkDisplay extends Component {
     return networkClass
       ? <div className={`network-display__icon network-display__icon--${networkClass}`} />
       : <div
-          className="i fa fa-question-circle fa-med"
-          style={{
-            margin: '0 4px',
-            color: 'rgb(125, 128, 130)',
-          }}
-        />
+        className="i fa fa-question-circle fa-med"
+        style={{
+          margin: '0 4px',
+          color: 'rgb(125, 128, 130)',
+        }}
+      />
   }
 
   render () {
@@ -62,12 +62,12 @@ export default class NetworkDisplay extends Component {
           networkClass
             ? <div className={`network-display__icon network-display__icon--${networkClass}`} />
             : <div
-                className="i fa fa-question-circle fa-med"
-                style={{
-                  margin: '0 4px',
-                  color: 'rgb(125, 128, 130)',
-                }}
-              />
+              className="i fa fa-question-circle fa-med"
+              style={{
+                margin: '0 4px',
+                color: 'rgb(125, 128, 130)',
+              }}
+            />
         }
         <div className="network-display__name">
           { type === 'rpc' && nickname ? nickname : this.context.t(type) }
diff --git a/ui/app/components/app/network.js b/ui/app/components/app/network.js
index e778700cd..d46906a66 100644
--- a/ui/app/components/app/network.js
+++ b/ui/app/components/app/network.js
@@ -127,19 +127,19 @@ Network.prototype.render = function () {
           default:
             return h('.network-indicator', [
               networkNumber === 'loading'
-              ? h('span.pointer.network-loading-spinner', {
-                onClick: (event) => this.props.onClick(event),
-              }, [
-                h('img', {
-                  title: context.t('attemptingConnect'),
-                  src: 'images/loading.svg',
+                ? h('span.pointer.network-loading-spinner', {
+                  onClick: (event) => this.props.onClick(event),
+                }, [
+                  h('img', {
+                    title: context.t('attemptingConnect'),
+                    src: 'images/loading.svg',
+                  }),
+                ])
+                : h('i.fa.fa-question-circle.fa-lg', {
+                  style: {
+                    color: 'rgb(125, 128, 130)',
+                  },
                 }),
-              ])
-              : h('i.fa.fa-question-circle.fa-lg', {
-                style: {
-                  color: 'rgb(125, 128, 130)',
-                },
-              }),
 
               h('.network-name', providerName === 'localhost' ? context.t('localhost') : providerNick || context.t('privateNetwork')),
               h('.network-indicator__down-arrow'),
diff --git a/ui/app/components/app/sidebars/sidebar.component.js b/ui/app/components/app/sidebars/sidebar.component.js
index 657982a21..e532ba7e5 100644
--- a/ui/app/components/app/sidebars/sidebar.component.js
+++ b/ui/app/components/app/sidebars/sidebar.component.js
@@ -26,7 +26,7 @@ export default class Sidebar extends Component {
         onOverlayClose && onOverlayClose()
         this.props.hideSidebar()
       }
-    } />
+      } />
   }
 
   renderSidebarContent () {
diff --git a/ui/app/components/app/signature-request.js b/ui/app/components/app/signature-request.js
index 32823aa8e..9c0f53f57 100644
--- a/ui/app/components/app/signature-request.js
+++ b/ui/app/components/app/signature-request.js
@@ -251,7 +251,7 @@ SignatureRequest.prototype.renderBody = function () {
             url: 'https://metamask.zendesk.com/hc/en-us/articles/360015488751',
           })
         },
-    }, this.context.t('learnMore'))]
+      }, this.context.t('learnMore'))]
   }
 
   return h('div.request-signature__body', {}, [
diff --git a/ui/app/components/app/token-list.js b/ui/app/components/app/token-list.js
index 2188e7020..000ca6b3f 100644
--- a/ui/app/components/app/token-list.js
+++ b/ui/app/components/app/token-list.js
@@ -67,8 +67,8 @@ TokenList.prototype.render = function () {
         },
         onClick: () => {
           global.platform.openWindow({
-          url: `https://ethplorer.io/address/${userAddress}`,
-        })
+            url: `https://ethplorer.io/address/${userAddress}`,
+          })
         },
       }, this.context.t('here')),
     ])
@@ -125,13 +125,13 @@ TokenList.prototype.createFreshTokenTracker = function () {
   this.tracker.on('error', this.showError)
 
   this.tracker.updateBalances()
-  .then(() => {
-    this.updateBalances(this.tracker.serialize())
-  })
-  .catch((reason) => {
-    log.error(`Problem updating balances`, reason)
-    this.setState({ isLoading: false })
-  })
+    .then(() => {
+      this.updateBalances(this.tracker.serialize())
+    })
+    .catch((reason) => {
+      log.error(`Problem updating balances`, reason)
+      this.setState({ isLoading: false })
+    })
 }
 
 TokenList.prototype.componentDidUpdate = function (prevProps) {
diff --git a/ui/app/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.component.js b/ui/app/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.component.js
index 871716002..6124325be 100644
--- a/ui/app/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.component.js
+++ b/ui/app/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.component.js
@@ -40,15 +40,15 @@ export default class TransactionActivityLogIcon extends PureComponent {
 
     return (
       <div className={classnames('transaction-activity-log-icon', className)}>
-      {
-        imagePath && (
-          <img
-            src={imagePath}
-            height={9}
-            width={9}
-          />
-        )
-      }
+        {
+          imagePath && (
+            <img
+              src={imagePath}
+              height={9}
+              width={9}
+            />
+          )
+        }
       </div>
     )
   }
diff --git a/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.component.js b/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.component.js
index 21f14c045..d8dd965fc 100644
--- a/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.component.js
+++ b/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.component.js
@@ -166,7 +166,7 @@ export default class TransactionListItemDetails extends PureComponent {
                 onClick={this.handleEtherscanClick}
                 className="transaction-list-item-details__header-button"
                 disabled={!hash}
-                >
+              >
                 <img src="/images/arrow-popout.svg" />
               </Button>
             </Tooltip>
diff --git a/ui/app/components/app/transaction-list/transaction-list.component.js b/ui/app/components/app/transaction-list/transaction-list.component.js
index d4232f448..3c096e3fd 100644
--- a/ui/app/components/app/transaction-list/transaction-list.component.js
+++ b/ui/app/components/app/transaction-list/transaction-list.component.js
@@ -75,8 +75,8 @@ export default class TransactionList extends PureComponent {
           {
             completedTransactions.length > 0
               ? completedTransactions.map((transactionGroup, index) => (
-                  this.renderTransaction(transactionGroup, index)
-                ))
+                this.renderTransaction(transactionGroup, index)
+              ))
               : this.renderEmpty()
           }
         </div>
diff --git a/ui/app/components/app/transaction-view-balance/transaction-view-balance.component.js b/ui/app/components/app/transaction-view-balance/transaction-view-balance.component.js
index 3f6abbb00..feb701dbe 100644
--- a/ui/app/components/app/transaction-view-balance/transaction-view-balance.component.js
+++ b/ui/app/components/app/transaction-view-balance/transaction-view-balance.component.js
@@ -43,38 +43,38 @@ export default class TransactionViewBalance extends PureComponent {
           />
         </div>
       ) : (
-          <Tooltip position="top" title={this.context.t('balanceOutdated')} disabled={!balanceIsCached}>
-            <div className="transaction-view-balance__balance">
-                <div className="transaction-view-balance__primary-container">
-                  <UserPreferencedCurrencyDisplay
-                    className={classnames('transaction-view-balance__primary-balance', {
-                      'transaction-view-balance__cached-balance': balanceIsCached,
-                    })}
-                    value={balance}
-                    type={PRIMARY}
-                    ethNumberOfDecimals={4}
-                    hideTitle={true}
-                  />
-                  {
-                    balanceIsCached ? <span className="transaction-view-balance__cached-star">*</span> : null
-                  }
-                </div>
-                {
-                  showFiat && (
-                    <UserPreferencedCurrencyDisplay
-                      className={classnames({
-                        'transaction-view-balance__cached-secondary-balance': balanceIsCached,
-                        'transaction-view-balance__secondary-balance': !balanceIsCached,
-                      })}
-                      value={balance}
-                      type={SECONDARY}
-                      ethNumberOfDecimals={4}
-                      hideTitle={true}
-                    />
-                  )
-                }
+        <Tooltip position="top" title={this.context.t('balanceOutdated')} disabled={!balanceIsCached}>
+          <div className="transaction-view-balance__balance">
+            <div className="transaction-view-balance__primary-container">
+              <UserPreferencedCurrencyDisplay
+                className={classnames('transaction-view-balance__primary-balance', {
+                  'transaction-view-balance__cached-balance': balanceIsCached,
+                })}
+                value={balance}
+                type={PRIMARY}
+                ethNumberOfDecimals={4}
+                hideTitle={true}
+              />
+              {
+                balanceIsCached ? <span className="transaction-view-balance__cached-star">*</span> : null
+              }
             </div>
-          </Tooltip>
+            {
+              showFiat && (
+                <UserPreferencedCurrencyDisplay
+                  className={classnames({
+                    'transaction-view-balance__cached-secondary-balance': balanceIsCached,
+                    'transaction-view-balance__secondary-balance': !balanceIsCached,
+                  })}
+                  value={balance}
+                  type={SECONDARY}
+                  ethNumberOfDecimals={4}
+                  hideTitle={true}
+                />
+              )
+            }
+          </div>
+        </Tooltip>
       )
   }
 
diff --git a/ui/app/components/ui/alert/index.js b/ui/app/components/ui/alert/index.js
index b1229f502..da2ca4b66 100644
--- a/ui/app/components/ui/alert/index.js
+++ b/ui/app/components/ui/alert/index.js
@@ -4,59 +4,59 @@ const h = require('react-hyperscript')
 
 class Alert extends Component {
 
-    constructor (props) {
-      super(props)
-
-      this.state = {
-        visble: false,
-        msg: false,
-        className: '',
-      }
-    }
-
-    componentWillReceiveProps (nextProps) {
-      if (!this.props.visible && nextProps.visible) {
-        this.animateIn(nextProps)
-      } else if (this.props.visible && !nextProps.visible) {
-        this.animateOut()
-      }
-    }
+  constructor (props) {
+    super(props)
 
-    animateIn (props) {
-      this.setState({
-        msg: props.msg,
-        visible: true,
-        className: '.visible',
-      })
+    this.state = {
+      visble: false,
+      msg: false,
+      className: '',
     }
+  }
 
-    animateOut () {
-      this.setState({
-        msg: null,
-        className: '.hidden',
-      })
-
-      setTimeout(_ => {
-        this.setState({visible: false})
-      }, 500)
-
+  componentWillReceiveProps (nextProps) {
+    if (!this.props.visible && nextProps.visible) {
+      this.animateIn(nextProps)
+    } else if (this.props.visible && !nextProps.visible) {
+      this.animateOut()
     }
-
-    render () {
-        if (this.state.visible) {
-          return (
-              h(`div.global-alert${this.state.className}`, {},
-                h('a.msg', {}, this.state.msg)
-              )
-          )
-        }
-        return null
+  }
+
+  animateIn (props) {
+    this.setState({
+      msg: props.msg,
+      visible: true,
+      className: '.visible',
+    })
+  }
+
+  animateOut () {
+    this.setState({
+      msg: null,
+      className: '.hidden',
+    })
+
+    setTimeout(_ => {
+      this.setState({visible: false})
+    }, 500)
+
+  }
+
+  render () {
+    if (this.state.visible) {
+      return (
+        h(`div.global-alert${this.state.className}`, {},
+          h('a.msg', {}, this.state.msg)
+        )
+      )
     }
+    return null
+  }
 }
 
 Alert.propTypes = {
-    visible: PropTypes.bool.isRequired,
-    msg: PropTypes.string,
+  visible: PropTypes.bool.isRequired,
+  msg: PropTypes.string,
 }
 module.exports = Alert
 
diff --git a/ui/app/components/ui/button-group/tests/button-group-component.test.js b/ui/app/components/ui/button-group/tests/button-group-component.test.js
index 0bece90d6..f2e512445 100644
--- a/ui/app/components/ui/button-group/tests/button-group-component.test.js
+++ b/ui/app/components/ui/button-group/tests/button-group-component.test.js
@@ -59,40 +59,40 @@ describe('ButtonGroup Component', function () {
 
   describe('renderButtons', () => {
     it('should render a button for each child', () => {
-        const childButtons = wrapper.find('.button-group__button')
-        assert.equal(childButtons.length, 3)
+      const childButtons = wrapper.find('.button-group__button')
+      assert.equal(childButtons.length, 3)
     })
 
     it('should render the correct button with an active state', () => {
-        const childButtons = wrapper.find('.button-group__button')
-        const activeChildButton = wrapper.find('.button-group__button--active')
-        assert.deepEqual(childButtons.get(1), activeChildButton.get(0))
+      const childButtons = wrapper.find('.button-group__button')
+      const activeChildButton = wrapper.find('.button-group__button--active')
+      assert.deepEqual(childButtons.get(1), activeChildButton.get(0))
     })
 
     it('should call handleButtonClick and the respective button\'s onClick method when a button is clicked', () => {
-        assert.equal(ButtonGroup.prototype.handleButtonClick.callCount, 0)
-        assert.equal(childButtonSpies.onClick.callCount, 0)
-        const childButtons = wrapper.find('.button-group__button')
-        childButtons.at(0).props().onClick()
-        childButtons.at(1).props().onClick()
-        childButtons.at(2).props().onClick()
-        assert.equal(ButtonGroup.prototype.handleButtonClick.callCount, 3)
-        assert.equal(childButtonSpies.onClick.callCount, 3)
+      assert.equal(ButtonGroup.prototype.handleButtonClick.callCount, 0)
+      assert.equal(childButtonSpies.onClick.callCount, 0)
+      const childButtons = wrapper.find('.button-group__button')
+      childButtons.at(0).props().onClick()
+      childButtons.at(1).props().onClick()
+      childButtons.at(2).props().onClick()
+      assert.equal(ButtonGroup.prototype.handleButtonClick.callCount, 3)
+      assert.equal(childButtonSpies.onClick.callCount, 3)
     })
 
     it('should render all child buttons as disabled if props.disabled is true', () => {
-        const childButtons = wrapper.find('.button-group__button')
-        childButtons.forEach(button => {
-            assert.equal(button.props().disabled, undefined)
-        })
-        wrapper.setProps({ disabled: true })
-        const disabledChildButtons = wrapper.find('[disabled=true]')
-        assert.equal(disabledChildButtons.length, 3)
+      const childButtons = wrapper.find('.button-group__button')
+      childButtons.forEach(button => {
+        assert.equal(button.props().disabled, undefined)
+      })
+      wrapper.setProps({ disabled: true })
+      const disabledChildButtons = wrapper.find('[disabled=true]')
+      assert.equal(disabledChildButtons.length, 3)
     })
 
     it('should render the children of the button', () => {
-        const mockClass = wrapper.find('.mockClass')
-        assert.equal(mockClass.length, 1)
+      const mockClass = wrapper.find('.mockClass')
+      assert.equal(mockClass.length, 1)
     })
   })
 
@@ -103,9 +103,9 @@ describe('ButtonGroup Component', function () {
     })
 
     it('should call renderButtons when rendering', () => {
-        assert.equal(ButtonGroup.prototype.renderButtons.callCount, 1)
-        wrapper.instance().render()
-        assert.equal(ButtonGroup.prototype.renderButtons.callCount, 2)
+      assert.equal(ButtonGroup.prototype.renderButtons.callCount, 1)
+      wrapper.instance().render()
+      assert.equal(ButtonGroup.prototype.renderButtons.callCount, 2)
     })
   })
 })
diff --git a/ui/app/components/ui/currency-input/currency-input.component.js b/ui/app/components/ui/currency-input/currency-input.component.js
index 1876c9591..f7db2b829 100644
--- a/ui/app/components/ui/currency-input/currency-input.component.js
+++ b/ui/app/components/ui/currency-input/currency-input.component.js
@@ -141,22 +141,22 @@ export default class CurrencyInput extends PureComponent {
     const { decimalValue } = this.state
 
     return (
-        <UnitInput
-          {...restProps}
-          suffix={this.shouldUseFiat() ? fiatSuffix : nativeSuffix}
-          onChange={this.handleChange}
-          onBlur={this.handleBlur}
-          value={decimalValue}
-          maxModeOn={maxModeOn}
-          actionComponent={(
-            <div
-              className="currency-input__swap-component"
-              onClick={this.swap}
-            />
-          )}
-        >
-          { this.renderConversionComponent() }
-        </UnitInput>
+      <UnitInput
+        {...restProps}
+        suffix={this.shouldUseFiat() ? fiatSuffix : nativeSuffix}
+        onChange={this.handleChange}
+        onBlur={this.handleBlur}
+        value={decimalValue}
+        maxModeOn={maxModeOn}
+        actionComponent={(
+          <div
+            className="currency-input__swap-component"
+            onClick={this.swap}
+          />
+        )}
+      >
+        { this.renderConversionComponent() }
+      </UnitInput>
     )
   }
 }
diff --git a/ui/app/components/ui/sender-to-recipient/sender-to-recipient.component.js b/ui/app/components/ui/sender-to-recipient/sender-to-recipient.component.js
index 57b595d48..a98a94101 100644
--- a/ui/app/components/ui/sender-to-recipient/sender-to-recipient.component.js
+++ b/ui/app/components/ui/sender-to-recipient/sender-to-recipient.component.js
@@ -64,10 +64,10 @@ export default class SenderToRecipient extends PureComponent {
         containerClassName="sender-to-recipient__tooltip-container"
         onHidden={() => this.setState({ senderAddressCopied: false })}
       >
-      <div className="sender-to-recipient__name">
-        { addressOnly ? `${t('from')}: ${checksummedSenderAddress}` : senderName }
-      </div>
-    </Tooltip>
+        <div className="sender-to-recipient__name">
+          { addressOnly ? `${t('from')}: ${checksummedSenderAddress}` : senderName }
+        </div>
+      </Tooltip>
     )
   }
 
diff --git a/ui/app/ducks/app/app.js b/ui/app/ducks/app/app.js
index 77d9116e5..10ed7d155 100644
--- a/ui/app/ducks/app/app.js
+++ b/ui/app/ducks/app/app.js
@@ -160,7 +160,7 @@ function reduceApp (state, action) {
         transForward: false,
       })
 
-    // intialize
+      // intialize
 
     case actions.SHOW_CREATE_VAULT:
       return extend(appState, {
@@ -262,7 +262,7 @@ function reduceApp (state, action) {
         transForward: true,
       })
 
-  case actions.CREATE_NEW_VAULT_IN_PROGRESS:
+    case actions.CREATE_NEW_VAULT_IN_PROGRESS:
       return extend(appState, {
         currentView: {
           name: 'createVault',
@@ -310,7 +310,7 @@ function reduceApp (state, action) {
         transForward: true,
       })
 
-  // unlock
+      // unlock
 
     case actions.UNLOCK_METAMASK:
       return extend(appState, {
@@ -347,7 +347,7 @@ function reduceApp (state, action) {
           name: 'UnlockScreen',
         },
       })
-  // reveal seed words
+      // reveal seed words
 
     case actions.REVEAL_SEED_CONFIRMATION:
       return extend(appState, {
@@ -358,7 +358,7 @@ function reduceApp (state, action) {
         warning: null,
       })
 
-  // accounts
+      // accounts
 
     case actions.SET_SELECTED_ACCOUNT:
       return extend(appState, {
diff --git a/ui/app/ducks/gas/gas-duck.test.js b/ui/app/ducks/gas/gas-duck.test.js
index e97ef2d9f..82a91d5e7 100644
--- a/ui/app/ducks/gas/gas-duck.test.js
+++ b/ui/app/ducks/gas/gas-duck.test.js
@@ -465,7 +465,7 @@ describe('Gas Duck', () => {
         initState,
         { basicPriceAndTimeEstimatesLastRetrieved: 1000000 }
       ),
-        metamask: { provider: { type: 'ropsten' } },
+      metamask: { provider: { type: 'ropsten' } },
       }))
       assert.deepEqual(
         mockDistpatch.getCall(0).args,
@@ -542,7 +542,7 @@ describe('Gas Duck', () => {
         initState,
         {}
       ),
-        metamask: { provider: { type: 'ropsten' } },
+      metamask: { provider: { type: 'ropsten' } },
       }))
       assert.deepEqual(
         mockDistpatch.getCall(0).args,
@@ -586,7 +586,7 @@ describe('Gas Duck', () => {
         initState,
         {}
       ),
-        metamask: { provider: { type: 'ropsten' } },
+      metamask: { provider: { type: 'ropsten' } },
       }))
       assert.deepEqual(
         mockDistpatch.getCall(0).args,
@@ -647,7 +647,7 @@ describe('Gas Duck', () => {
         initState,
         { priceAndTimeEstimatesLastRetrieved: 1000000 }
       ),
-        metamask: { provider: { type: 'ropsten' } },
+      metamask: { provider: { type: 'ropsten' } },
       }))
       assert.deepEqual(
         mockDistpatch.getCall(0).args,
@@ -701,7 +701,7 @@ describe('Gas Duck', () => {
           }],
         }
       ),
-        metamask: { provider: { type: 'ropsten' } },
+      metamask: { provider: { type: 'ropsten' } },
       }))
       assert.deepEqual(
         mockDistpatch.getCall(0).args,
diff --git a/ui/app/ducks/gas/gas.duck.js b/ui/app/ducks/gas/gas.duck.js
index d57e825c4..e272455fc 100644
--- a/ui/app/ducks/gas/gas.duck.js
+++ b/ui/app/ducks/gas/gas.duck.js
@@ -372,13 +372,13 @@ export function fetchGasEstimates (blockTime) {
 
     const promiseToFetch = Date.now() - timeLastRetrieved > 75000
       ? fetch('https://ethgasstation.info/json/predictTable.json', {
-          'headers': {},
-          'referrer': 'http://ethgasstation.info/json/',
-          'referrerPolicy': 'no-referrer-when-downgrade',
-          'body': null,
-          'method': 'GET',
-          'mode': 'cors'}
-        )
+        'headers': {},
+        'referrer': 'http://ethgasstation.info/json/',
+        'referrerPolicy': 'no-referrer-when-downgrade',
+        'body': null,
+        'method': 'GET',
+        'mode': 'cors'}
+      )
         .then(r => r.json())
         .then(r => {
           const estimatedPricesAndTimes = r.map(({ expectedTime, expectedWait, gasprice }) => ({ expectedTime, expectedWait, gasprice }))
@@ -429,14 +429,14 @@ export function fetchGasEstimates (blockTime) {
           return timeMappedToSeconds
         })
       : Promise.resolve(priceAndTimeEstimates.length
-          ? priceAndTimeEstimates
-          : loadLocalStorageData('GAS_API_ESTIMATES')
-        )
-
-      return promiseToFetch.then(estimates => {
-        dispatch(setPricesAndTimeEstimates(estimates))
-        dispatch(gasEstimatesLoadingFinished())
-      })
+        ? priceAndTimeEstimates
+        : loadLocalStorageData('GAS_API_ESTIMATES')
+      )
+
+    return promiseToFetch.then(estimates => {
+      dispatch(setPricesAndTimeEstimates(estimates))
+      dispatch(gasEstimatesLoadingFinished())
+    })
   }
 }
 
diff --git a/ui/app/ducks/metamask/metamask.js b/ui/app/ducks/metamask/metamask.js
index 64f983606..35de947b4 100644
--- a/ui/app/ducks/metamask/metamask.js
+++ b/ui/app/ducks/metamask/metamask.js
@@ -275,7 +275,7 @@ function reduceMetamask (state, action) {
         },
       })
 
-      case actions.UPDATE_SEND_ENS_RESOLUTION:
+    case actions.UPDATE_SEND_ENS_RESOLUTION:
       return extend(metamaskState, {
         send: {
           ...metamaskState.send,
diff --git a/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js b/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js
index 9a118a815..04e9c8dcf 100644
--- a/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js
+++ b/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js
@@ -84,7 +84,7 @@ export default class ConfirmAddSuggestedToken extends Component {
                         </div>
                       </div>
                     )
-                })
+                  })
               }
             </div>
           </div>
diff --git a/ui/app/pages/confirm-add-token/confirm-add-token.component.js b/ui/app/pages/confirm-add-token/confirm-add-token.component.js
index f0a19e8d9..d918d7e39 100644
--- a/ui/app/pages/confirm-add-token/confirm-add-token.component.js
+++ b/ui/app/pages/confirm-add-token/confirm-add-token.component.js
@@ -80,7 +80,7 @@ export default class ConfirmAddToken extends Component {
                         </div>
                       </div>
                     )
-                })
+                  })
               }
             </div>
           </div>
diff --git a/ui/app/pages/create-account/connect-hardware/account-list.js b/ui/app/pages/create-account/connect-hardware/account-list.js
index 247c27a5d..71684783f 100644
--- a/ui/app/pages/create-account/connect-hardware/account-list.js
+++ b/ui/app/pages/create-account/connect-hardware/account-list.js
@@ -6,18 +6,18 @@ const Select = require('react-select').default
 import Button from '../../../components/ui/button'
 
 class AccountList extends Component {
-    getHdPaths () {
-      return [
-        {
-          label: `Ledger Live`,
-          value: `m/44'/60'/0'/0/0`,
-        },
-        {
-          label: `Legacy (MEW / MyCrypto)`,
-          value: `m/44'/60'/0'`,
-        },
-      ]
-    }
+  getHdPaths () {
+    return [
+      {
+        label: `Ledger Live`,
+        value: `m/44'/60'/0'/0/0`,
+      },
+      {
+        label: `Legacy (MEW / MyCrypto)`,
+        value: `m/44'/60'/0'`,
+      },
+    ]
+  }
 
     goToNextPage = () => {
       // If we have < 5 accounts, it's restricted by BIP-44
@@ -74,128 +74,128 @@ class AccountList extends Component {
     }
 
     renderAccounts () {
-        return h('div.hw-account-list', [
-            this.props.accounts.map((a, i) => {
-
-                return h('div.hw-account-list__item', { key: a.address }, [
-                h('div.hw-account-list__item__radio', [
-                    h('input', {
-                        type: 'radio',
-                        name: 'selectedAccount',
-                        id: `address-${i}`,
-                        value: a.index,
-                        onChange: (e) => this.props.onAccountChange(e.target.value),
-                        checked: this.props.selectedAccount === a.index.toString(),
-                    }),
-                    h(
-                    'label.hw-account-list__item__label',
-                    {
-                        htmlFor: `address-${i}`,
-                    },
-                    [
-                      h('span.hw-account-list__item__index', a.index + 1),
-                      `${a.address.slice(0, 4)}...${a.address.slice(-4)}`,
-                      h('span.hw-account-list__item__balance', `${a.balance}`),
-                    ]),
+      return h('div.hw-account-list', [
+        this.props.accounts.map((a, i) => {
+
+          return h('div.hw-account-list__item', { key: a.address }, [
+            h('div.hw-account-list__item__radio', [
+              h('input', {
+                type: 'radio',
+                name: 'selectedAccount',
+                id: `address-${i}`,
+                value: a.index,
+                onChange: (e) => this.props.onAccountChange(e.target.value),
+                checked: this.props.selectedAccount === a.index.toString(),
+              }),
+              h(
+                'label.hw-account-list__item__label',
+                {
+                  htmlFor: `address-${i}`,
+                },
+                [
+                  h('span.hw-account-list__item__index', a.index + 1),
+                  `${a.address.slice(0, 4)}...${a.address.slice(-4)}`,
+                  h('span.hw-account-list__item__balance', `${a.balance}`),
                 ]),
-                h(
-                    'a.hw-account-list__item__link',
-                    {
-                    href: genAccountLink(a.address, this.props.network),
-                    target: '_blank',
-                    title: this.context.t('etherscanView'),
-                    },
-                    h('img', { src: 'images/popout.svg' })
-                ),
-                ])
-            }),
-        ])
+            ]),
+            h(
+              'a.hw-account-list__item__link',
+              {
+                href: genAccountLink(a.address, this.props.network),
+                target: '_blank',
+                title: this.context.t('etherscanView'),
+              },
+              h('img', { src: 'images/popout.svg' })
+            ),
+          ])
+        }),
+      ])
     }
 
-  renderPagination () {
-    return h('div.hw-list-pagination', [
-      h(
-        'button.hw-list-pagination__button',
-        {
-          onClick: this.goToPreviousPage,
-        },
-        `< ${this.context.t('prev')}`
-      ),
-
-      h(
-        'button.hw-list-pagination__button',
-        {
-          onClick: this.goToNextPage,
-        },
-        `${this.context.t('next')} >`
-      ),
-    ])
-  }
-
-  renderButtons () {
-    const disabled = this.props.selectedAccount === null
-    const buttonProps = {}
-    if (disabled) {
-      buttonProps.disabled = true
+    renderPagination () {
+      return h('div.hw-list-pagination', [
+        h(
+          'button.hw-list-pagination__button',
+          {
+            onClick: this.goToPreviousPage,
+          },
+          `< ${this.context.t('prev')}`
+        ),
+
+        h(
+          'button.hw-list-pagination__button',
+          {
+            onClick: this.goToNextPage,
+          },
+          `${this.context.t('next')} >`
+        ),
+      ])
     }
 
-    return h('div.new-account-connect-form__buttons', {}, [
-      h(Button, {
-        type: 'default',
-        large: true,
-        className: 'new-account-connect-form__button',
-        onClick: this.props.onCancel.bind(this),
-      }, [this.context.t('cancel')]),
-
-      h(Button, {
-        type: 'primary',
-        large: true,
-        className: 'new-account-connect-form__button unlock',
-        disabled,
-        onClick: this.props.onUnlockAccount.bind(this, this.props.device),
-      }, [this.context.t('unlock')]),
-    ])
-  }
+    renderButtons () {
+      const disabled = this.props.selectedAccount === null
+      const buttonProps = {}
+      if (disabled) {
+        buttonProps.disabled = true
+      }
 
-  renderForgetDevice () {
-    return h('div.hw-forget-device-container', {}, [
-      h('a', {
-        onClick: this.props.onForgetDevice.bind(this, this.props.device),
-      }, this.context.t('forgetDevice')),
-    ])
-  }
+      return h('div.new-account-connect-form__buttons', {}, [
+        h(Button, {
+          type: 'default',
+          large: true,
+          className: 'new-account-connect-form__button',
+          onClick: this.props.onCancel.bind(this),
+        }, [this.context.t('cancel')]),
+
+        h(Button, {
+          type: 'primary',
+          large: true,
+          className: 'new-account-connect-form__button unlock',
+          disabled,
+          onClick: this.props.onUnlockAccount.bind(this, this.props.device),
+        }, [this.context.t('unlock')]),
+      ])
+    }
 
-  render () {
-    return h('div.new-account-connect-form.account-list', {}, [
+    renderForgetDevice () {
+      return h('div.hw-forget-device-container', {}, [
+        h('a', {
+          onClick: this.props.onForgetDevice.bind(this, this.props.device),
+        }, this.context.t('forgetDevice')),
+      ])
+    }
+
+    render () {
+      return h('div.new-account-connect-form.account-list', {}, [
         this.renderHeader(),
         this.renderAccounts(),
         this.renderPagination(),
         this.renderButtons(),
         this.renderForgetDevice(),
-    ])
-  }
+      ])
+    }
 
 }
 
 
 AccountList.propTypes = {
-    onPathChange: PropTypes.func.isRequired,
-    selectedPath: PropTypes.string.isRequired,
-    device: PropTypes.string.isRequired,
-    accounts: PropTypes.array.isRequired,
-    onAccountChange: PropTypes.func.isRequired,
-    onForgetDevice: PropTypes.func.isRequired,
-    getPage: PropTypes.func.isRequired,
-    network: PropTypes.string,
-    selectedAccount: PropTypes.string,
-    history: PropTypes.object,
-    onUnlockAccount: PropTypes.func,
-    onCancel: PropTypes.func,
-    onAccountRestriction: PropTypes.func,
+  onPathChange: PropTypes.func.isRequired,
+  selectedPath: PropTypes.string.isRequired,
+  device: PropTypes.string.isRequired,
+  accounts: PropTypes.array.isRequired,
+  onAccountChange: PropTypes.func.isRequired,
+  onForgetDevice: PropTypes.func.isRequired,
+  getPage: PropTypes.func.isRequired,
+  network: PropTypes.string,
+  selectedAccount: PropTypes.string,
+  history: PropTypes.object,
+  onUnlockAccount: PropTypes.func,
+  onCancel: PropTypes.func,
+  onAccountRestriction: PropTypes.func,
 }
 
 AccountList.contextTypes = {
-    t: PropTypes.func,
+  t: PropTypes.func,
 }
 
 module.exports = AccountList
diff --git a/ui/app/pages/create-account/connect-hardware/connect-screen.js b/ui/app/pages/create-account/connect-hardware/connect-screen.js
index a3b8ad246..fe7c1e027 100644
--- a/ui/app/pages/create-account/connect-hardware/connect-screen.js
+++ b/ui/app/pages/create-account/connect-hardware/connect-screen.js
@@ -4,12 +4,12 @@ const h = require('react-hyperscript')
 import Button from '../../../components/ui/button'
 
 class ConnectScreen extends Component {
-    constructor (props) {
-        super(props)
-        this.state = {
-          selectedDevice: null,
-        }
+  constructor (props) {
+    super(props)
+    this.state = {
+      selectedDevice: null,
     }
+  }
 
     connect = () => {
       if (this.state.selectedDevice) {
@@ -19,23 +19,23 @@ class ConnectScreen extends Component {
     }
 
     renderConnectToTrezorButton () {
-        return h(
-            `button.hw-connect__btn${this.state.selectedDevice === 'trezor' ? '.selected' : ''}`,
-            { onClick: _ => this.setState({selectedDevice: 'trezor'}) },
-            h('img.hw-connect__btn__img', {
-              src: 'images/trezor-logo.svg',
-            })
-        )
+      return h(
+        `button.hw-connect__btn${this.state.selectedDevice === 'trezor' ? '.selected' : ''}`,
+        { onClick: _ => this.setState({selectedDevice: 'trezor'}) },
+        h('img.hw-connect__btn__img', {
+          src: 'images/trezor-logo.svg',
+        })
+      )
     }
 
     renderConnectToLedgerButton () {
-        return h(
-          `button.hw-connect__btn${this.state.selectedDevice === 'ledger' ? '.selected' : ''}`,
-          { onClick: _ => this.setState({selectedDevice: 'ledger'}) },
-            h('img.hw-connect__btn__img', {
-              src: 'images/ledger-logo.svg',
-            })
-        )
+      return h(
+        `button.hw-connect__btn${this.state.selectedDevice === 'ledger' ? '.selected' : ''}`,
+        { onClick: _ => this.setState({selectedDevice: 'ledger'}) },
+        h('img.hw-connect__btn__img', {
+          src: 'images/ledger-logo.svg',
+        })
+      )
     }
 
     renderButtons () {
@@ -57,30 +57,30 @@ class ConnectScreen extends Component {
     }
 
     renderUnsupportedBrowser () {
-        return (
-            h('div.new-account-connect-form.unsupported-browser', {}, [
-                h('div.hw-connect', [
-                    h('h3.hw-connect__title', {}, this.context.t('browserNotSupported')),
-                    h('p.hw-connect__msg', {}, this.context.t('chromeRequiredForHardwareWallets')),
-                ]),
-                h(Button, {
-                  type: 'primary',
-                  large: true,
-                  onClick: () => global.platform.openWindow({
-                    url: 'https://google.com/chrome',
-                  }),
-                }, this.context.t('downloadGoogleChrome')),
-            ])
-        )
+      return (
+        h('div.new-account-connect-form.unsupported-browser', {}, [
+          h('div.hw-connect', [
+            h('h3.hw-connect__title', {}, this.context.t('browserNotSupported')),
+            h('p.hw-connect__msg', {}, this.context.t('chromeRequiredForHardwareWallets')),
+          ]),
+          h(Button, {
+            type: 'primary',
+            large: true,
+            onClick: () => global.platform.openWindow({
+              url: 'https://google.com/chrome',
+            }),
+          }, this.context.t('downloadGoogleChrome')),
+        ])
+      )
     }
 
     renderHeader () {
-        return (
-            h('div.hw-connect__header', {}, [
-                h('h3.hw-connect__header__title', {}, this.context.t(`hardwareWallets`)),
-                h('p.hw-connect__header__msg', {}, this.context.t(`hardwareWalletsMsg`)),
-            ])
-        )
+      return (
+        h('div.hw-connect__header', {}, [
+          h('h3.hw-connect__header__title', {}, this.context.t(`hardwareWallets`)),
+          h('p.hw-connect__header__msg', {}, this.context.t(`hardwareWalletsMsg`)),
+        ])
+      )
     }
 
     getAffiliateLinks () {
@@ -96,10 +96,10 @@ class ConnectScreen extends Component {
     }
 
     renderTrezorAffiliateLink () {
-        return h('div.hw-connect__get-hw', {}, [
-            h('p.hw-connect__get-hw__msg', {}, this.context.t(`dontHaveAHardwareWallet`)),
-            this.getAffiliateLinks(),
-          ])
+      return h('div.hw-connect__get-hw', {}, [
+        h('p.hw-connect__get-hw__msg', {}, this.context.t(`dontHaveAHardwareWallet`)),
+        this.getAffiliateLinks(),
+      ])
     }
 
 
@@ -108,89 +108,89 @@ class ConnectScreen extends Component {
     }
 
     renderLearnMore () {
-        return (
-            h('p.hw-connect__learn-more', {
-                onClick: this.scrollToTutorial,
-            }, [
-                this.context.t('learnMore'),
-                h('img.hw-connect__learn-more__arrow', { src: 'images/caret-right.svg'}),
-            ])
-        )
+      return (
+        h('p.hw-connect__learn-more', {
+          onClick: this.scrollToTutorial,
+        }, [
+          this.context.t('learnMore'),
+          h('img.hw-connect__learn-more__arrow', { src: 'images/caret-right.svg'}),
+        ])
+      )
     }
 
     renderTutorialSteps () {
-        const steps = [
-            {
-                asset: 'hardware-wallet-step-1',
-                dimensions: {width: '225px', height: '75px'},
-             },
-             {
-                asset: 'hardware-wallet-step-2',
-                dimensions: {width: '300px', height: '100px'},
-             },
-             {
-                asset: 'hardware-wallet-step-3',
-                dimensions: {width: '120px', height: '90px'},
-             },
-        ]
-
-        return h('.hw-tutorial', {
-          ref: node => { this.referenceNode = node },
+      const steps = [
+        {
+          asset: 'hardware-wallet-step-1',
+          dimensions: {width: '225px', height: '75px'},
+        },
+        {
+          asset: 'hardware-wallet-step-2',
+          dimensions: {width: '300px', height: '100px'},
         },
-            steps.map((step, i) => (
-            h('div.hw-connect', {}, [
-                h('h3.hw-connect__title', {}, this.context.t(`step${i + 1}HardwareWallet`)),
-                h('p.hw-connect__msg', {}, this.context.t(`step${i + 1}HardwareWalletMsg`)),
-                h('img.hw-connect__step-asset', { src: `images/${step.asset}.svg`, ...step.dimensions }),
-            ])
-            ))
-        )
+        {
+          asset: 'hardware-wallet-step-3',
+          dimensions: {width: '120px', height: '90px'},
+        },
+      ]
+
+      return h('.hw-tutorial', {
+        ref: node => { this.referenceNode = node },
+      },
+      steps.map((step, i) => (
+        h('div.hw-connect', {}, [
+          h('h3.hw-connect__title', {}, this.context.t(`step${i + 1}HardwareWallet`)),
+          h('p.hw-connect__msg', {}, this.context.t(`step${i + 1}HardwareWalletMsg`)),
+          h('img.hw-connect__step-asset', { src: `images/${step.asset}.svg`, ...step.dimensions }),
+        ])
+      ))
+      )
     }
 
     renderFooter () {
-        return (
-            h('div.hw-connect__footer', {}, [
-                h('h3.hw-connect__footer__title', {}, this.context.t(`readyToConnect`)),
-                this.renderButtons(),
-                h('p.hw-connect__footer__msg', {}, [
-                    this.context.t(`havingTroubleConnecting`),
-                    h('a.hw-connect__footer__link', {
-                        href: 'https://support.metamask.io/',
-                        target: '_blank',
-                      }, this.context.t('getHelp')),
-                ]),
-            ])
-        )
+      return (
+        h('div.hw-connect__footer', {}, [
+          h('h3.hw-connect__footer__title', {}, this.context.t(`readyToConnect`)),
+          this.renderButtons(),
+          h('p.hw-connect__footer__msg', {}, [
+            this.context.t(`havingTroubleConnecting`),
+            h('a.hw-connect__footer__link', {
+              href: 'https://support.metamask.io/',
+              target: '_blank',
+            }, this.context.t('getHelp')),
+          ]),
+        ])
+      )
     }
 
     renderConnectScreen () {
-        return (
-            h('div.new-account-connect-form', {}, [
-                this.renderHeader(),
-                this.renderButtons(),
-                this.renderTrezorAffiliateLink(),
-                this.renderLearnMore(),
-                this.renderTutorialSteps(),
-                this.renderFooter(),
-            ])
-        )
+      return (
+        h('div.new-account-connect-form', {}, [
+          this.renderHeader(),
+          this.renderButtons(),
+          this.renderTrezorAffiliateLink(),
+          this.renderLearnMore(),
+          this.renderTutorialSteps(),
+          this.renderFooter(),
+        ])
+      )
     }
 
     render () {
-        if (this.props.browserSupported) {
-            return this.renderConnectScreen()
-        }
-        return this.renderUnsupportedBrowser()
+      if (this.props.browserSupported) {
+        return this.renderConnectScreen()
+      }
+      return this.renderUnsupportedBrowser()
     }
 }
 
 ConnectScreen.propTypes = {
-    connectToHardwareWallet: PropTypes.func.isRequired,
-    browserSupported: PropTypes.bool.isRequired,
+  connectToHardwareWallet: PropTypes.func.isRequired,
+  browserSupported: PropTypes.bool.isRequired,
 }
 
 ConnectScreen.contextTypes = {
-    t: PropTypes.func,
+  t: PropTypes.func,
 }
 
 module.exports = ConnectScreen
diff --git a/ui/app/pages/create-account/connect-hardware/index.js b/ui/app/pages/create-account/connect-hardware/index.js
index 80a160205..66851c780 100644
--- a/ui/app/pages/create-account/connect-hardware/index.js
+++ b/ui/app/pages/create-account/connect-hardware/index.js
@@ -126,16 +126,16 @@ class ConnectHardwareForm extends Component {
 
   onForgetDevice = (device) => {
     this.props.forgetDevice(device)
-    .then(_ => {
-      this.setState({
-        error: null,
-        selectedAccount: null,
-        accounts: [],
-        unlocked: false,
+      .then(_ => {
+        this.setState({
+          error: null,
+          selectedAccount: null,
+          accounts: [],
+          unlocked: false,
+        })
+      }).catch(e => {
+        this.setState({ error: e.toString() })
       })
-    }).catch(e => {
-      this.setState({ error: e.toString() })
-    })
   }
 
   onUnlockAccount = (device) => {
@@ -145,28 +145,28 @@ class ConnectHardwareForm extends Component {
     }
 
     this.props.unlockHardwareWalletAccount(this.state.selectedAccount, device)
-    .then(_ => {
-      this.context.metricsEvent({
-        eventOpts: {
-          category: 'Accounts',
-          action: 'Connected Hardware Wallet',
-          name: 'Connected Account with: ' + device,
-        },
-      })
-      this.props.history.push(DEFAULT_ROUTE)
-    }).catch(e => {
-      this.context.metricsEvent({
-        eventOpts: {
-          category: 'Accounts',
-          action: 'Connected Hardware Wallet',
-          name: 'Error connecting hardware wallet',
-        },
-        customVariables: {
-          error: e.toString(),
-        },
+      .then(_ => {
+        this.context.metricsEvent({
+          eventOpts: {
+            category: 'Accounts',
+            action: 'Connected Hardware Wallet',
+            name: 'Connected Account with: ' + device,
+          },
+        })
+        this.props.history.push(DEFAULT_ROUTE)
+      }).catch(e => {
+        this.context.metricsEvent({
+          eventOpts: {
+            category: 'Accounts',
+            action: 'Connected Hardware Wallet',
+            name: 'Error connecting hardware wallet',
+          },
+          customVariables: {
+            error: e.toString(),
+          },
+        })
+        this.setState({ error: e.toString() })
       })
-      this.setState({ error: e.toString() })
-    })
   }
 
   onCancel = () => {
diff --git a/ui/app/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js b/ui/app/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js
index a2fb5a3bf..a5cf0f752 100644
--- a/ui/app/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js
+++ b/ui/app/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js
@@ -174,7 +174,7 @@ export default class ImportWithSeedPhrase extends PureComponent {
     })
 
     this.setState((prevState) => ({
-        termsChecked: !prevState.termsChecked,
+      termsChecked: !prevState.termsChecked,
     }))
   }
 
diff --git a/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js b/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
index e4d6afb76..bb187d634 100644
--- a/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
+++ b/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
@@ -102,7 +102,7 @@ export default class MetaMetricsOptIn extends Component {
                       .then(() => {
                         history.push(nextRoute)
                       })
-                })
+                  })
               }}
               cancelText={'No Thanks'}
               hideCancel={false}
@@ -135,7 +135,7 @@ export default class MetaMetricsOptIn extends Component {
                       .then(() => {
                         history.push(nextRoute)
                       })
-                })
+                  })
               }}
               submitText={'I agree'}
               submitButtonType={'primary'}
diff --git a/ui/app/pages/first-time-flow/select-action/select-action.component.js b/ui/app/pages/first-time-flow/select-action/select-action.component.js
index 9e7b84e93..5379952f1 100644
--- a/ui/app/pages/first-time-flow/select-action/select-action.component.js
+++ b/ui/app/pages/first-time-flow/select-action/select-action.component.js
@@ -40,7 +40,7 @@ export default class SelectAction extends PureComponent {
     const { t } = this.context
 
     return (
-       <div className="select-action">
+      <div className="select-action">
         <MetaFoxLogo />
 
         <div className="select-action__wrapper">
@@ -95,7 +95,7 @@ export default class SelectAction extends PureComponent {
           </div>
 
         </div>
-       </div>
+      </div>
     )
   }
 }
diff --git a/ui/app/pages/home/home.component.js b/ui/app/pages/home/home.component.js
index 01bec7db6..a3b486c57 100644
--- a/ui/app/pages/home/home.component.js
+++ b/ui/app/pages/home/home.component.js
@@ -40,7 +40,7 @@ export default class Home extends PureComponent {
 
     // suggested new tokens
     if (Object.keys(suggestedTokens).length > 0) {
-        history.push(CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE)
+      history.push(CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE)
     }
   }
 
diff --git a/ui/app/pages/mobile-sync/index.js b/ui/app/pages/mobile-sync/index.js
index a8de4fce9..7fc3b540b 100644
--- a/ui/app/pages/mobile-sync/index.js
+++ b/ui/app/pages/mobile-sync/index.js
@@ -100,15 +100,15 @@ class MobileSyncPage extends Component {
         }
 
         if (message.event === 'start-sync') {
-            this.startSyncing()
+          this.startSyncing()
         } else if (message.event === 'connection-info') {
-            this.handle && clearTimeout(this.handle)
-            this.disconnectWebsockets()
-            this.initWithCipherKeyAndChannelName(message.cipher, message.channel)
-            this.initWebsockets()
+          this.handle && clearTimeout(this.handle)
+          this.disconnectWebsockets()
+          this.initWithCipherKeyAndChannelName(message.cipher, message.channel)
+          this.initWebsockets()
         } else if (message.event === 'end-sync') {
-            this.disconnectWebsockets()
-            this.setState({syncing: false, completed: true})
+          this.disconnectWebsockets()
+          this.setState({syncing: false, completed: true})
         }
       },
     })
@@ -126,10 +126,10 @@ class MobileSyncPage extends Component {
     }
   }
 
-    // Calculating a PubNub Message Payload Size.
+  // Calculating a PubNub Message Payload Size.
   calculatePayloadSize (channel, message) {
     return encodeURIComponent(
-        channel + JSON.stringify(message)
+      channel + JSON.stringify(message)
     ).length + 100
   }
 
@@ -153,14 +153,14 @@ class MobileSyncPage extends Component {
           channel: this.channelName,
           sendByPost: false, // true to send via post
           storeInHistory: false,
-      },
-      (status, response) => {
-        if (!status.error) {
-          resolve()
-        } else {
-          reject(response)
-        }
-      })
+        },
+        (status, response) => {
+          if (!status.error) {
+            resolve()
+          } else {
+            reject(response)
+          }
+        })
     })
   }
 
@@ -199,16 +199,16 @@ class MobileSyncPage extends Component {
   sendMessage (data, pkg, count) {
     return new Promise((resolve, reject) => {
       this.pubnub.publish(
-         {
-            message: {
-              event: 'syncing-data',
-              data,
-              totalPkg: count,
-              currentPkg: pkg,
-            },
-            channel: this.channelName,
-            sendByPost: false, // true to send via post
-            storeInHistory: false,
+        {
+          message: {
+            event: 'syncing-data',
+            data,
+            totalPkg: count,
+            currentPkg: pkg,
+          },
+          channel: this.channelName,
+          sendByPost: false, // true to send via post
+          storeInHistory: false,
         },
         (status, response) => {
           if (!status.error) {
@@ -229,7 +229,7 @@ class MobileSyncPage extends Component {
   renderWarning (text) {
     return (
       h('.page-container__warning-container', [
-       h('.page-container__warning-message', [
+        h('.page-container__warning-message', [
           h('div', [text]),
         ]),
       ])
@@ -245,12 +245,12 @@ class MobileSyncPage extends Component {
 
     if (this.state.completed) {
       return h('div.reveal-seed__content', {},
-          h('label.reveal-seed__label', {
-            style: {
-             width: '100%',
-             textAlign: 'center',
-            },
-          }, t('syncWithMobileComplete')),
+        h('label.reveal-seed__label', {
+          style: {
+            width: '100%',
+            textAlign: 'center',
+          },
+        }, t('syncWithMobileComplete')),
       )
     }
 
@@ -303,8 +303,8 @@ class MobileSyncPage extends Component {
       h('div', [
         h('label.reveal-seed__label', {
           style: {
-           width: '100%',
-           textAlign: 'center',
+            width: '100%',
+            textAlign: 'center',
           },
         }, t('syncWithMobileScanThisCode')),
         h('.div.qr-wrapper', {
@@ -370,7 +370,7 @@ class MobileSyncPage extends Component {
           this.state.screen === PASSWORD_PROMPT_SCREEN ? h('.page-container__subtitle', this.context.t('syncWithMobileDescNewUsers')) : null,
         ]),
         h('.page-container__content', [
-            this.renderContent(),
+          this.renderContent(),
         ]),
         this.renderFooter(),
       ])
diff --git a/ui/app/pages/routes/index.js b/ui/app/pages/routes/index.js
index 0f4737f22..2f7caf3bf 100644
--- a/ui/app/pages/routes/index.js
+++ b/ui/app/pages/routes/index.js
@@ -194,16 +194,16 @@ class Routes extends Component {
     const { transaction: sidebarTransaction } = props || {}
 
     const sidebarOnOverlayClose = sidebarType === WALLET_VIEW_SIDEBAR
-    ? () => {
-      this.context.metricsEvent({
-        eventOpts: {
-          category: 'Navigation',
-          action: 'Wallet Sidebar',
-          name: 'Closed Sidebare Via Overlay',
-        },
-      })
-    }
-    : null
+      ? () => {
+        this.context.metricsEvent({
+          eventOpts: {
+            category: 'Navigation',
+            action: 'Wallet Sidebar',
+            name: 'Closed Sidebare Via Overlay',
+          },
+        })
+      }
+      : null
 
     return (
       <div
diff --git a/ui/app/pages/send/account-list-item/account-list-item.container.js b/ui/app/pages/send/account-list-item/account-list-item.container.js
index 21f800306..3fadec4f8 100644
--- a/ui/app/pages/send/account-list-item/account-list-item.container.js
+++ b/ui/app/pages/send/account-list-item/account-list-item.container.js
@@ -1,8 +1,8 @@
 import { connect } from 'react-redux'
 import {
-    getConversionRate,
-    getCurrentCurrency,
-    getNativeCurrency,
+  getConversionRate,
+  getCurrentCurrency,
+  getNativeCurrency,
 } from '../send.selectors.js'
 import {
   getIsMainnet,
diff --git a/ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js b/ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js
index a6160d335..a39db7813 100644
--- a/ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js
+++ b/ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js
@@ -12,7 +12,7 @@ function getToDropdownOpen (state) {
 }
 
 function sendToIsInError (state) {
-    return Boolean(state.send.errors.to)
+  return Boolean(state.send.errors.to)
 }
 
 function sendToIsInWarning (state) {
diff --git a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js b/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
index 7901ccef6..05545669a 100644
--- a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
+++ b/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
@@ -64,12 +64,12 @@ export default class AmountMaxButton extends Component {
     const { maxModeOn, buttonDataLoading, inError } = this.props
 
     return (
-          <div className={'send-v2__amount-max'} onClick={buttonDataLoading || inError ? null : this.onMaxClick}>
-            <input type="checkbox" checked={maxModeOn} />
-            <div className={classnames('send-v2__amount-max__button', { 'send-v2__amount-max__button__disabled': buttonDataLoading || inError })}>
-                {this.context.t('max')}
-            </div>
-          </div>
-      )
+      <div className={'send-v2__amount-max'} onClick={buttonDataLoading || inError ? null : this.onMaxClick}>
+        <input type="checkbox" checked={maxModeOn} />
+        <div className={classnames('send-v2__amount-max__button', { 'send-v2__amount-max__button__disabled': buttonDataLoading || inError })}>
+          {this.context.t('max')}
+        </div>
+      </div>
+    )
   }
 }
diff --git a/ui/app/pages/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js b/ui/app/pages/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
index 3f5587318..37af59e29 100644
--- a/ui/app/pages/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
+++ b/ui/app/pages/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
@@ -39,11 +39,11 @@ export default class GasFeeDisplay extends Component {
           )
           : gasLoadingError
             ? <div className="currency-display.currency-display--message">
-                {this.context.t('setGasPrice')}
-              </div>
+              {this.context.t('setGasPrice')}
+            </div>
             : <div className="currency-display">
-                {this.context.t('loading')}
-              </div>
+              {this.context.t('loading')}
+            </div>
         }
         <button
           className="gas-fee-reset"
diff --git a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
index 4c09ed564..ed064695e 100644
--- a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
@@ -90,26 +90,26 @@ export default class SendGasRow extends Component {
     const { metricsEvent } = this.context
 
     const gasPriceButtonGroup = <div>
-        <GasPriceButtonGroup
-          className="gas-price-button-group--small"
-          showCheck={false}
-          {...gasPriceButtonGroupProps}
-          handleGasPriceSelection={async (...args) => {
-            metricsEvent({
-              eventOpts: {
-                category: 'Transactions',
-                action: 'Edit Screen',
-                name: 'Changed Gas Button',
-              },
-            })
-            await gasPriceButtonGroupProps.handleGasPriceSelection(...args)
-            if (maxModeOn) {
-              this.setMaxAmount()
-            }
-          }}
-        />
-        { this.renderAdvancedOptionsButton() }
-      </div>
+      <GasPriceButtonGroup
+        className="gas-price-button-group--small"
+        showCheck={false}
+        {...gasPriceButtonGroupProps}
+        handleGasPriceSelection={async (...args) => {
+          metricsEvent({
+            eventOpts: {
+              category: 'Transactions',
+              action: 'Edit Screen',
+              name: 'Changed Gas Button',
+            },
+          })
+          await gasPriceButtonGroupProps.handleGasPriceSelection(...args)
+          if (maxModeOn) {
+            this.setMaxAmount()
+          }
+        }}
+      />
+      { this.renderAdvancedOptionsButton() }
+    </div>
     const gasFeeDisplay = <GasFeeDisplay
       conversionRate={conversionRate}
       convertedCurrency={convertedCurrency}
@@ -134,7 +134,7 @@ export default class SendGasRow extends Component {
         isSpeedUp={false}
       />
       { this.renderAdvancedOptionsButton() }
-     </div>
+    </div>
 
     if (advancedInlineGasShown) {
       return advancedGasInputs
diff --git a/ui/app/pages/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.component.js b/ui/app/pages/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.component.js
index f1caa8f99..6ddddbb3d 100644
--- a/ui/app/pages/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.component.js
+++ b/ui/app/pages/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.component.js
@@ -18,7 +18,7 @@ export default class SendRowWarningMessage extends Component {
     const warningMessage = warningType in warnings && warnings[warningType]
 
     return (
-        warningMessage
+      warningMessage
         ? <div className="send-v2__warning">{this.context.t(warningMessage)}</div>
         : null
     )
diff --git a/ui/app/pages/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js b/ui/app/pages/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
index 30280e1d0..533ca2ebe 100644
--- a/ui/app/pages/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
+++ b/ui/app/pages/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
@@ -54,25 +54,25 @@ describe('SendContent Component', function () {
 
     it('should render its second child as a child of the send-v2__form-field, if it has two children', () => {
       wrapper = shallow(<SendRowWrapper
-      errorType={'mockErrorType'}
-      label={'mockLabel'}
-      showError={false}
-    >
-      <span>Mock Custom Label Content</span>
-      <span>Mock Form Field</span>
-    </SendRowWrapper>)
+        errorType={'mockErrorType'}
+        label={'mockLabel'}
+        showError={false}
+      >
+        <span>Mock Custom Label Content</span>
+        <span>Mock Form Field</span>
+      </SendRowWrapper>)
       assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-field').childAt(0).text(), 'Mock Form Field')
     })
 
     it('should render its first child as the last child of the send-v2__form-label, if it has two children', () => {
       wrapper = shallow(<SendRowWrapper
-      errorType={'mockErrorType'}
-      label={'mockLabel'}
-      showError={false}
-    >
-      <span>Mock Custom Label Content</span>
-      <span>Mock Form Field</span>
-    </SendRowWrapper>)
+        errorType={'mockErrorType'}
+        label={'mockLabel'}
+        showError={false}
+      >
+        <span>Mock Custom Label Content</span>
+        <span>Mock Form Field</span>
+      </SendRowWrapper>)
       assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-label').childAt(1).text(), 'Mock Custom Label Content')
     })
   })
diff --git a/ui/app/pages/send/send-header/send-header.selectors.js b/ui/app/pages/send/send-header/send-header.selectors.js
index 2c0a907d8..01b90409b 100644
--- a/ui/app/pages/send/send-header/send-header.selectors.js
+++ b/ui/app/pages/send/send-header/send-header.selectors.js
@@ -29,14 +29,14 @@ function getTitleKey (state) {
 }
 
 function getSubtitleParams (state) {
-    const isEditing = Boolean(getSendEditingTransactionId(state))
-    const token = getSelectedToken(state)
+  const isEditing = Boolean(getSendEditingTransactionId(state))
+  const token = getSelectedToken(state)
 
-    if (isEditing) {
-      return [ 'editingTransaction' ]
-    } else if (token) {
-      return [ 'onlySendTokensToAccountAddress', [ token.symbol ] ]
-    } else {
-      return [ 'onlySendToEtherAddress' ]
-    }
+  if (isEditing) {
+    return [ 'editingTransaction' ]
+  } else if (token) {
+    return [ 'onlySendTokensToAccountAddress', [ token.symbol ] ]
+  } else {
+    return [ 'onlySendToEtherAddress' ]
+  }
 }
diff --git a/ui/app/pages/send/send.utils.js b/ui/app/pages/send/send.utils.js
index daf61bc1b..1f9bc202a 100644
--- a/ui/app/pages/send/send.utils.js
+++ b/ui/app/pages/send/send.utils.js
@@ -319,7 +319,7 @@ function estimateGasPriceFromRecentBlocks (recentBlocks) {
       return parseInt(next, 16) < parseInt(currentLowest, 16) ? next : currentLowest
     })
   })
-  .sort((a, b) => parseInt(a, 16) > parseInt(b, 16) ? 1 : -1)
+    .sort((a, b) => parseInt(a, 16) > parseInt(b, 16) ? 1 : -1)
 
   return lowestPrices[Math.floor(lowestPrices.length / 2)]
 }
diff --git a/ui/app/pages/send/tests/send-utils.test.js b/ui/app/pages/send/tests/send-utils.test.js
index bf9cba14a..4930b7ee1 100644
--- a/ui/app/pages/send/tests/send-utils.test.js
+++ b/ui/app/pages/send/tests/send-utils.test.js
@@ -72,9 +72,9 @@ describe('send utils', () => {
         call_,
         [12, 15, {
           toNumericBase: 'hex',
-           multiplicandBase: 16,
-           multiplierBase: 16,
-         } ]
+          multiplicandBase: 16,
+          multiplierBase: 16,
+        } ]
       )
     })
   })
diff --git a/ui/app/pages/send/to-autocomplete.component.js b/ui/app/pages/send/to-autocomplete.component.js
index 183967c58..c65f93c07 100644
--- a/ui/app/pages/send/to-autocomplete.component.js
+++ b/ui/app/pages/send/to-autocomplete.component.js
@@ -27,10 +27,10 @@ export default class ToAutoComplete extends Component {
   getListItemIcon (listItemAddress, toAddress) {
     return toAddress && listItemAddress === toAddress
       ? <i className={'fa fa-check fa-lg'}
-          style={{
-            color: '#02c9b1',
-          }}
-        />
+        style={{
+          color: '#02c9b1',
+        }}
+      />
       : null
   }
 
@@ -121,8 +121,8 @@ export default class ToAutoComplete extends Component {
         />
         {
           to
-          ? null
-          : <i className={'fa fa-caret-down fa-lg send-v2__to-autocomplete__down-caret'}
+            ? null
+            : <i className={'fa fa-caret-down fa-lg send-v2__to-autocomplete__down-caret'}
               onClick={() => this.handleInputEvent()}
               style={{
                 style: {color: '#dedede'},
@@ -131,8 +131,8 @@ export default class ToAutoComplete extends Component {
         }
         {
           dropdownOpen
-          ? this.renderDropdown()
-          : null
+            ? this.renderDropdown()
+            : null
         }
       </div>
     )
diff --git a/ui/app/pages/settings/advanced-tab/advanced-tab.component.js b/ui/app/pages/settings/advanced-tab/advanced-tab.component.js
index 105cd89f9..d92b14501 100644
--- a/ui/app/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/app/pages/settings/advanced-tab/advanced-tab.component.js
@@ -33,7 +33,7 @@ export default class AdvancedTab extends PureComponent {
   renderMobileSync () {
     const { t } = this.context
     const { history } = this.props
-//
+    //
     return (
       <div className="settings-page__content-row">
         <div className="settings-page__content-item">
diff --git a/ui/app/pages/settings/advanced-tab/tests/advanced-tab-container.test.js b/ui/app/pages/settings/advanced-tab/tests/advanced-tab-container.test.js
index 62122073d..3f54350c5 100644
--- a/ui/app/pages/settings/advanced-tab/tests/advanced-tab-container.test.js
+++ b/ui/app/pages/settings/advanced-tab/tests/advanced-tab-container.test.js
@@ -35,12 +35,12 @@ describe('AdvancedTab Container', () => {
   it('should map dispatch to props correctly', () => {
     const props = mapDispatchToProps(() => 'mockDispatch')
 
-      assert.ok(typeof props.setHexDataFeatureFlag === 'function')
-      assert.ok(typeof props.setRpcTarget === 'function')
-      assert.ok(typeof props.displayWarning === 'function')
-      assert.ok(typeof props.showResetAccountConfirmationModal === 'function')
-      assert.ok(typeof props.setAdvancedInlineGasFeatureFlag === 'function')
-      assert.ok(typeof props.setShowFiatConversionOnTestnetsPreference === 'function')
-      assert.ok(typeof props.setAutoLogoutTimeLimit === 'function')
+    assert.ok(typeof props.setHexDataFeatureFlag === 'function')
+    assert.ok(typeof props.setRpcTarget === 'function')
+    assert.ok(typeof props.displayWarning === 'function')
+    assert.ok(typeof props.showResetAccountConfirmationModal === 'function')
+    assert.ok(typeof props.setAdvancedInlineGasFeatureFlag === 'function')
+    assert.ok(typeof props.setShowFiatConversionOnTestnetsPreference === 'function')
+    assert.ok(typeof props.setAutoLogoutTimeLimit === 'function')
   })
 })
diff --git a/ui/app/pages/settings/contact-list-tab/add-contact/add-contact.component.js b/ui/app/pages/settings/contact-list-tab/add-contact/add-contact.component.js
index 871b2128b..f8c079fc3 100644
--- a/ui/app/pages/settings/contact-list-tab/add-contact/add-contact.component.js
+++ b/ui/app/pages/settings/contact-list-tab/add-contact/add-contact.component.js
@@ -84,15 +84,15 @@ export default class AddContact extends PureComponent {
     return (
       <div className="settings-page__content-row address-book__add-contact">
         {this.state.ensAddress && <div className="address-book__view-contact__group">
-            <Identicon address={this.state.ensAddress} diameter={60} />
-            <div className="address-book__view-contact__group__value">
-              { this.state.ensAddress }
-            </div>
+          <Identicon address={this.state.ensAddress} diameter={60} />
+          <div className="address-book__view-contact__group__value">
+            { this.state.ensAddress }
+          </div>
         </div>}
         <div className="address-book__add-contact__content">
-            <div className="address-book__view-contact__group">
+          <div className="address-book__view-contact__group">
             <div className="address-book__view-contact__group__label">
-                { t('userName') }
+              { t('userName') }
             </div>
             <TextField
               type="text"
diff --git a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
index e9c2fed6f..4852bbc6a 100644
--- a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
+++ b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
@@ -31,7 +31,7 @@ export default class EditContact extends PureComponent {
     error: '',
   }
 
-   render () {
+  render () {
     const { t } = this.context
     const { history, name, addToAddressBook, removeFromAddressBook, address, memo, viewRoute, listRoute, setAccountLabel } = this.props
 
@@ -51,9 +51,9 @@ export default class EditContact extends PureComponent {
           </Button>
         </div>
         <div className="address-book__edit-contact__content">
-            <div className="address-book__view-contact__group">
+          <div className="address-book__view-contact__group">
             <div className="address-book__view-contact__group__label">
-                { t('userName') }
+              { t('userName') }
             </div>
             <TextField
               type="text"
diff --git a/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.component.js b/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.component.js
index 4f37b853b..d4fe045eb 100644
--- a/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.component.js
+++ b/ui/app/pages/settings/contact-list-tab/view-contact/view-contact.component.js
@@ -25,7 +25,7 @@ export default class ViewContact extends PureComponent {
     editRoute: PropTypes.string,
   }
 
-   render () {
+  render () {
     const { t } = this.context
     const { history, name, address, checkSummedAddress, memo, editRoute } = this.props
 
diff --git a/ui/app/pages/settings/networks-tab/networks-tab.component.js b/ui/app/pages/settings/networks-tab/networks-tab.component.js
index cf634058f..db5663036 100644
--- a/ui/app/pages/settings/networks-tab/networks-tab.component.js
+++ b/ui/app/pages/settings/networks-tab/networks-tab.component.js
@@ -50,16 +50,16 @@ export default class NetworksTab extends PureComponent {
 
     return (
       <div className="settings-page__sub-header">
-          <div
-            className="networks-tab__back-button"
-            onClick={(networkIsSelected && !networkDefaultedToProvider) || networksTabIsInAddMode
-              ? () => {
-                  setNetworksTabAddMode(false)
-                  setSelectedSettingsRpcUrl(null)
-                }
-              : () => this.props.history.push(SETTINGS_ROUTE)
+        <div
+          className="networks-tab__back-button"
+          onClick={(networkIsSelected && !networkDefaultedToProvider) || networksTabIsInAddMode
+            ? () => {
+              setNetworksTabAddMode(false)
+              setSelectedSettingsRpcUrl(null)
             }
-          />
+            : () => this.props.history.push(SETTINGS_ROUTE)
+          }
+        />
         <span className="settings-page__sub-header-text">{ this.context.t('networks') }</span>
         <div className="networks-tab__add-network-header-button-wrapper">
           <Button
@@ -109,7 +109,7 @@ export default class NetworksTab extends PureComponent {
           setNetworksTabAddMode(false)
           setSelectedSettingsRpcUrl(rpcUrl)
         }}
-       >
+      >
         <NetworkDropdownIcon
           backgroundColor={iconColor || 'white'}
           innerBorder={border}
@@ -223,16 +223,16 @@ export default class NetworksTab extends PureComponent {
         {this.renderNetworksTabContent()}
         {!networkIsSelected && !networksTabIsInAddMode
           ? <div className="networks-tab__add-network-button-wrapper">
-              <Button
-                type="primary"
-                onClick={event => {
-                  event.preventDefault()
-                  setSelectedSettingsRpcUrl(null)
-                  setNetworksTabAddMode(true)
-                }}
-              >
-                { this.context.t('addNetwork') }
-              </Button>
+            <Button
+              type="primary"
+              onClick={event => {
+                event.preventDefault()
+                setSelectedSettingsRpcUrl(null)
+                setNetworksTabAddMode(true)
+              }}
+            >
+              { this.context.t('addNetwork') }
+            </Button>
           </div>
           : null
         }
diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index 72d5a1788..2667dd803 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -274,12 +274,12 @@ var actions = {
   showSubLoadingIndication: showSubLoadingIndication,
   HIDE_SUB_LOADING_INDICATION: 'HIDE_SUB_LOADING_INDICATION',
   hideSubLoadingIndication: hideSubLoadingIndication,
-// QR STUFF:
+  // QR STUFF:
   SHOW_QR: 'SHOW_QR',
   showQrView: showQrView,
   reshowQrCode: reshowQrCode,
   SHOW_QR_VIEW: 'SHOW_QR_VIEW',
-// FORGOT PASSWORD:
+  // FORGOT PASSWORD:
   BACK_TO_INIT_MENU: 'BACK_TO_INIT_MENU',
   goBackToInitView: goBackToInitView,
   RECOVERY_IN_PROGRESS: 'RECOVERY_IN_PROGRESS',
@@ -791,22 +791,22 @@ function showInfoPage () {
 function showQrScanner (ROUTE) {
   return (dispatch) => {
     return WebcamUtils.checkStatus()
-    .then(status => {
-      if (!status.environmentReady) {
-         // We need to switch to fullscreen mode to ask for permission
-         global.platform.openExtensionInBrowser(`${ROUTE}`, `scan=true`)
-      } else {
+      .then(status => {
+        if (!status.environmentReady) {
+          // We need to switch to fullscreen mode to ask for permission
+          global.platform.openExtensionInBrowser(`${ROUTE}`, `scan=true`)
+        } else {
+          dispatch(actions.showModal({
+            name: 'QR_SCANNER',
+          }))
+        }
+      }).catch(e => {
         dispatch(actions.showModal({
           name: 'QR_SCANNER',
+          error: true,
+          errorType: e.type,
         }))
-      }
-    }).catch(e => {
-      dispatch(actions.showModal({
-        name: 'QR_SCANNER',
-        error: true,
-        errorType: e.type,
-      }))
-    })
+      })
   }
 }
 
@@ -967,17 +967,17 @@ function updateGasData ({
       estimateGasPrice: gasPrice,
       data,
     })
-    .then(gas => {
-      dispatch(actions.setGasLimit(gas))
-      dispatch(gasDuck.setCustomGasLimit(gas))
-      dispatch(updateSendErrors({ gasLoadingError: null }))
-      dispatch(actions.gasLoadingFinished())
-    })
-    .catch(err => {
-      log.error(err)
-      dispatch(updateSendErrors({ gasLoadingError: 'gasLoadingError' }))
-      dispatch(actions.gasLoadingFinished())
-    })
+      .then(gas => {
+        dispatch(actions.setGasLimit(gas))
+        dispatch(gasDuck.setCustomGasLimit(gas))
+        dispatch(updateSendErrors({ gasLoadingError: null }))
+        dispatch(actions.gasLoadingFinished())
+      })
+      .catch(err => {
+        log.error(err)
+        dispatch(updateSendErrors({ gasLoadingError: 'gasLoadingError' }))
+        dispatch(actions.gasLoadingFinished())
+      })
   }
 }
 
@@ -1166,9 +1166,9 @@ function updateTransaction (txData) {
         resolve(txData)
       })
     })
-    .then(() => updateMetamaskStateFromBackground())
-    .then(newState => dispatch(actions.updateMetamaskState(newState)))
-    .then(() => {
+      .then(() => updateMetamaskStateFromBackground())
+      .then(newState => dispatch(actions.updateMetamaskState(newState)))
+      .then(() => {
         dispatch(actions.showConfTxPage({ id: txData.id }))
         dispatch(actions.hideLoadingIndication())
         return txData
@@ -1711,10 +1711,10 @@ function addTokens (tokens) {
       dispatch(actions.setSelectedToken(getTokenAddressFromTokenObject(tokens)))
       return Promise.all(
         Object
-        .entries(tokens)
-        .map(([_, { address, symbol, decimals }]) => (
-          dispatch(addToken(address, symbol, decimals))
-        ))
+          .entries(tokens)
+          .map(([_, { address, symbol, decimals }]) => (
+            dispatch(addToken(address, symbol, decimals))
+          ))
       )
     }
   }
@@ -1737,8 +1737,8 @@ function removeSuggestedTokens () {
         resolve(suggestedTokens)
       })
     })
-    .then(() => updateMetamaskStateFromBackground())
-    .then(suggestedTokens => dispatch(actions.updateMetamaskState({...suggestedTokens})))
+      .then(() => updateMetamaskStateFromBackground())
+      .then(suggestedTokens => dispatch(actions.updateMetamaskState({...suggestedTokens})))
   }
 }
 
@@ -1813,8 +1813,8 @@ function createCancelTransaction (txId, customGasPrice) {
         resolve(newState)
       })
     })
-    .then(newState => dispatch(actions.updateMetamaskState(newState)))
-    .then(() => newTxId)
+      .then(newState => dispatch(actions.updateMetamaskState(newState)))
+      .then(() => newTxId)
   }
 }
 
@@ -1835,8 +1835,8 @@ function createSpeedUpTransaction (txId, customGasPrice) {
         resolve(newState)
       })
     })
-    .then(newState => dispatch(actions.updateMetamaskState(newState)))
-    .then(() => newTx)
+      .then(newState => dispatch(actions.updateMetamaskState(newState)))
+      .then(() => newTx)
   }
 }
 
@@ -2071,10 +2071,10 @@ function showLoadingIndication (message) {
 }
 
 function setHardwareWalletDefaultHdPath ({ device, path }) {
-    return {
-      type: actions.SET_HARDWARE_WALLET_DEFAULT_HD_PATH,
-      value: {device, path},
-    }
+  return {
+    type: actions.SET_HARDWARE_WALLET_DEFAULT_HD_PATH,
+    value: {device, path},
+  }
 }
 
 function hideLoadingIndication () {
diff --git a/ui/index.js b/ui/index.js
index 42a7c1149..7eb305653 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -79,7 +79,7 @@ async function startApp (metamaskState, backgroundConnection, opts) {
       // inject initial state
       store: store,
     }
-  ), opts.container)
+    ), opts.container)
 
   return store
 }
diff --git a/ui/lib/webcam-utils.js b/ui/lib/webcam-utils.js
index eb717b23a..bd7a5a0e0 100644
--- a/ui/lib/webcam-utils.js
+++ b/ui/lib/webcam-utils.js
@@ -14,16 +14,16 @@ class WebcamUtils {
       try {
         DetectRTC.load(_ => {
           if (DetectRTC.hasWebcam) {
-              let environmentReady = true
-              if ((isFirefoxOrBrave && isPopup) || (isPopup && !DetectRTC.isWebsiteHasWebcamPermissions)) {
-                environmentReady = false
-              }
-              resolve({
-                permissions: DetectRTC.isWebsiteHasWebcamPermissions,
-                environmentReady,
-              })
+            let environmentReady = true
+            if ((isFirefoxOrBrave && isPopup) || (isPopup && !DetectRTC.isWebsiteHasWebcamPermissions)) {
+              environmentReady = false
+            }
+            resolve({
+              permissions: DetectRTC.isWebsiteHasWebcamPermissions,
+              environmentReady,
+            })
           } else {
-              reject({type: 'NO_WEBCAM_FOUND'})
+            reject({type: 'NO_WEBCAM_FOUND'})
           }
         })
       } catch (e) {