Merge pull request #7 from smartcontractkit/169958251-Add-several-new…

…-ropsten-pairs-on-aggregator-app Add several new ropsten pairs on aggregator app
smartcontractkit · Jan 31, 2020 · 3f17f68 · 3f17f68
1 parent f02ea2c
commit 3f17f68
Show file tree

Hide file tree

Showing 14 changed files with 745 additions and 122 deletions.
diff --git a/feeds-ui/src/components/networkGraph/ContractDetailsModal.js b/feeds-ui/src/components/networkGraph/ContractDetailsModal.js
@@ -1,6 +1,7 @@
 import React from 'react'
 import { Drawer, Button } from 'antd'
 import moment from 'moment'
+import { etherscanAddress } from 'utils'
 
 const ContractDetailsModal = ({
   onClose,
@@ -57,28 +58,30 @@ const ContractDetailsContent = ({ data = {}, options, updateHeight }) => {
           Response date
         </div>
         <h3 className="network-graph__contract-details__item--value">
-          {updateHeight && dateResonse(updateHeight.timestamp)}
+          {updateHeight && dateResonse(updateHeight)}
         </h3>
       </div>
 
       <hr className="hr" />
 
       <div>
         <h4>Find out more in:</h4>
-        <Button style={{ marginRight: 10 }} ghost type="primary">
-          <a
-            target="_BLANK"
-            rel="noopener noreferrer"
-            href={`https://explorer.chain.link/job-runs?search=${options.contractAddress}`}
-          >
-            Chainlink Explorer
-          </a>
-        </Button>
+        {options.network === 'mainnet' && (
+          <Button style={{ marginRight: 10 }} ghost type="primary">
+            <a
+              target="_BLANK"
+              rel="noopener noreferrer"
+              href={`https://explorer.chain.link/job-runs?search=${options.contractAddress}`}
+            >
+              Chainlink Explorer
+            </a>
+          </Button>
+        )}
         <Button ghost type="primary">
           <a
             target="_BLANK"
             rel="noopener noreferrer"
-            href={`https://etherscan.io/address/${options.contractAddress}`}
+            href={etherscanAddress(options.network, options.contractAddress)}
           >
             Etherscan
           </a>

diff --git a/feeds-ui/src/components/networkGraph/NodeDetailsModal.js b/feeds-ui/src/components/networkGraph/NodeDetailsModal.js
@@ -1,6 +1,7 @@
 import React from 'react'
 import { Drawer, Button } from 'antd'
 import moment from 'moment'
+import { etherscanAddress } from 'utils'
 
 const NodeDetailsModal = ({
   onClose,
@@ -59,34 +60,38 @@ const NodeDetailsContent = ({ data = {}, jobId, options }) => {
 
       <div>
         <h4>Find out more in:</h4>
-        <Button
-          style={{ marginRight: 10 }}
-          ghost
-          type="primary"
-          disabled={!jobId}
-        >
-          <a
-            target="_BLANK"
-            rel="noopener noreferrer"
-            href={`https://explorer.chain.link/job-runs?search=${jobId}`}
-          >
-            Chainlink Explorer
-          </a>
-        </Button>
-        <Button style={{ marginRight: 10 }} ghost type="primary">
-          <a
-            target="_BLANK"
-            rel="noopener noreferrer"
-            href={`https://market.link/search/nodes?&name=${data.name}`}
-          >
-            Market.link
-          </a>
-        </Button>
+        {options.network === 'mainnet' && (
+          <>
+            <Button
+              style={{ marginRight: 10 }}
+              ghost
+              type="primary"
+              disabled={!jobId}
+            >
+              <a
+                target="_BLANK"
+                rel="noopener noreferrer"
+                href={`https://explorer.chain.link/job-runs?search=${jobId}`}
+              >
+                Chainlink Explorer
+              </a>
+            </Button>
+            <Button style={{ marginRight: 10 }} ghost type="primary">
+              <a
+                target="_BLANK"
+                rel="noopener noreferrer"
+                href={`https://market.link/search/nodes?&name=${data.name}`}
+              >
+                Market.link
+              </a>
+            </Button>{' '}
+          </>
+        )}
         <Button ghost type="primary">
           <a
             target="_BLANK"
             rel="noopener noreferrer"
-            href={`https://etherscan.io/address/${data.address}`}
+            href={etherscanAddress(options.network, data.address)}
           >
             Etherscan
           </a>

diff --git a/feeds-ui/src/components/networkGraphInfo/NetworkGraphInfo.component.js b/feeds-ui/src/components/networkGraphInfo/NetworkGraphInfo.component.js
@@ -16,15 +16,13 @@ function NetworkGraphInfo({
   options,
   pendingAnswerId,
 }) {
-  const updateTime =
-    updateHeight && updateHeight.timestamp
-      ? moment.unix(updateHeight.timestamp).format('hh:mm:ss A')
-      : '...'
+  const updateTime = updateHeight
+    ? moment.unix(updateHeight).format('hh:mm:ss A')
+    : '...'
 
-  const updateDate =
-    updateHeight && updateHeight.timestamp
-      ? moment.unix(updateHeight.timestamp).format('MMM Do YYYY')
-      : '...'
+  const updateDate = updateHeight
+    ? moment.unix(updateHeight).format('MMM Do YYYY')
+    : '...'
 
   const getCurrentResponses = () => {
     if (!oracleResponse) {