diff --git a/lib/new-admin/services/transactions.js b/lib/new-admin/services/transactions.js index 4cdd182a..2cac4b8f 100644 --- a/lib/new-admin/services/transactions.js +++ b/lib/new-admin/services/transactions.js @@ -172,7 +172,7 @@ function advancedBatch (data) { } function simplifiedBatch (data) { - const fields = ['txClass', 'id', 'created', 'machineName', + const fields = ['txClass', 'id', 'created', 'machineName', 'fee', 'cryptoCode', 'cryptoAtoms', 'fiat', 'fiatCode', 'phone', 'toAddress', 'txHash', 'dispense', 'error', 'status', 'fiatProfit', 'cryptoAmount'] diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js index fe0e208c..6a0fffef 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js @@ -89,6 +89,17 @@ const CANCEL_CASH_IN_TRANSACTION = gql` const getCryptoAmount = tx => coinUtils.toUnit(new BigNumber(tx.cryptoAtoms), tx.cryptoCode).toNumber() +const getCryptoFeeAmount = tx => { + const feeAmount = coinUtils + .toUnit(new BigNumber(tx.cryptoAtoms), tx.cryptoCode) + .toNumber() + + return new BigNumber(feeAmount) + .times(tx.rawTickerPrice) + .toNumber() + .toFixed(2, 1) +} + const formatAddress = (cryptoCode = '', address = '') => coinUtils.formatCryptoAddress(cryptoCode, address).replace(/(.{5})/g, '$1 ') @@ -129,6 +140,7 @@ const DetailsRow = ({ it: tx, timezone }) => { .minus(cashInFee) .toFixed(2, 1) // ROUND_DOWN const crypto = getCryptoAmount(tx) + const cryptoFee = getCryptoFeeAmount(tx) const exchangeRate = BigNumber(fiat) .div(crypto) .toFixed(2, 1) // ROUND_DOWN @@ -369,6 +381,12 @@ const DetailsRow = ({ it: tx, timezone }) => { )} + {tx.txClass === 'cashIn' && ( +
+ + {cryptoFee} {tx.fiatCode} +
+ )}
{tx.id} diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js index 536bf0ca..c76b1c12 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js @@ -90,6 +90,9 @@ export default { transactionId: { width: 280 }, + blockFee: { + width: 140 + }, sessionId: { width: 215 }, diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Transactions/Transactions.js index 54a95f27..dababe0f 100644 --- a/new-lamassu-admin/src/pages/Transactions/Transactions.js +++ b/new-lamassu-admin/src/pages/Transactions/Transactions.js @@ -104,6 +104,7 @@ const GET_TRANSACTIONS = gql` errorCode deviceId fiat + fee cashInFee fiatCode cryptoAtoms diff --git a/package-lock.json b/package-lock.json index 5f09adce..277457aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lamassu-server", - "version": "8.1.9", + "version": "8.1.10", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e37261dd..b8d3cdb2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lamassu-server", "description": "bitcoin atm client server protocol module", "keywords": [], - "version": "8.1.9", + "version": "8.1.10", "license": "./LICENSE", "author": "Lamassu (https://lamassu.is)", "dependencies": {