fix lint etc

.env.basealpha

@@ -52,4 +52,4 @@ VUE_APP_LINKED_VERIFIER_SUBIDENTIFIER=torus
 VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com
 VUE_APP_PASSWORDLESS_DOMAIN=https://lrc.auth.openlogin.com
 VUE_APP_DEVELOPER_DASHBOARD_URL=https://api-dev-dashboard.web3auth.io
-VUE_APP_WALLET_CONNECT_PROJECT_ID=04309ed1007e77d1f119b85205bb779d
+VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31

.env.binance

@@ -18,4 +18,4 @@ VUE_APP_HIDE_TOPUP=true
 VUE_APP_TKEY_SECURITY_QUESTIONS_MANDATORY=true
 VUE_APP_ETH_TRANSFER_ONLY=true
 VUE_APP_SENTRY_DSN=https://92430bf0bfdc4b82b7239c359b98ac56@o503538.ingest.sentry.io/5607693
-VUE_APP_WALLET_CONNECT_PROJECT_ID=04309ed1007e77d1f119b85205bb779d
+VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31

.env.bnb

@@ -54,4 +54,4 @@ VUE_APP_SENTRY_DSN=https://f41105d21e8d44048a36e7fdee4bafcd@o503538.ingest.sentr
 VUE_APP_DEVELOPER_DASHBOARD_URL=https://api.developer.tor.us
 # this is for bnb.tor.us
 VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEQCIB9wN5FYV91zbJWssKw-T707Iz-k2qigQ8OB6tt0N_IGAiAJ6aoQZ2oM3RBJ6G1bFeU8zPv54cv_LBYzOVtXZj6G3w
-VUE_APP_WALLET_CONNECT_PROJECT_ID=04309ed1007e77d1f119b85205bb779d
+VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31

.env.development

@@ -55,4 +55,4 @@ VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com
 VUE_APP_PASSWORDLESS_DOMAIN=https://lrc.auth.openlogin.com
 VUE_APP_DEVELOPER_DASHBOARD_URL=https://api-dev-dashboard.web3auth.io
 # VUE_APP_DEVELOPER_DASHBOARD_URL=http://localhost:5051
-VUE_APP_WALLET_CONNECT_PROJECT_ID=04309ed1007e77d1f119b85205bb779d
+VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31

.env.lrc

@@ -55,4 +55,4 @@ VUE_APP_PASSWORDLESS_DOMAIN=https://lrc.auth.openlogin.com
 VUE_APP_DEVELOPER_DASHBOARD_URL=https://api-dev-dashboard.web3auth.io
 # this is for lrc.tor.us
 VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEQCIGv3oTOdAMltfeDrcT-0ilhYlGuZ8yuhezQHU883XjJEAiByG6Duhn5kqNgEy2oJosza1t0VOfPxzeI25g_ZHysXNA
-VUE_APP_WALLET_CONNECT_PROJECT_ID=04309ed1007e77d1f119b85205bb779d
+VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31

.env.polygon

@@ -54,4 +54,4 @@ VUE_APP_SENTRY_DSN=https://f41105d21e8d44048a36e7fdee4bafcd@o503538.ingest.sentr
 VUE_APP_DEVELOPER_DASHBOARD_URL=https://api.developer.tor.us
 # this is for polygon.tor.us
 VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEQCIHmKCljC6Ncxe-TyhKHWxTUI7eFj3kjUEqgu40aLZkS0AiAki72DNFmj2WD_itl-5LZ_wYzK1ZS_B7o5qzHzSnzI5w
-VUE_APP_WALLET_CONNECT_PROJECT_ID=04309ed1007e77d1f119b85205bb779d
+VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31

.env.production

@@ -54,4 +54,4 @@ VUE_APP_SENTRY_DSN=https://f41105d21e8d44048a36e7fdee4bafcd@o503538.ingest.sentr
 VUE_APP_DEVELOPER_DASHBOARD_URL=https://api.developer.tor.us
 # this is for app.tor.us
 VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEUCIQDFdkBIGWMCQzmclVVWSrUiropSXKmh9OudXiOhp-jZfwIgdCCO2LM3xE5XQPVQA4M4d_GNwYU-h87ieA3cfhZ6-Yo
-VUE_APP_WALLET_CONNECT_PROJECT_ID=04309ed1007e77d1f119b85205bb779d
+VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31

.env.testing

@@ -53,4 +53,4 @@ VUE_APP_PASSWORDLESS_DOMAIN=https://auth.openlogin.com
 VUE_APP_DEVELOPER_DASHBOARD_URL=https://api.developer.tor.us
 # this is for testing.tor.us
 VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEUCIQDtJOb6jb4iY6-ENsf8IB19W0SZ21VJFNHd1GfSTOj7RwIgfIiCR7QU8MA-kIkv_qaF28fqTljaCLvF38-oWtvg-ZI
-VUE_APP_WALLET_CONNECT_PROJECT_ID=04309ed1007e77d1f119b85205bb779d
+VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31

src/components/Confirm/ConfirmForm/ConfirmForm.vue

@@ -656,7 +656,7 @@ export default {
       return `~ ${totalCost} ${this.selectedCurrency}`
     },
     currencyMultiplier() {
-      const currencyMultiplierNumber = this.selectedCurrency !== 'ETH' ? this.currencyData[this.selectedCurrency.toLowerCase()] || 1 : 1
+      const currencyMultiplierNumber = this.selectedCurrency === 'ETH' ? 1 : this.currencyData[this.selectedCurrency.toLowerCase()] || 1
       return new BigNumber(currencyMultiplierNumber)
     },
     getCurrencyRate() {
@@ -712,18 +712,7 @@ export default {
         this.id = id
         this.message = data
         this.sender = from
-      } else if (type !== TRANSACTION_TYPES.STANDARD_TRANSACTION) {
-        const { msgParams: { message, typedMessages } = {}, id = '' } = msgParams || {}
-        let finalTypedMessages = typedMessages
-        try {
-          finalTypedMessages = typedMessages && JSON.parse(typedMessages)
-        } catch (error) {
-          log.error(error)
-        }
-        this.id = id
-        this.message = message
-        this.typedMessages = finalTypedMessages
-      } else {
+      } else if (type === TRANSACTION_TYPES.STANDARD_TRANSACTION) {
         let finalValue = new BigNumber('0')
         const { simulationFails, id, transactionCategory, methodParams, contractParams, txParams: txObject, userInfo } = txParams || {}
         const { value, to, data, from: sender, gas, gasPrice, maxFeePerGas, maxPriorityFeePerGas } = txObject || {}
@@ -834,7 +823,7 @@ export default {
         this.gasEstimate = new BigNumber(gas, 16) // gas number
         this.gasEstimateDefault = new BigNumber(gas, 16) // gas number
         this.txData = data // data hex
-        this.txDataParams = txDataParameters !== '' ? JSON.stringify(txDataParameters, null, 2) : ''
+        this.txDataParams = txDataParameters === '' ? '' : JSON.stringify(txDataParameters, null, 2)
         this.sender = sender // address of sender
         this.gasCost = this.gasEstimate.times(gweiGasPrice).div(new BigNumber('10').pow(new BigNumber('9')))
         this.txFees = this.gasCost.times(this.currencyMultiplier)
@@ -856,6 +845,17 @@ export default {
           this.errorMsg = ''
           this.topUpErrorShow = false
         }
+      } else {
+        const { msgParams: { message, typedMessages } = {}, id = '' } = msgParams || {}
+        let finalTypedMessages = typedMessages
+        try {
+          finalTypedMessages = typedMessages && JSON.parse(typedMessages)
+        } catch (error) {
+          log.error(error)
+        }
+        this.id = id
+        this.message = message
+        this.typedMessages = finalTypedMessages
       }
       this.type = type // type of tx
     },

src/components/Confirm/PermissionConfirm/PermissionConfirm.vue

@@ -120,7 +120,7 @@ export default {
           return this.supportedNetworks[this.network].networkName
         }
 
-        finalNetwork = !state.networkType.networkName ? state.networkType.host : state.networkType.networkName
+        finalNetwork = state.networkType.networkName ? state.networkType.networkName : state.networkType.host
         return finalNetwork
       },
     }),

src/components/WalletAccount/AccountImport/AccountImport.vue

@@ -245,22 +245,7 @@ export default {
           this.setErrorState(new Error('Unable to parse keystore file'))
           return
         }
-        if (!window.Worker) {
-          this.$store
-            .dispatch('importAccount', { keyData: [keyData, this.jsonPassword], strategy: 'JSON File' })
-            .then((privKey) => {
-              this.onClose()
-              this.keyStoreFileContents = ''
-              this.jsonPassword = ''
-              this.showJsonPassword = false
-              this.isLoadingKeystore = false
-              this.informClients(privKey)
-              this.$refs.jsonFileForm.resetValidation()
-            })
-            .catch((error) => {
-              this.setErrorState(error)
-            })
-        } else {
+        if (window.Worker) {
           const worker = new WalletWorker()
           worker.addEventListener('message', (event) => {
             const { privateKey: bufferPrivateKey } = event.data
@@ -286,6 +271,21 @@ export default {
             this.isLoadingKeystore = false
           })
           worker.postMessage({ type: 'unlockWallet', data: [keyData, this.jsonPassword] })
+        } else {
+          this.$store
+            .dispatch('importAccount', { keyData: [keyData, this.jsonPassword], strategy: 'JSON File' })
+            .then((privKey) => {
+              this.onClose()
+              this.keyStoreFileContents = ''
+              this.jsonPassword = ''
+              this.showJsonPassword = false
+              this.isLoadingKeystore = false
+              this.informClients(privKey)
+              this.$refs.jsonFileForm.resetValidation()
+            })
+            .catch((error) => {
+              this.setErrorState(error)
+            })
         }
       }
     },

src/components/WalletSettings/Network/Network.vue

@@ -186,7 +186,7 @@ export default {
     ...mapGetters(['supportedNetworks']),
     ...mapState(['networkType']),
     networks() {
-      return [...Object.values(this.supportedNetworks)]
+      return Object.values(this.supportedNetworks)
     },
     isRPCSelected() {
       return this.selectedNetwork.host === RPC

src/components/WalletSettings/PrivateKeys/PrivateKeys.vue

@@ -216,11 +216,7 @@ export default {
       if (this.$refs.downloadForm.validate()) {
         this.isLoadingDownloadWallet = true
 
-        if (!window.Worker) {
-          const finishedWallet = await this.createWallet(this.keyStorePassword)
-          this.exportKeyStoreFile(finishedWallet)
-          this.isLoadingDownloadWallet = false
-        } else {
+        if (window.Worker) {
           const worker = new WalletWorker()
           worker.addEventListener('message', (ev) => {
             const finishedWallet = ev.data
@@ -233,6 +229,10 @@ export default {
           })
           // log.info(this.keyStorePassword, this.selectedKey)
           worker.postMessage({ type: 'createWallet', data: [this.keyStorePassword, this.selectedKey] })
+        } else {
+          const finishedWallet = await this.createWallet(this.keyStorePassword)
+          this.exportKeyStoreFile(finishedWallet)
+          this.isLoadingDownloadWallet = false
         }
       }
     },

src/components/helpers/TransactionFeeAdvanced/TransactionFeeAdvanced.vue

@@ -325,7 +325,7 @@ export default {
     },
     gasFees(newValue, oldValue) {
       if (!isEqual(newValue, oldValue)) {
-        this.updateDetails(this.newSelectedSpeed !== '' ? this.newSelectedSpeed : this.oldSelectedSpeed)
+        this.updateDetails(this.newSelectedSpeed === '' ? this.oldSelectedSpeed : this.newSelectedSpeed)
       }
     },
     showAdvance(value) {

src/components/helpers/TransferAdvanceOption/TransferAdvanceOption.vue

@@ -282,7 +282,7 @@ export default {
       this.newNonce = this.nonce >= 0 ? this.nonce : this.nonceItems[0]
     },
     convertedDisplay(amount, multiplier) {
-      return !BigNumber.isBigNumber(amount) ? new BigNumber(amount).times(multiplier) : amount.times(multiplier)
+      return BigNumber.isBigNumber(amount) ? amount.times(multiplier) : new BigNumber(amount).times(multiplier)
     },
   },
 }

src/containers/Popup/PopupWidget/PopupWidget.vue

@@ -351,7 +351,7 @@ export default {
     getActionText(transaction) {
       if (transaction.type_name === 'n/a' || transaction.type === 'n/a') {
         return `${transaction.action === ACTIVITY_ACTION_SEND ? this.t('walletActivity.sent') : this.t('walletActivity.received')} ${
-          transaction.type_name !== 'n/a' ? transaction.type_name : transaction.type?.toUpperCase() || ''
+          transaction.type_name === 'n/a' ? transaction.type?.toUpperCase() || '' : transaction.type_name
         }`
       }
       if (transaction.type_name || transaction.type) {

src/containers/WalletHistory/WalletHistory.vue

@@ -202,7 +202,7 @@ export default {
       return finalTx.sort((a, b) => b.date - a.date) || []
     },
     currencyMultiplier() {
-      const currencyMultiplierNumber = this.selectedCurrency !== 'ETH' ? this.currencyData[this.selectedCurrency.toLowerCase()] || 1 : 1
+      const currencyMultiplierNumber = this.selectedCurrency === 'ETH' ? 1 : this.currencyData[this.selectedCurrency.toLowerCase()] || 1
       return new BigNumber(currencyMultiplierNumber)
     },
   },
@@ -270,11 +270,11 @@ export default {
         return this.t('walletActivity.contractDeployment')
       }
       if (activity.transaction_category === TRANSACTION_TYPES.TOKEN_METHOD_APPROVE) {
-        return `${this.t('walletActivity.approved')} ${activity.type_name !== 'n/a' ? activity.type_name.toUpperCase() : activity.type.toUpperCase()}`
+        return `${this.t('walletActivity.approved')} ${activity.type_name === 'n/a' ? activity.type.toUpperCase() : activity.type_name.toUpperCase()}`
       }
       if (activity.type_name === 'n/a' || activity.type === 'n/a') {
         return `${activity.action === ACTIVITY_ACTION_SEND ? this.t('walletActivity.sent') : this.t('walletActivity.received')} ${
-          activity.type_name !== 'n/a' ? activity.type_name : activity.type.toUpperCase()
+          activity.type_name === 'n/a' ? activity.type.toUpperCase() : activity.type_name
         }`
       }
       if (activity.type_name || activity.type) {

src/containers/WalletTransfer/WalletTransfer.vue

@@ -758,7 +758,7 @@ export default {
       const selectedAsset =
         this.contractType === CONTRACT_TYPE_ERC721 || this.contractType === CONTRACT_TYPE_ERC1155 ? this.assetSelected.name : this.selectedItem.symbol
       const amount = `${this.contractType === CONTRACT_TYPE_ERC721 || this.contractType === CONTRACT_TYPE_ERC1155 ? '' : this.displayAmount} ${
-        !this.toggle_exclusive ? selectedAsset : this.selectedCurrency
+        this.toggle_exclusive ? this.selectedCurrency : selectedAsset
       }`
       const message = this.t('walletTransfer.transferTweet')
         .replace(/{address}/gi, this.toAddress)
@@ -1312,7 +1312,7 @@ export default {
       this.toggle_exclusive = value
       const currencyRate = this.getCurrencyTokenRate
       if (value === 0) {
-        this.onChangeDisplayAmount(!currencyRate.eq(new BigNumber('0')) ? this.displayAmount.div(currencyRate) : this.displayAmount)
+        this.onChangeDisplayAmount(currencyRate.eq(new BigNumber('0')) ? this.displayAmount : this.displayAmount.div(currencyRate))
       } else if (value === 1) {
         this.onChangeDisplayAmount(this.displayAmount.times(currencyRate))
       }

src/controllers/AssetsController.js

@@ -329,15 +329,15 @@ export default class AssetController {
         return {}
       }
     }
-    if (!normalizedContractInfo.logo) {
-      // fallback to asset image
-      normalizedContractInfo.logo = assetImage
-    } else {
+    if (normalizedContractInfo.logo) {
       try {
         await validateImageUrl(sanitizeNftMetdataUrl(normalizedContractInfo.logo))
       } catch {
         normalizedContractInfo.logo = assetImage
       }
+    } else {
+      // fallback to asset image
+      normalizedContractInfo.logo = assetImage
     }
     return normalizedContractInfo
   }

src/controllers/PreferencesController.js

@@ -176,7 +176,7 @@ class PreferencesController extends SafeEventEmitter {
       this.errorStore.putState(error)
     } else if (error && typeof error === 'object') {
       const prettyError = prettyPrintData(error)
-      const payloadError = prettyError !== '' ? `Error: ${prettyError}` : 'Something went wrong. Pls try again'
+      const payloadError = prettyError === '' ? 'Something went wrong. Pls try again' : `Error: ${prettyError}`
       this.errorStore.putState(payloadError)
     } else {
       this.errorStore.putState(error || '')
@@ -189,7 +189,7 @@ class PreferencesController extends SafeEventEmitter {
       this.successStore.putState(message)
     } else if (message && typeof message === 'object') {
       const prettyMessage = prettyPrintData(message)
-      const payloadMessage = prettyMessage !== '' ? `Success: ${prettyMessage}` : 'Success'
+      const payloadMessage = prettyMessage === '' ? 'Success' : `Success: ${prettyMessage}`
       this.successStore.putState(payloadMessage)
     } else {
       this.successStore.putState(message || '')
@@ -327,11 +327,11 @@ class PreferencesController extends SafeEventEmitter {
         x.from &&
         (lowerCaseSelectedAddress === x.from.toLowerCase() || lowerCaseSelectedAddress === x.to.toLowerCase())
       ) {
-        if (x.status !== 'confirmed') {
-          pendingTx.push(x)
-        } else {
+        if (x.status === 'confirmed') {
           const finalObject = formatPastTx(x, lowerCaseSelectedAddress)
           pastTx.push(finalObject)
+        } else {
+          pendingTx.push(x)
         }
       }
     }
@@ -354,9 +354,10 @@ class PreferencesController extends SafeEventEmitter {
     const nonceMap = {}
     for (const x of pastTx) {
       const txKey = [x.nonce, x.from].join(':')
-      if (!nonceMap[txKey]) nonceMap[txKey] = [x]
-      else {
+      if (nonceMap[txKey]) {
         nonceMap[txKey].push(x)
+      } else {
+        nonceMap[txKey] = [x]
       }
     }
 

src/controllers/network/NetworkController.js

@@ -449,7 +449,7 @@ export default class NetworkController extends EventEmitter {
   getCurrentChainId() {
     const { type, chainId: configChainId } = this.getProviderConfig()
     const chainId = SUPPORTED_NETWORK_TYPES[type]?.chainId || configChainId
-    return !isHexStrict(chainId) ? `0x${Number(chainId).toString(16)}` : chainId
+    return isHexStrict(chainId) ? chainId : `0x${Number(chainId).toString(16)}`
   }
 
   setRpcTarget(networkId, rpcUrl, chainId, ticker = 'ETH', nickname = '', rpcPrefs = {}) {

src/controllers/transactions/TransactionController.js

@@ -800,7 +800,7 @@ class TransactionController extends SafeEventEmitter {
 
       // It seems that sometimes the numerical values being returned from
       // this.query.getTransactionReceipt are BN instances and not strings.
-      const gasUsed = typeof txReceipt.gasUsed !== 'string' ? txReceipt.gasUsed.toString(16) : txReceipt.gasUsed
+      const gasUsed = typeof txReceipt.gasUsed === 'string' ? txReceipt.gasUsed : txReceipt.gasUsed.toString(16)
 
       txMeta.txReceipt = {
         ...txReceipt,

src/controllers/transactions/TransactionStateManager.js

@@ -57,18 +57,18 @@ class TransactionStateManager extends SafeEventEmitter {
     // the originally submitted gasParams.
     // TODO: Maybe check origin here?
     if (opts.txParams && typeof opts.origin === 'string' && opts.origin !== 'torus') {
-      if (typeof opts.txParams.gasPrice !== 'undefined') {
+      if (opts.txParams.gasPrice !== undefined) {
         dappSuggestedGasFees = {
           gasPrice: opts.txParams.gasPrice,
         }
-      } else if (typeof opts.txParams.maxFeePerGas !== 'undefined' || typeof opts.txParams.maxPriorityFeePerGas !== 'undefined') {
+      } else if (opts.txParams.maxFeePerGas !== undefined || opts.txParams.maxPriorityFeePerGas !== undefined) {
         dappSuggestedGasFees = {
           maxPriorityFeePerGas: opts.txParams.maxPriorityFeePerGas,
           maxFeePerGas: opts.txParams.maxFeePerGas,
         }
       }
 
-      if (typeof opts.txParams.gas !== 'undefined') {
+      if (opts.txParams.gas !== undefined) {
         dappSuggestedGasFees = {
           ...dappSuggestedGasFees,
           gas: opts.txParams.gas,
@@ -411,7 +411,7 @@ class TransactionStateManager extends SafeEventEmitter {
     @param error_ {errorObject} - error object
   */
   setTxStatusFailed(txId, error_) {
-    const error = !error_ ? new Error('Internal torus failure') : error_
+    const error = error_ || new Error('Internal torus failure')
 
     const txMeta = this.getTransaction(txId)
     txMeta.err = {