Merge pull request #12181 from xiemaisi/fix-lgtm-alerts

Fix issues found by lgtm
brave · Feb 13, 2018 · cd99dc6 · cd99dc6
2 parents 084744e + 5aa804b
commit cd99dc6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -959,7 +959,7 @@ const pageDataChanged = (state, viewData = {}, keepInfo = false) => {
       }
     }
 
-    if (!publisherKey || (publisherKey && ledgerUtil.blockedP(state, publisherKey))) {
+    if (!publisherKey || (ledgerUtil.blockedP(state, publisherKey))) {
       publisherKey = null
     }
 
@@ -1040,11 +1040,9 @@ const recoverKeys = (state, useRecoveryKeyFile, key) => {
       return state
     }
 
-    if (recoveryKeyFile) {
-      const result = loadKeysFromBackupFile(state, recoveryKeyFile)
-      recoveryKey = result.recoveryKey || ''
-      state = result.state
-    }
+    const result = loadKeysFromBackupFile(state, recoveryKeyFile)
+    recoveryKey = result.recoveryKey || ''
+    state = result.state
   }
 
   if (!recoveryKey) {
@@ -2399,7 +2397,7 @@ const transitionWalletToBat = () => {
   }
 
   // only attempt this transition if the wallet is v1
-  if (client && client.options && client.options.version !== 'v1') {
+  if (client.options && client.options.version !== 'v1') {
     // older versions incorrectly marked this for transition
     // this will clean them up (no more bouncy ball)
     appActions.onBitcoinToBatTransitioned()

diff --git a/app/common/commonMenu.js b/app/common/commonMenu.js
@@ -280,7 +280,7 @@ module.exports.submitFeedbackMenuItem = () => {
     click: function (item, focusedWindow) {
       ensureAtLeastOneWindow({
         url: communityURL
-      }, true)
+      })
     }
   }
 }

diff --git a/app/common/lib/ledgerExportUtil.js b/app/common/lib/ledgerExportUtil.js
@@ -34,10 +34,10 @@ const getTransactionsByViewingIds = (transactions, viewingIds) => {
     return transactions
   }
 
-  if (viewingIds && typeof (viewingIds) === 'string') {
+  if (typeof (viewingIds) === 'string') {
     viewingIds = [viewingIds]
   }
-  if (viewingIds && !viewingIds.length) {
+  if (!viewingIds.length) {
     viewingIds = null
   }
 

diff --git a/app/renderer/components/preferences/payment/addFundsDialog/steps/addFundsWizardAddress.js b/app/renderer/components/preferences/payment/addFundsDialog/steps/addFundsWizardAddress.js
@@ -90,7 +90,7 @@ class AddFundsWizardAddress extends React.Component {
           data-l10n-args={JSON.stringify({
             currencyName: this.currencyName,
             currency: this.currency
-          } || {})}
+          })}
         />
         <div className={css(styles.address__main)}>
           <main className={css(styles.address__main__inputBox)}>
@@ -107,14 +107,14 @@ class AddFundsWizardAddress extends React.Component {
                 data-l10n-args={JSON.stringify({
                   currency: this.currency,
                   funds: this.props.minAmount
-                } || {})}
+                })}
                 className={css(
                   styles.address__main__text_small,
                   styles.address__main__inputBox__text
                 )}
               />
               <p data-l10n-id={this.footerNote}
-                data-l10n-args={JSON.stringify({currency: this.currency} || {})}
+                data-l10n-args={JSON.stringify({currency: this.currency})}
                 className={css(
                   styles.address__main__text_small,
                   styles.address__main__inputBox__text

diff --git a/js/lib/urlutil.js b/js/lib/urlutil.js
@@ -433,7 +433,7 @@ const UrlUtil = {
     }
 
     const localFileOrigins = ['file:', 'blob:', 'data:', 'chrome-extension:', 'chrome:']
-    return origin && localFileOrigins.some((localFileOrigin) => origin.startsWith(localFileOrigin))
+    return localFileOrigins.some((localFileOrigin) => origin.startsWith(localFileOrigin))
   },
 
   getDisplayHost: (url) => {