Merge pull request #1430 from tronscan/develop

Set new contract address

build/service-worker.js

@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.740a61cfddeb40259c6165986c89879f.js"
+  "/precache-manifest.68ab5ce7b83c3638732b0017e07bb3ba.js"
 );
 
 self.addEventListener('message', (event) => {

src/components/tokens/Overview/TokenListAll.js

@@ -4,7 +4,7 @@ import {t, tu} from "../../../utils/i18n";
 import {Client} from "../../../services/api";
 import {TokenLink, TokenTRC20Link} from "../../common/Links";
 import {QuestionMark} from "../../common/QuestionMark";
-import {API_URL, ONE_TRX, ONE_USDJ, IS_MAINNET, CONTRACT_ADDRESS_USDJ, CONTRACT_ADDRESS_JED} from "../../../constants";
+import {API_URL, ONE_TRX, ONE_USDJ, IS_MAINNET, CONTRACT_ADDRESS_USDJ, CONTRACT_ADDRESS_USDJ_TESTNET, CONTRACT_ADDRESS_JED,CONTRACT_ADDRESS_JED_TESTNET} from "../../../constants";
 import {upperFirst, toLower} from "lodash";
 import {TronLoader} from "../../common/loaders";
 import xhr from "axios/index";
@@ -298,12 +298,12 @@ class TokenList extends Component {
             </div>) : (
               <div>
               {
-                record.contractAddress == CONTRACT_ADDRESS_USDJ &&  <span>{ ONE_USDJ.toFixed(6)} {' USD'}</span>
+                (record.contractAddress == CONTRACT_ADDRESS_USDJ || record.contractAddress == CONTRACT_ADDRESS_USDJ_TESTNET) &&  <span>{ ONE_USDJ.toFixed(6)} {' USD'}</span>
               }
               {
-                record.contractAddress == CONTRACT_ADDRESS_JED && <span>{ (ONE_USDJ/100).toFixed(6)} {' USD'}</span>
+                (record.contractAddress == CONTRACT_ADDRESS_JED || record.contractAddress == CONTRACT_ADDRESS_JED_TESTNET) && <span>{ (ONE_USDJ/100).toFixed(6)} {' USD'}</span>
               }
-              {(record.contractAddress == CONTRACT_ADDRESS_USDJ || record.contractAddress == CONTRACT_ADDRESS_JED) ? "": "-"}
+              { (record.contractAddress == CONTRACT_ADDRESS_USDJ || record.contractAddress == CONTRACT_ADDRESS_USDJ_TESTNET || record.contractAddress == CONTRACT_ADDRESS_JED || record.contractAddress == CONTRACT_ADDRESS_JED_TESTNET) ? "": "-"}
             </div>
             )
           )

src/components/tokens/Token20Detail/Information.js

@@ -17,7 +17,9 @@ import {
   CONTRACT_ADDRESS_WIN,
   CONTRACT_ADDRESS_GGC,
   CONTRACT_ADDRESS_USDJ,
+  CONTRACT_ADDRESS_USDJ_TESTNET,
   CONTRACT_ADDRESS_JED,
+  CONTRACT_ADDRESS_JED_TESTNET,
   IS_MAINNET
 } from "../../../constants";
 
@@ -114,7 +116,7 @@ export function Information({ token: tokens, priceUSD }) {
       content: (
         <div className="d-flex ">
           {
-            token.contract_address == CONTRACT_ADDRESS_USDJ &&
+            (token.contract_address == CONTRACT_ADDRESS_USDJ || token.contract_address == CONTRACT_ADDRESS_USDJ_TESTNET) &&
             <div className="d-flex price-info">
             { ONE_USDJ.toFixed(6)} USD&nbsp;
             <span className="token-price-trx">
@@ -123,7 +125,7 @@ export function Information({ token: tokens, priceUSD }) {
           </div> 
           }
           {
-            token.contract_address == CONTRACT_ADDRESS_JED &&
+           (token.contract_address == CONTRACT_ADDRESS_JED || token.contract_address == CONTRACT_ADDRESS_JED_TESTNET )&&
             <div className="d-flex price-info">
             { (ONE_USDJ/100).toFixed(6)} USD&nbsp;
             <span className="token-price-trx">
@@ -132,7 +134,7 @@ export function Information({ token: tokens, priceUSD }) {
           </div> 
           }
 
-          { ((token.contract_address != CONTRACT_ADDRESS_USDJ || token.contract_address != CONTRACT_ADDRESS_JED)  && token["market_info"]) ? (
+          { ((token.contract_address != CONTRACT_ADDRESS_USDJ || token.contract_address != CONTRACT_ADDRESS_JED || token.contract_address != CONTRACT_ADDRESS_USDJ_TESTNET || token.contract_address != CONTRACT_ADDRESS_JED_TESTNET )  && token["market_info"]) ? (
             <div className="d-flex price-info">
               {token["priceToUsd"].toFixed(6)} USD&nbsp;
               <span className="token-price-trx">
@@ -171,7 +173,7 @@ export function Information({ token: tokens, priceUSD }) {
             ) : (
                 <div>
                   {
-                    (token.contract_address == CONTRACT_ADDRESS_USDJ || token.contract_address == CONTRACT_ADDRESS_JED) ?
+                    (token.contract_address == CONTRACT_ADDRESS_USDJ || token.contract_address == CONTRACT_ADDRESS_JED ||  token.contract_address != CONTRACT_ADDRESS_USDJ_TESTNET || token.contract_address != CONTRACT_ADDRESS_JED_TESTNET) ?
                     ""
                     :defaultContent
                   }