Merge pull request #13 from smartcontractkit/170222529-create-friendl…

…y-urls-in-aggregator-ui Create friendly urls in aggregator ui
smartcontractkit · Jan 31, 2020 · b386871 · b386871
1 parent 2c270f9
commit b386871
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 57 deletions.
diff --git a/feeds-ui/src/enhancers/withMainnet.js b/feeds-ui/src/enhancers/withMainnet.js
@@ -16,55 +16,72 @@ const MAINNET_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'AUD',
     counter: 3600,
+    path: 'aud-usd',
   },
   {
     contractAddress: '0xa18e0bf319a1316984c9fc9aba850e2a915cce0e',
     name: 'EUR / USD aggregation',
     valuePrefix: '$',
     answerName: 'EUR',
     counter: 3600,
+    path: 'eur-usd',
   },
   {
     contractAddress: '0xb405aa39dca6ecf18691cd638a98c090c477dcf9',
     name: 'CHF / USD aggregation',
     valuePrefix: '$',
     answerName: 'CHF',
     counter: 3600,
+    path: 'chf-usd',
   },
   {
     contractAddress: '0xf277717f64815b17aa687cce701fa154185db4d9',
     name: 'GBP / USD aggregation',
     valuePrefix: '$',
     answerName: 'GBP',
     counter: 3600,
+    path: 'gbp-usd',
   },
   {
     contractAddress: '0x8C4a5746d70C1aCeD6c3feB0915f59e3faBb18c3',
     name: 'JPY / USD aggregation',
     valuePrefix: '$',
     answerName: 'JPY',
     counter: 3600,
+    path: 'jpy-usd',
   },
   {
     contractAddress: '0xe1ec292422194cfa6bb6089566af3019803b1af2',
     name: 'XAG / USD aggregation',
     valuePrefix: '$',
     answerName: 'XAG',
     counter: 3600,
+    path: 'xag-usd',
   },
   {
     contractAddress: '0x121df6cfe2426e6c9ae1b273f2e38d0c362c03fa',
     name: 'XAU / USD aggregation',
     valuePrefix: '$',
     answerName: 'XAU',
     counter: 3600,
+    path: 'xau-usd',
   },
   {
     contractAddress: '0xF5fff180082d6017036B771bA883025c654BC935',
     name: 'BTC / USD aggregation',
     valuePrefix: '$',
     answerName: 'BTC',
     counter: 600,
+    path: 'btc-usd',
+  },
+  {
+    contractVersion: 1,
+    contractAddress: '0x79fEbF6B9F76853EDBcBc913e6aAE8232cFB9De9',
+    name: 'ETH / USD aggregation',
+    valuePrefix: '$',
+    answerName: 'ETH',
+    counter: 600,
+    path: 'eth-usd',
   },
 ]
 
@@ -75,8 +92,7 @@ const withMainnet = BaseComponent => {
   const Mainnet = props => {
     const { params } = props.match
     const hasContract = MAINNET_CONTRACTS.filter(
-      contract =>
-        contract.contractAddress.toLowerCase() === params.address.toLowerCase(),
+      contract => contract.path.toLowerCase() === params.pair.toLowerCase(),
     )
 
     if (!hasContract.length) {

diff --git a/feeds-ui/src/enhancers/withRopsten.js b/feeds-ui/src/enhancers/withRopsten.js
@@ -15,20 +15,23 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'BNB',
     counter: 1800,
+    path: 'bnb-usd',
   },
   {
     contractAddress: '0x1c44616CdB7FAe1ba69004ce6010248147CE019e',
     name: 'BTC / USD aggregation',
     valuePrefix: '$',
     answerName: 'BTC',
     counter: 3600,
+    path: 'btc-usd',
   },
   {
     contractAddress: '0x46aD082e62D86089b7365320081685115F50d8B3',
     name: 'SNX / USD aggregation',
     valuePrefix: '$',
     answerName: 'SNX',
     counter: 1800,
+    path: 'snx-usd',
   },
   {
     contractVersion: 2,
@@ -37,12 +40,14 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'XTZ',
     counter: 1800,
+    path: 'xtz-usd',
   },
   {
     contractAddress: '0x0Be00A19538Fac4BE07AC360C69378B870c412BF',
     name: 'ETH / USD aggregation',
     valuePrefix: '$',
     answerName: 'ETH',
+    path: 'eth-usd',
   },
   {
     contractVersion: 2,
@@ -51,6 +56,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'MKR',
     counter: 1800,
+    path: 'mkr-usd',
   },
   {
     contractVersion: 2,
@@ -59,6 +65,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'TRX',
     counter: 1800,
+    path: 'trx-usd',
   },
   {
     contractVersion: 2,
@@ -67,6 +74,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'AUD',
     counter: 3600,
+    path: 'aud-usd',
   },
   {
     contractVersion: 2,
@@ -75,6 +83,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'XAG',
     counter: 3600,
+    path: 'xag-usd',
   },
   {
     contractVersion: 2,
@@ -83,6 +92,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'CHF',
     counter: 3600,
+    path: 'chf-usd',
   },
   {
     contractVersion: 2,
@@ -91,6 +101,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'GBP',
     counter: 3600,
+    path: 'gbp-usd',
   },
   {
     contractVersion: 2,
@@ -99,6 +110,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'XAU',
     counter: 3600,
+    path: 'xau-usd',
   },
   {
     contractVersion: 2,
@@ -107,6 +119,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'EUR',
     counter: 3600,
+    path: 'eur-usd',
   },
   {
     contractVersion: 2,
@@ -115,6 +128,7 @@ const ROPSTEN_CONTRACTS = [
     valuePrefix: '$',
     answerName: 'JPY',
     counter: 3600,
+    path: 'jpy-usd',
   },
 ]
 
@@ -125,8 +139,7 @@ const withRopsten = BaseComponent => {
   const Ropsten = props => {
     const { params } = props.match
     const hasContract = ROPSTEN_CONTRACTS.filter(
-      contract =>
-        contract.contractAddress.toLowerCase() === params.address.toLowerCase(),
+      contract => contract.path.toLowerCase() === params.pair.toLowerCase(),
     )
 
     if (!hasContract.length) {

diff --git a/feeds-ui/src/pages/Testnet.js b/feeds-ui/src/pages/Testnet.js
diff --git a/feeds-ui/src/pages/index.js b/feeds-ui/src/pages/index.js
@@ -1,9 +1,8 @@
 import React from 'react'
-import { Route, BrowserRouter } from 'react-router-dom'
+import { Route, BrowserRouter, Switch } from 'react-router-dom'
 import { Header } from 'components/header'
 
 import EthUsdPage from './EthUsdPage'
-import Testnet from './Testnet'
 import CreatePage from './Create'
 import CustomPage from './Custom'
 import RopstenPage from './Ropsten'
@@ -13,12 +12,13 @@ const AppRoutes = () => {
   return (
     <BrowserRouter>
       <Header />
-      <Route exact path="/" component={EthUsdPage} />
-      <Route exact path="/testnet" component={Testnet} />
-      <Route exact path="/create" component={CreatePage} />
-      <Route exact path="/custom" component={CustomPage} />
-      <Route path="/ropsten/:address" component={RopstenPage} />
-      <Route path="/mainnet/:address" component={MainnetPage} />
+      <Switch>
+        <Route exact path="/" component={EthUsdPage} />
+        <Route exact path="/create" component={CreatePage} />
+        <Route exact path="/custom" component={CustomPage} />
+        <Route path="/ropsten/:pair" component={RopstenPage} />
+        <Route path="/:pair" component={MainnetPage} />
+      </Switch>
     </BrowserRouter>
   )
 }