web3-react migration (Uniswap#269)

* put suspense below redux * don't mount qr * properly format .json's * remove useless Web3Connect component * remove react-responsive header logic * finalize initial web3-react migration * add rudimentary network support * address ci/cd issues * fix syntax * add infura support rewrite create-exchange closes Uniswap#173 * remove CI flag, lazy loaded disabled for now * roll back /pool * fix currency input errors fix valid state of buttons * fix nav * obscure env variables * fix mobile header bug
rupiah-token · Apr 25, 2019 · 4e41391 · 4e41391
1 parent f855706
commit 4e41391
Show file tree

Hide file tree

Showing 41 changed files with 1,820 additions and 1,736 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,3 @@
+REACT_APP_NETWORK_ID="1"
+REACT_APP_NETWORK_URL=""
+REACT_APP_NETWORK_NAME="Main Ethereum Network"
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 
 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local

diff --git a/README.md b/README.md
@@ -16,24 +16,26 @@ This an an open source interface for Uniswap - a protocol for decentralized exch
 
 ## To Start Development
 
-###### Installing dependencies
+### Install Dependencies
 
 ```bash
 yarn
 ```
 
-###### Running locally on Rinkeby
+### Configure Environment
 
-```bash
-yarn start:rinkeby
-```
+Rename `.env.example` to `.env` and fill in the appropriate variables.
 
-###### Running locally on other testnet
+### Run
 
 ```bash
-REACT_APP_NETWORK_ID=2 REACT_APP_NETWORK='Ropsten Test Network' yarn start
+yarn start
+# or
+yarn start:rinkeby
 ```
 
+More robust support for other testnets is in the works!
+
 ## Contributions
 
 **Please open all pull requests against the `beta` branch.** CI checks will run against all PRs. To ensure that your changes will pass, run `yarn check:all` before pushing. If this command fails, you can try to automatically fix problems with `yarn fix:all`, or do it manually.
diff --git a/netlify.toml b/netlify.toml
@@ -1,3 +1,4 @@
+# support SPA setup
 [[redirects]]
   from = "/*"
   to = "/index.html"

diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
     "react-ga": "^2.5.7",
     "react-i18next": "^10.7.0",
     "react-redux": "^5.0.7",
-    "react-responsive": "^5.0.0",
     "react-router-dom": "^5.0.0",
     "react-scripts": "^2.1.8",
     "react-transition-group": "1.x",
@@ -29,13 +28,13 @@
     "redux-thunk": "^2.2.0",
     "ua-parser-js": "^0.7.18",
     "web3": "1.0.0-beta.52",
-    "web3-react": "^4.0.0"
+    "web3-react": "^5.0.4"
   },
   "scripts": {
     "start": "react-scripts start",
-    "start:rinkeby": "REACT_APP_NETWORK_ID=4 REACT_APP_NETWORK='Rinkeby Test Network' yarn start",
     "build": "react-scripts build",
-    "build:rinkeby": "REACT_APP_NETWORK_ID=4 REACT_APP_NETWORK='Rinkeby Test Network' yarn 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/locales/en.json b/public/locales/en.json
@@ -70,6 +70,7 @@
   "invalidDecimals": "Invalid decimals",
   "tokenAddress": "Token Address",
   "label": "Label",
+  "symbol": "Symbol",
   "decimals": "Decimals",
   "enterTokenCont": "Enter a token address to continue"
 }
diff --git a/src/abi/erc20.json b/src/abi/erc20.json
@@ -3,35 +3,16 @@
     "constant": true,
     "inputs": [],
     "name": "name",
-    "outputs": [
-      {
-        "name": "",
-        "type": "string"
-      }
-    ],
+    "outputs": [{ "name": "", "type": "string" }],
     "payable": false,
     "stateMutability": "view",
     "type": "function"
   },
   {
     "constant": false,
-    "inputs": [
-      {
-        "name": "_spender",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
+    "inputs": [{ "name": "_spender", "type": "address" }, { "name": "_value", "type": "uint256" }],
     "name": "approve",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
+    "outputs": [{ "name": "", "type": "bool" }],
     "payable": false,
     "stateMutability": "nonpayable",
     "type": "function"
@@ -40,39 +21,20 @@
     "constant": true,
     "inputs": [],
     "name": "totalSupply",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
+    "outputs": [{ "name": "", "type": "uint256" }],
     "payable": false,
     "stateMutability": "view",
     "type": "function"
   },
   {
     "constant": false,
     "inputs": [
-      {
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
+      { "name": "_from", "type": "address" },
+      { "name": "_to", "type": "address" },
+      { "name": "_value", "type": "uint256" }
     ],
     "name": "transferFrom",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
+    "outputs": [{ "name": "", "type": "bool" }],
     "payable": false,
     "stateMutability": "nonpayable",
     "type": "function"
@@ -81,31 +43,16 @@
     "constant": true,
     "inputs": [],
     "name": "decimals",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint8"
-      }
-    ],
+    "outputs": [{ "name": "", "type": "uint8" }],
     "payable": false,
     "stateMutability": "view",
     "type": "function"
   },
   {
     "constant": true,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
+    "inputs": [{ "name": "_owner", "type": "address" }],
     "name": "balanceOf",
-    "outputs": [
-      {
-        "name": "balance",
-        "type": "uint256"
-      }
-    ],
+    "outputs": [{ "name": "balance", "type": "uint256" }],
     "payable": false,
     "stateMutability": "view",
     "type": "function"
@@ -114,107 +61,46 @@
     "constant": true,
     "inputs": [],
     "name": "symbol",
-    "outputs": [
-      {
-        "name": "",
-        "type": "string"
-      }
-    ],
+    "outputs": [{ "name": "", "type": "string" }],
     "payable": false,
     "stateMutability": "view",
     "type": "function"
   },
   {
     "constant": false,
-    "inputs": [
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
+    "inputs": [{ "name": "_to", "type": "address" }, { "name": "_value", "type": "uint256" }],
     "name": "transfer",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
+    "outputs": [{ "name": "", "type": "bool" }],
     "payable": false,
     "stateMutability": "nonpayable",
     "type": "function"
   },
   {
     "constant": true,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      },
-      {
-        "name": "_spender",
-        "type": "address"
-      }
-    ],
+    "inputs": [{ "name": "_owner", "type": "address" }, { "name": "_spender", "type": "address" }],
     "name": "allowance",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
+    "outputs": [{ "name": "", "type": "uint256" }],
     "payable": false,
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
+  { "payable": true, "stateMutability": "payable", "type": "fallback" },
   {
     "anonymous": false,
     "inputs": [
-      {
-        "indexed": true,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
+      { "indexed": true, "name": "owner", "type": "address" },
+      { "indexed": true, "name": "spender", "type": "address" },
+      { "indexed": false, "name": "value", "type": "uint256" }
     ],
     "name": "Approval",
     "type": "event"
   },
   {
     "anonymous": false,
     "inputs": [
-      {
-        "indexed": true,
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
+      { "indexed": true, "name": "from", "type": "address" },
+      { "indexed": true, "name": "to", "type": "address" },
+      { "indexed": false, "name": "value", "type": "uint256" }
     ],
     "name": "Transfer",
     "type": "event"