From 21899f0cce3a73ad8e8712a46e617d1496305f62 Mon Sep 17 00:00:00 2001 From: thanhvk Date: Thu, 2 Jul 2020 17:00:46 +0700 Subject: [PATCH] add comfirmation status #275 --- src/app/DepositPage/DepositPageRenderer.jsx | 6 +++--- src/components/DataTableHistory/DataTableHistory.jsx | 6 +++++- src/components/DepositTable/DepositTableRenderer.jsx | 2 +- src/locales/langs/en.json | 1 + src/locales/langs/fr.json | 1 + src/locales/langs/ja.json | 1 + src/locales/langs/nl.json | 1 + src/locales/langs/tr.json | 1 + src/locales/langs/vi.json | 1 + src/store/models/depositPage.js | 1 + 10 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/app/DepositPage/DepositPageRenderer.jsx b/src/app/DepositPage/DepositPageRenderer.jsx index 34d6825f..20f27bdb 100644 --- a/src/app/DepositPage/DepositPageRenderer.jsx +++ b/src/app/DepositPage/DepositPageRenderer.jsx @@ -34,7 +34,7 @@ export default function DepositRenderer({ { title: , field: 'status', - width: '12%', + width: '16%', }, { title: , @@ -50,12 +50,12 @@ export default function DepositRenderer({ { title: , field: 'txHash', - width: '25%', + width: '23%', }, { title: , field: 'depositAddress', - width: '25%', + width: '23%', }, ] diff --git a/src/components/DataTableHistory/DataTableHistory.jsx b/src/components/DataTableHistory/DataTableHistory.jsx index b5c22435..4cc0487c 100644 --- a/src/components/DataTableHistory/DataTableHistory.jsx +++ b/src/components/DataTableHistory/DataTableHistory.jsx @@ -35,7 +35,11 @@ function renderCell(item, field) { {truncateTripleText(item[field], 8)} ) case 'status': - return STATUS[item[field]] + if (item.tokenConfirmations && item['status'] === 'PROCESSING') { + return ({STATUS[item['status']]} {`(${item.confirmations}/${item.tokenConfirmations})`}) + } + + return STATUS[item['status']] default: return item[field] } diff --git a/src/components/DepositTable/DepositTableRenderer.jsx b/src/components/DepositTable/DepositTableRenderer.jsx index 233ef717..afd7030f 100755 --- a/src/components/DepositTable/DepositTableRenderer.jsx +++ b/src/components/DepositTable/DepositTableRenderer.jsx @@ -50,7 +50,7 @@ const DepositTableRenderer = (props: Props) => { } = props return ( - Balance ≈ ${BigNumber(totalBalance).toFormat(2)} + ≈ ${BigNumber(totalBalance).toFormat(2)} diff --git a/src/locales/langs/en.json b/src/locales/langs/en.json index 09bad4a5..8394e64a 100644 --- a/src/locales/langs/en.json +++ b/src/locales/langs/en.json @@ -208,6 +208,7 @@ "exchangeLendingPage.orders.topUpManual": "Manual", "exchangeLendingPage.orders.liqInfor1": "Collateral token / Lending token", "exchangeLendingPage.orders.liqInfor2": "Hover on liquidating price to see details", + "portfolioPage.balance": "Balance", "portfolioPage.send": "Send", "portfolioPage.receive": "Receive", "portfolioPage.hideZeroAmounts": "Hide zero amounts", diff --git a/src/locales/langs/fr.json b/src/locales/langs/fr.json index 5b523d14..93d791da 100644 --- a/src/locales/langs/fr.json +++ b/src/locales/langs/fr.json @@ -208,6 +208,7 @@ "exchangeLendingPage.orders.topUpManual": "Manual", "exchangeLendingPage.orders.liqInfor1": "Collateral token / Lending token", "exchangeLendingPage.orders.liqInfor2": "Hover on liquidating price to see details", + "portfolioPage.balance": "Balance", "portfolioPage.send": "Envoyer", "portfolioPage.receive": "Recevoir", "portfolioPage.hideZeroAmounts": "Masquer les montants nuls", diff --git a/src/locales/langs/ja.json b/src/locales/langs/ja.json index 1eba9d71..b48efd78 100644 --- a/src/locales/langs/ja.json +++ b/src/locales/langs/ja.json @@ -208,6 +208,7 @@ "exchangeLendingPage.orders.topUpManual": "マニュアル", "exchangeLendingPage.orders.liqInfor1": "担保トークン／貸出トークン", "exchangeLendingPage.orders.liqInfor2": "清算価格にカーソルを合わせると詳細が表示されます", + "portfolioPage.balance": "Balance", "portfolioPage.send": "送信", "portfolioPage.receive": "受信", "portfolioPage.hideZeroAmounts": "0で金額を非表示", diff --git a/src/locales/langs/nl.json b/src/locales/langs/nl.json index ddd89e1d..13874417 100644 --- a/src/locales/langs/nl.json +++ b/src/locales/langs/nl.json @@ -208,6 +208,7 @@ "exchangeLendingPage.orders.topUpManual": "Manual", "exchangeLendingPage.orders.liqInfor1": "Collateral token / Lending token", "exchangeLendingPage.orders.liqInfor2": "Hover on liquidating price to see details", + "portfolioPage.balance": "Balance", "portfolioPage.send": "Verzenden", "portfolioPage.receive": "Ontvangen", "portfolioPage.hideZeroAmounts": "Verberg lege rekeningen", diff --git a/src/locales/langs/tr.json b/src/locales/langs/tr.json index d41521c0..80dc5ab9 100644 --- a/src/locales/langs/tr.json +++ b/src/locales/langs/tr.json @@ -208,6 +208,7 @@ "exchangeLendingPage.orders.topUpManual": "Manuel", "exchangeLendingPage.orders.liqInfor1": "Teminatlanmış Token / Borç Verilmiş Token", "exchangeLendingPage.orders.liqInfor2": "Ayrıntıları görmek için likitide fiyatının üzerine gelin", + "portfolioPage.balance": "Balance", "portfolioPage.send": "Gönder", "portfolioPage.receive": "Al", "portfolioPage.hideZeroAmounts": "Sıfır tutarları gizle", diff --git a/src/locales/langs/vi.json b/src/locales/langs/vi.json index d743e63d..a0e362c7 100644 --- a/src/locales/langs/vi.json +++ b/src/locales/langs/vi.json @@ -208,6 +208,7 @@ "exchangeLendingPage.orders.topUpManual": "Tự TopUp", "exchangeLendingPage.orders.liqInfor1": "Đồng thế chấp/ Đồng cho vay", "exchangeLendingPage.orders.liqInfor2": "Trỏ vào giá để xem chi tiết", + "portfolioPage.balance": "Số dư", "portfolioPage.send": "Gửi", "portfolioPage.receive": "Nhận", "portfolioPage.hideZeroAmounts": "Ẩn số dư bằng 0", diff --git a/src/store/models/depositPage.js b/src/store/models/depositPage.js index 89b02036..b05ae8cc 100644 --- a/src/store/models/depositPage.js +++ b/src/store/models/depositPage.js @@ -32,6 +32,7 @@ export default function depositPageSelector(state: State) { const decimals = token ? token.decimals : amountPrecision deposit.amount = BigNumber(deposit.amount).dividedBy(10**decimals).toFixed(8) deposit.scanUrl = token.explorerUrl + deposit.tokenConfirmations = token.confirmations return deposit })