Fix swaps core logic lint errors (#38)

Fix lint errors in the swaps core logic PR, #25
MetaMask · Oct 6, 2020 · 596fd0f · 596fd0f
1 parent 829444e
commit 596fd0f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/ui/app/pages/swaps/index.js b/ui/app/pages/swaps/index.js
@@ -113,13 +113,23 @@ export default function Swap () {
   }
 
   const clearTemporaryTokenRef = useRef()
-  useEffect(() => {
-    clearTemporaryTokenRef.current = () => {
-      if (destinationTokenAddedForSwap && (!isAwaitingSwapRoute || conversionError)) {
-        dispatch(removeToken(destinationTokenInfo?.address))
+  useEffect(
+    () => {
+      clearTemporaryTokenRef.current = () => {
+        if (destinationTokenAddedForSwap && (!isAwaitingSwapRoute || conversionError)) {
+          dispatch(removeToken(destinationTokenInfo?.address))
+        }
       }
-    }
-  }, [fetchParams, destinationTokenAddedForSwap, conversionError, dispatch, isAwaitingSwapRoute])
+    },
+    [
+      conversionError,
+      dispatch,
+      destinationTokenAddedForSwap,
+      destinationTokenInfo,
+      fetchParams,
+      isAwaitingSwapRoute,
+    ],
+  )
   useEffect(() => {
     return () => {
       clearTemporaryTokenRef.current()

diff --git a/ui/app/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js b/ui/app/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
@@ -2,7 +2,6 @@ import React, { useState, useEffect, useRef } from 'react'
 import PropTypes from 'prop-types'
 import Fuse from 'fuse.js'
 import InputAdornment from '@material-ui/core/InputAdornment'
-import { usePrevious } from '../../../../hooks/usePrevious'
 import TextField from '../../../../components/ui/text-field'
 import { usePrevious } from '../../../../hooks/usePrevious'
 

diff --git a/ui/app/pages/swaps/swaps.util.js b/ui/app/pages/swaps/swaps.util.js
@@ -61,7 +61,15 @@ const QUOTE_VALIDATORS = [
   {
     property: 'approvalNeeded',
     type: 'object',
-    validator: (approvalTx) => approvalTx === null || approvalTx && validHex(approvalTx.data) && isValidAddress(approvalTx.to) && isValidAddress(approvalTx.from),
+    validator: (approvalTx) => (
+      approvalTx === null ||
+      (
+        approvalTx &&
+        validHex(approvalTx.data) &&
+        isValidAddress(approvalTx.to) &&
+        isValidAddress(approvalTx.from)
+      )
+    ),
   },
   {
     property: 'sourceAmount',