Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set new contract address #1429

Merged
merged 2 commits into from
Apr 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 94 additions & 94 deletions build/asset-manifest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/index.html

Large diffs are not rendered by default.

Binary file modified build/index.html.gz
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/service-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
Binary file removed build/static/js/Account.4cb6c77f.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/Account.faaefce9.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file removed build/static/js/BTTSupplyTemp.f2bb9ee5.chunk.js.gz
Binary file not shown.
Binary file removed build/static/js/Charts.0bfbd342.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/Charts.898507cf.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file removed build/static/js/ContractTrans.62a7c79a.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file removed build/static/js/Foundation.66d7ec3b.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/Foundation.db55d726.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/Home.9fa39759.chunk.js.gz
Binary file not shown.
Binary file removed build/static/js/Home.e51a8cdd.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/MarketCreate.5cfdc60d.chunk.js.gz
Binary file not shown.
Binary file removed build/static/js/MarketCreate.911952f4.chunk.js.gz
Binary file not shown.
Binary file removed build/static/js/Markets.528200b2.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/Markets.d1c45631.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/MyProposals.7139d2e6.chunk.js.gz
Binary file not shown.
Binary file removed build/static/js/MyProposals.760b4d62.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file removed build/static/js/ProposalDetail.d56d6dbb.chunk.js.gz
Binary file not shown.
1 change: 1 addition & 0 deletions build/static/js/Proposals.31f29dd7.chunk.js

Large diffs are not rendered by default.

Binary file added build/static/js/Proposals.31f29dd7.chunk.js.gz
Binary file not shown.
1 change: 0 additions & 1 deletion build/static/js/Proposals.4fe2053d.chunk.js

This file was deleted.

Binary file removed build/static/js/Proposals.4fe2053d.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file removed build/static/js/Representatives.ca54de03.chunk.js.gz
Binary file not shown.
Binary file removed build/static/js/SingleStats.ada176fd.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/SingleStats.b1a0a98a.chunk.js.gz
Binary file not shown.
Binary file removed build/static/js/SmartContract.1beb7c9d.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file removed build/static/js/Stats.0d91e4f9.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/Stats.e72c1106.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file removed build/static/js/Token20Detail.e9ad088d.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file added build/static/js/TokenDetail.2e08b7a4.chunk.js.gz
Binary file not shown.
Binary file removed build/static/js/TokenDetail.91a53e5e.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
1 change: 1 addition & 0 deletions build/static/js/TokenListAll.4dbec729.chunk.js

Large diffs are not rendered by default.

Binary file added build/static/js/TokenListAll.4dbec729.chunk.js.gz
Binary file not shown.
1 change: 0 additions & 1 deletion build/static/js/TokenListAll.dfccb5f7.chunk.js

This file was deleted.

Binary file removed build/static/js/TokenListAll.dfccb5f7.chunk.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
1 change: 1 addition & 0 deletions build/static/js/main.67f5cca7.chunk.js

Large diffs are not rendered by default.

Binary file added build/static/js/main.67f5cca7.chunk.js.gz
Binary file not shown.
1 change: 0 additions & 1 deletion build/static/js/main.69812efb.chunk.js

This file was deleted.

Binary file removed build/static/js/main.69812efb.chunk.js.gz
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added build/static/js/runtime~main.5ead98b0.js.gz
Binary file not shown.
Binary file removed build/static/js/runtime~main.c4aa2477.js.gz
Binary file not shown.
8 changes: 4 additions & 4 deletions src/components/tokens/Overview/TokenListAll.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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>
)
)
Expand Down
10 changes: 6 additions & 4 deletions src/components/tokens/Token20Detail/Information.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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
}
Expand Down
Loading