From ac2dc93dc846eacb8ac0ac0473d7bb00c914e643 Mon Sep 17 00:00:00 2001 From: Matt Holtzman Date: Tue, 5 Mar 2024 17:58:26 -0500 Subject: [PATCH] update tx estimate formatting and cost for dex swap estimate (#1702) * update tx estimate formatting and cost for dex swap estimate * remove unneeded formatting --- main/chains/index.js | 4 ++-- resources/Components/Monitor/index.js | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/main/chains/index.js b/main/chains/index.js index c79aa70f8..286788475 100644 --- a/main/chains/index.js +++ b/main/chains/index.js @@ -117,8 +117,8 @@ class ChainConnection extends EventEmitter { { label: 'Dex Swap', txExample: { - value: '0x13e1e16b2a10c9', - data: '0x049639fb0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000042000000000000000000000000000000000000420000000000000000000000000000000000000000000000000013e1e16b2a10c900000000000000000000000000000000000000000000000045575639011cb45400000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000038812aa3caf000000000000000000000000b63aae6c353636d66df13b89ba4425cfe13d10ba00000000000000000000000042000000000000000000000000000000000000060000000000000000000000004200000000000000000000000000000000000042000000000000000000000000b63aae6c353636d66df13b89ba4425cfe13d10ba000000000000000000000000a7ca2c8673bcfa5a26d8ceec2887f2cc2b0db22a0000000000000000000000000000000000000000000000000013e1e16b2a10c900000000000000000000000000000000000000000000000045575639011cb455000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f50000000000000000000000000000000000000000000000000000000001d700a007e5c0d20000000000000000000000000000000000000000000000000001b30001505126a132dab612db5cb9fc9ac426a0cc215a3423f9c942000000000000000000000000000000000000060004f41766d8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011edea400000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000b63aae6c353636d66df13b89ba4425cfe13d10ba0000000000000000000000000000000000000000000000000000000065e75a70000000000000000000000000000000000000000000000000000000000000000100000000000000000000000042000000000000000000000000000000000000060000000000000000000000007f5c764cbc14f9669b88837ca1490cca17c31607000000000000000000000000000000000000000000000000000000000000000102a000000000000000000000000000000000000000000000000045575639011cb455ee63c1e5801d751bc1a723accf1942122ca9aa82d49d08d2ae7f5c764cbc14f9669b88837ca1490cca17c316071111111254eeb25477b68fb85ed929f73a96058200000000000000000000000bd34b36000000000000000000000000000000000000000000000000', + value: '0x38d7ea4c68000', + data: '0x3593564c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000065e7831900000000000000000000000000000000000000000000000000000000000000020b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000038d7ea4c680000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000038d7ea4c680000000000000000000000000000000000000000000000000000b683f16dd057b6400000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002b42000000000000000000000000000000000000060001f44200000000000000000000000000000000000042000000000000000000000000000000000000000000', gasLimit: addHexPrefix((200000).toString(16)) } } diff --git a/resources/Components/Monitor/index.js b/resources/Components/Monitor/index.js index 92147f3cb..4994cec97 100644 --- a/resources/Components/Monitor/index.js +++ b/resources/Components/Monitor/index.js @@ -15,11 +15,8 @@ function levelDisplay(level) { } function toDisplayUSD(num) { - const bn = BigNumber(num) - if (num === 0) return '?' - return parseFloat( - num >= 1 ? bn.toFixed(0, BigNumber.ROUND_UP).toString() : bn.toFixed(2, BigNumber.ROUND_UP).toString() - ) + if (!num || num === 0) return '?' + return BigNumber(num).toFixed(num >= 10 ? 0 : 2) } const GasFees = ({ gasPrice, color }) => ( @@ -180,7 +177,7 @@ class ChainSummaryComponent extends Component { {!cost || cost >= 0.01 || cost === '?' ? `$` : '<$'} - {(cost && `${toDisplayUSD(cost)}`) || '?'} + {toDisplayUSD(cost)}
{label}