Merge pull request #1670 from RafaelTaranto/chore/merge-9-into-10-202…

…40404 Chore/merge 9 into 10 20240404
lamassu · Apr 4, 2024 · 4a2c05c · 4a2c05c
2 parents 8b405ae + fe274ff
commit 4a2c05c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/lib/new-config-manager.js b/lib/new-config-manager.js
@@ -1,5 +1,3 @@
-const {AUTH_METHODS} = require('./compliance-triggers')
-
 const _ = require('lodash/fp')
 const { validate } = require('uuid')
 

diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js
@@ -51,6 +51,7 @@ const GET_TRANSACTIONS = gql`
       customerIdCardPhotoPath
       customerFrontCameraPath
       customerPhone
+      customerEmail
       discount
       customerId
       isAnonymous

diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
@@ -138,7 +138,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
     .minus(cashInFee)
     .toFixed(2, 1) // ROUND_DOWN
   const crypto = getCryptoAmount(tx)
-  const cryptoFee = getCryptoFeeAmount(tx)
+  const cryptoFee = tx.fee ? `${getCryptoFeeAmount(tx)} ${tx.fiatCode}` : 'N/A'
   const exchangeRate = BigNumber(fiat)
     .div(crypto)
     .toFixed(2, 1) // ROUND_DOWN
@@ -382,7 +382,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
         {tx.txClass === 'cashIn' && (
           <div className={classes.blockFee}>
             <Label>Network Fee</Label>
-            {cryptoFee} {tx.fiatCode}
+            {cryptoFee}
           </div>
         )}
         <div className={classes.sessionId}>

diff --git a/new-lamassu-admin/src/pages/Wallet/helper.js b/new-lamassu-admin/src/pages/Wallet/helper.js
@@ -208,7 +208,7 @@ const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => {
   const widthAdjust = wizard ? 11 : 0
   const viewCryptoCurrency = it => {
     const currencyDisplay = R.compose(
-      it => `${R.prop(['display'])(it)} ${it.isBeta ? '(Beta)' : ''}`,
+      it => `${R.prop(['display'])(it)} ${it?.isBeta ? '(Beta)' : ''}`,
       R.find(R.propEq('code', it))
     )(cryptoCurrencies)
     return currencyDisplay