Skip to content

Commit

Permalink
Merge pull request #778 from Conflux-Chain/s38
Browse files Browse the repository at this point in the history
fix: fixed pos charts issue
  • Loading branch information
0x74616e67 authored Jun 8, 2022
2 parents a8cf9e6 + 939a7b3 commit 6ee1072
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 18 deletions.
9 changes: 1 addition & 8 deletions src/app/containers/Charts/crossSpace/Contract.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,14 @@ export function Contract({ preview = false }: ChildProps) {
formatter: data => {
const data1: any = [];
const data2: any = [];
const data3: any = [];

data?.list?.map((d, i) => {
const t = dayjs.utc(d.statTime).valueOf();
data1.push([t, Number(d.tx)]);
data2.push([t, Number(d.cfxTransfer)]);
data3.push([t, Number(d.tokenTransfer)]);
});

return [data1, data2, data3];
return [data1, data2];
},
},
options: {
Expand Down Expand Up @@ -69,11 +67,6 @@ export function Contract({ preview = false }: ChildProps) {
translations.highcharts.crossSpace.contract.seriesName2,
)}</span>`,
},
{
name: `<span>${t(
translations.highcharts.crossSpace.contract.seriesName3,
)}</span>`,
},
],
},
};
Expand Down
12 changes: 5 additions & 7 deletions src/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -536,20 +536,18 @@
"dailyCFXTransfer": {
"title": "Daily CFX Transfer",
"subtitle": "The CFX transfer in and out per day between Core and eSpace.",
"yAxisTitle": "Count",
"seriesName": "Transfer Out Count (Day)",
"yAxisTitle2": "Count",
"seriesName2": "Transfer In Count (Day)"
"yAxisTitle": "Amount",
"seriesName": "Transfer Out Amount (Day)",
"yAxisTitle2": "Amount",
"seriesName2": "Transfer In Amount (Day)"
},
"contract": {
"title": "Contract Statistics",
"subtitle": "Daily contract statistics.",
"yAxisTitle": "Count",
"seriesName": "Transactions Count (Day)",
"yAxisTitle2": "Count",
"seriesName2": "CFX Transfer Count (Day)",
"yAxisTitle3": "Count",
"seriesName3": "Token Transfer Count (Day)"
"seriesName2": "CFX Transfer Count (Day)"
}
},
"pos": {
Expand Down
4 changes: 1 addition & 3 deletions src/locales/zh_cn/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,7 @@
"yAxisTitle": "数量",
"seriesName": "每日交易数",
"yAxisTitle2": "数量",
"seriesName2": "每日 CFX 转移数",
"yAxisTitle3": "数量",
"seriesName3": "每日代币转移数"
"seriesName2": "每日 CFX 转移数"
}
},
"pos": {
Expand Down

0 comments on commit 6ee1072

Please sign in to comment.