Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine

4 files changed, 5 insertions, 5 deletions

diff --git a/old-ui/app/components/ens-input.js b/old-ui/app/components/ens-input.js
index 7e06fa9f1..9c46f77d7 100644
--- a/old-ui/app/components/ens-input.js
+++ b/old-ui/app/components/ens-input.js
@@ -20,7 +20,7 @@ function EnsInput () {
 EnsInput.prototype.render = function () {
   const props = this.props
 
-  function onInputChange() {
+  function onInputChange () {
     const network = this.props.network
     const networkHasEnsSupport = getNetworkEnsSupport(network)
     if (!networkHasEnsSupport) return
diff --git a/old-ui/app/components/loading.js b/old-ui/app/components/loading.js
index b8e2eb599..2a29361f9 100644
--- a/old-ui/app/components/loading.js
+++ b/old-ui/app/components/loading.js
@@ -28,7 +28,7 @@ LoadingIndicator.prototype.render = function () {
         background: 'rgba(255, 255, 255, 0.8)',
       },
     }, [
-      canBypass ? h( 'i.fa.fa-close.cursor-pointer.close-loading', {
+      canBypass ? h('i.fa.fa-close.cursor-pointer.close-loading', {
         style: {
           position: 'absolute',
           top: '1px',
diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js
index b9f82c668..e9280419a 100644
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@@ -40,8 +40,8 @@ TransactionListItem.prototype.showRetryButton = function () {
   const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce)
   const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
   const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0]
-  const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce
-    && lastSubmittedTxWithCurrentNonce.id === transaction.id
+  const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
+    lastSubmittedTxWithCurrentNonce.id === transaction.id
 
   return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000
 }
diff --git a/old-ui/app/config.js b/old-ui/app/config.js
index 508770bd4..392a6dba7 100644
--- a/old-ui/app/config.js
+++ b/old-ui/app/config.js
@@ -31,7 +31,7 @@ ConfigScreen.prototype.render = function () {
 
   return (
     h('.flex-column.flex-grow', {
-      style:{
+      style: {
         maxHeight: '585px',
         overflowY: 'auto',
       },