:quit

Merge branch 'beta' of https://github.com/Uniswap/uniswap-frontend into beta

src/components/Web3ReactManager/index.js

@@ -32,8 +32,10 @@ const SpinnerWrapper = styled(Spinner)`
 `
 
 function tryToSetConnector(setConnector, setError) {
-  setConnector('Injected', { suppressAndThrowErrors: true }).catch(error => {
-    setConnector('Network')
+  setConnector('Injected', { suppressAndThrowErrors: true }).catch(() => {
+    setConnector('Network', { suppressAndThrowErrors: true }).catch(error => {
+      setError(error)
+    })
   })
 }
 
@@ -54,25 +56,31 @@ export default function Web3ReactManager({ children }) {
             if (accounts.length >= 1) {
               tryToSetConnector(setConnector, setError)
             } else {
-              setConnector('Network')
+              setConnector('Network', { suppressAndThrowErrors: true }).catch(error => {
+                setError(error)
+              })
             }
           })
         }
       } else {
-        setConnector('Network')
+        setConnector('Network', { suppressAndThrowErrors: true }).catch(error => {
+          setError(error)
+        })
       }
     }
-  }, [active, error, setConnector, setError])
+  })
 
   // parse the error
   useEffect(() => {
     if (error) {
       // if the user changes to the wrong network, unset the connector
       if (error.code === Connector.errorCodes.UNSUPPORTED_NETWORK) {
-        setConnector('Network')
+        setConnector('Network', { suppressAndThrowErrors: true }).catch(error => {
+          setError(error)
+        })
       }
     }
-  }, [error, setConnector])
+  })
 
   const [showLoader, setShowLoader] = useState(false)
   useEffect(() => {

src/contexts/Application.js

@@ -68,29 +68,44 @@ export default function Provider({ children }) {
 }
 
 export function Updater() {
-  const { networkId, library } = useWeb3Context()
+  const { networkId, library, connectorName } = useWeb3Context()
 
   const globalBlockNumber = useBlockNumber()
   const [, { updateBlockNumber, updateUSDPrice }] = useApplicationContext()
 
+  // slow down polling interval
   useEffect(() => {
-    let stale = false
+    if (library) {
+      if (connectorName === 'Network') {
+        library.polling = false
+      } else {
+        library.pollingInterval = 5
+      }
+    }
+  }, [library, connectorName])
 
-    getUSDPrice(library)
-      .then(([price]) => {
-        if (!stale) {
-          updateUSDPrice(networkId, price)
-        }
-      })
-      .catch(() => {
-        if (!stale) {
-          updateUSDPrice(networkId, null)
-        }
-      })
+  // update usd price
+  useEffect(() => {
+    if (library) {
+      let stale = false
+
+      getUSDPrice(library)
+        .then(([price]) => {
+          if (!stale) {
+            updateUSDPrice(networkId, price)
+          }
+        })
+        .catch(() => {
+          if (!stale) {
+            updateUSDPrice(networkId, null)
+          }
+        })
+    }
   }, [globalBlockNumber, library, networkId, updateUSDPrice])
 
+  // update block number
   useEffect(() => {
-    if ((networkId || networkId === 0) && library) {
+    if (library) {
       let stale = false
 
       function update() {