Uniswap · NoahZinsmeister · May 24, 2019 · May 20, 2019 · May 20, 2019 · May 20, 2019
diff --git a/.env.example → .env.local.example b/.env.example → .env.local.example
@@ -1,3 +1,2 @@
 REACT_APP_NETWORK_ID="1"
 REACT_APP_NETWORK_URL=""
-REACT_APP_NETWORK_NAME="Main Ethereum Network"
diff --git a/.travis.yml b/.travis.yml
@@ -11,4 +11,3 @@ install: yarn
 script:
   - yarn check:all
   - yarn build
-  - yarn test
diff --git a/README.md b/README.md
@@ -24,17 +24,15 @@ yarn
 
 ### Configure Environment
 
-Rename `.env.example` to `.env` and fill in the appropriate variables.
+Rename `.env.local.example` to `.env.local` and fill in the appropriate variables.
 
 ### Run
 
 ```bash
 yarn start
-# or
-yarn start:rinkeby
 ```
 
-More robust support for other testnets is in the works!
+To run on a testnet, simply update the `.env.local` file appropriately.
 
 ## Contributions
 

diff --git a/package.json b/package.json
@@ -5,32 +5,35 @@
   "homepage": ".",
   "private": true,
   "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^1.2.18",
+    "@fortawesome/free-brands-svg-icons": "^5.8.2",
+    "@fortawesome/free-regular-svg-icons": "^5.8.2",
+    "@fortawesome/free-solid-svg-icons": "^5.8.2",
+    "@fortawesome/react-fontawesome": "^0.1.4",
+    "@reach/dialog": "^0.2.8",
     "@reach/tooltip": "^0.2.0",
-    "classnames": "^2.2.6",
+    "copy-to-clipboard": "^3.2.0",
     "escape-string-regexp": "^2.0.0",
     "ethers": "^4.0.27",
     "i18next": "^15.0.9",
     "i18next-browser-languagedetector": "^3.0.1",
     "i18next-xhr-backend": "^2.0.1",
     "jazzicon": "^1.5.0",
-    "node-sass": "^4.11.0",
+    "polished": "^3.3.2",
     "react": "^16.8.6",
-    "react-aria-modal": "^4.0.0",
+    "react-device-detect": "^1.6.2",
     "react-dom": "^16.8.6",
     "react-ga": "^2.5.7",
     "react-i18next": "^10.7.0",
     "react-router-dom": "^5.0.0",
     "react-scripts": "^3.0.1",
-    "react-transition-group": "1.x",
+    "react-spring": "^8.0.20",
     "styled-components": "^4.2.0",
-    "ua-parser-js": "^0.7.18",
     "web3-react": "^5.0.4"
   },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "start:rinkeby": "REACT_APP_NETWORK_ID=4 REACT_APP_NETWORK_NAME='Rinkeby Test Network' yarn start",
-    "build:rinkeby": "REACT_APP_NETWORK_ID=4 REACT_APP_NETWORK_NAME='Rinkeby Test Network' yarn build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "lint:base": "yarn eslint './src/**/*.{js,jsx}'",

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html>
+<!DOCTYPE html />
 <html lang="en">
   <head>
     <meta charset="utf-8" />
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
@@ -23,8 +23,7 @@
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <div id="modal-root"></div>
+    <div id="root" />
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.

diff --git a/public/libraries/qr-scanner/qr-scanner-worker.min.js b/public/libraries/qr-scanner/qr-scanner-worker.min.js
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -19,6 +19,7 @@
   "searchOrPaste": "Search Token or Paste Address",
   "noExchange": "No Exchange Found",
   "exchangeRate": "Exchange Rate",
+  "unknownError": "Oops! An unknown error occurred. Please refresh the page, or visit from another browser or device.",
   "enterValueCont": "Enter a {{ missingCurrencyValue }} value to continue.",
   "selectTokenCont": "Select a token to continue.",
   "noLiquidity": "No liquidity.",

diff --git a/src/InjectedConnector.js b/src/InjectedConnector.js
@@ -0,0 +1,100 @@
+import { Connectors } from 'web3-react'
+const { Connector, ErrorCodeMixin } = Connectors
+
+const InjectedConnectorErrorCodes = ['ETHEREUM_ACCESS_DENIED', 'NO_WEB3', 'UNLOCK_REQUIRED']
+export default class InjectedConnector extends ErrorCodeMixin(Connector, InjectedConnectorErrorCodes) {
+  constructor(args = {}) {
+    super(args)
+    this.runOnDeactivation = []
+
+    this.networkChangedHandler = this.networkChangedHandler.bind(this)
+    this.accountsChangedHandler = this.accountsChangedHandler.bind(this)
+
+    const { ethereum } = window
+    if (ethereum && ethereum.isMetaMask) {
+      ethereum.autoRefreshOnNetworkChange = false
+    }
+  }
+
+  async onActivation() {
+    const { ethereum, web3 } = window
+
+    if (ethereum) {
+      await ethereum.enable().catch(error => {
+        const deniedAccessError = Error(error)
+        deniedAccessError.code = InjectedConnector.errorCodes.ETHEREUM_ACCESS_DENIED
+        throw deniedAccessError
+      })
+
+      // initialize event listeners
+      if (ethereum.on) {
+        ethereum.on('networkChanged', this.networkChangedHandler)
+        ethereum.on('accountsChanged', this.accountsChangedHandler)
+
+        this.runOnDeactivation.push(() => {
+          if (ethereum.removeListener) {
+            ethereum.removeListener('networkChanged', this.networkChangedHandler)
+            ethereum.removeListener('accountsChanged', this.accountsChangedHandler)
+          }
+        })
+      }
+    } else if (web3) {
+      console.warn('Your web3 provider is outdated, please upgrade to a modern provider.')
+    } else {
+      const noWeb3Error = Error('Your browser is not equipped with web3 capabilities.')
+      noWeb3Error.code = InjectedConnector.errorCodes.NO_WEB3
+      throw noWeb3Error
+    }
+  }
+
+  async getProvider() {
+    const { ethereum, web3 } = window
+    return ethereum || web3.currentProvider
+  }
+
+  async getAccount(provider) {
+    const account = await super.getAccount(provider)
+
+    if (account === null) {
+      const unlockRequiredError = Error('Ethereum account locked.')
+      unlockRequiredError.code = InjectedConnector.errorCodes.UNLOCK_REQUIRED
+      throw unlockRequiredError
+    }
+
+    return account
+  }
+
+  onDeactivation() {
+    this.runOnDeactivation.forEach(runner => runner())
+    this.runOnDeactivation = []
+  }
+
+  // event handlers
+  networkChangedHandler(networkId) {
+    const networkIdNumber = Number(networkId)
+
+    try {
+      super._validateNetworkId(networkIdNumber)
+
+      super._web3ReactUpdateHandler({
+        updateNetworkId: true,
+        networkId: networkIdNumber
+      })
+    } catch (error) {
+      super._web3ReactErrorHandler(error)
+    }
+  }
+
+  accountsChangedHandler(accounts) {
+    if (!accounts[0]) {
+      const unlockRequiredError = Error('Ethereum account locked.')
+      unlockRequiredError.code = InjectedConnector.errorCodes.UNLOCK_REQUIRED
+      super._web3ReactErrorHandler(unlockRequiredError)
+    } else {
+      super._web3ReactUpdateHandler({
+        updateAccount: true,
+        account: accounts[0]
+      })
+    }
+  }
+}
diff --git a/src/assets/images/brave-logo.svg b/src/assets/images/brave-logo.svg
diff --git a/src/assets/images/coinbase-wallet-logo.png b/src/assets/images/coinbase-wallet-logo.png
diff --git a/src/assets/images/ethereum-logo.svg b/src/assets/images/ethereum-logo.svg
diff --git a/src/assets/images/generic-token-logo.png b/src/assets/images/generic-token-logo.png
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
diff --git a/src/assets/images/metamask-logo.svg b/src/assets/images/metamask-logo.svg
diff --git a/src/assets/images/pending.svg b/src/assets/images/pending.svg
diff --git a/src/assets/images/qr-code.svg b/src/assets/images/qr-code.svg
diff --git a/src/assets/images/spinner.svg b/src/assets/images/spinner.svg