From 6d4f3b0f06ec2c0f9433557bbd3ac95bab6e5190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Wed, 30 Nov 2022 18:58:56 +0000 Subject: [PATCH 1/2] fix: exchange rate display in transaction card --- new-lamassu-admin/src/pages/Transactions/DetailsCard.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js index 392ccdb0..9c65b08e 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js @@ -125,7 +125,9 @@ const DetailsRow = ({ it: tx, timezone }) => { const commissionPercentage = Number.parseFloat(tx.commissionPercentage, 2) * 100 const cashInFee = isCashIn ? Number.parseFloat(tx.cashInFee) : 0 - const fiat = Number.parseFloat(tx.fiat) + const fiat = BigNumber(tx.fiat) + .minus(cashInFee) + .toFixed(2, 1) // ROUND_DOWN const crypto = getCryptoAmount(tx) const exchangeRate = (fiat / crypto).toFixed(2) const displayExRate = `1 ${tx.cryptoCode} = ${exchangeRate} ${tx.fiatCode}` From ceaf928ac3f45e6d99ae6f459d53e16f27e125b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Mon, 5 Dec 2022 04:42:53 +0000 Subject: [PATCH 2/2] fix: standardize exchange rate calculation in front-end --- new-lamassu-admin/src/pages/Transactions/DetailsCard.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js index 9c65b08e..a8577237 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js @@ -129,7 +129,9 @@ const DetailsRow = ({ it: tx, timezone }) => { .minus(cashInFee) .toFixed(2, 1) // ROUND_DOWN const crypto = getCryptoAmount(tx) - const exchangeRate = (fiat / crypto).toFixed(2) + const exchangeRate = BigNumber(fiat) + .div(crypto) + .toFixed(2, 1) // ROUND_DOWN const displayExRate = `1 ${tx.cryptoCode} = ${exchangeRate} ${tx.fiatCode}` const discount = tx.discount ? `-${tx.discount}%` : null