From 247efd1ecf64852663babaf1dedfd7c06a0e6c15 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 19 Mar 2024 20:01:45 +0000 Subject: [PATCH 1/6] chore: pr fixes --- lib/new-config-manager.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/new-config-manager.js b/lib/new-config-manager.js index efb84450..680b57a9 100644 --- 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') From c3cd208a0290a70b397197c281a2bd7d5d9f0065 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 19 Mar 2024 20:16:21 +0000 Subject: [PATCH 2/6] fix: display customer email on machine dashboard --- .../Machines/MachineComponents/Transactions/Transactions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js index e216c03b..bb360152 100644 --- 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 From db09cde2e04b2e5683d9172f01383d43b7dbbfc8 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 19 Mar 2024 20:24:39 +0000 Subject: [PATCH 3/6] fix: NaN display on null network fee --- new-lamassu-admin/src/pages/Transactions/DetailsCard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js index 57f07785..1cfeacc9 100644 --- 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' && (
- {cryptoFee} {tx.fiatCode} + {cryptoFee}
)}
From 7acc6054f8a7dbb099034dbe2ece7870ea96a330 Mon Sep 17 00:00:00 2001 From: CrypticaScriptura <7396812+CrypticaScriptura@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:09:25 -0400 Subject: [PATCH 4/6] chore: v9.0.0-rc.2 (#1666) --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3af6df84..6bdd7a0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lamassu-server", - "version": "9.0.0-rc.1", + "version": "9.0.0-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6e868546..031ed131 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lamassu-server", "description": "bitcoin atm client server protocol module", "keywords": [], - "version": "9.0.0-rc.1", + "version": "9.0.0-rc.2", "license": "./LICENSE", "author": "Lamassu (https://lamassu.is)", "dependencies": { From 0e606a5d5e0198729301dcb1fedb49856b595901 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Thu, 28 Mar 2024 21:55:57 +0000 Subject: [PATCH 5/6] fix: initial wizard null safety --- new-lamassu-admin/src/pages/Wallet/helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new-lamassu-admin/src/pages/Wallet/helper.js b/new-lamassu-admin/src/pages/Wallet/helper.js index cf2871bd..d68c4fd7 100644 --- 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 From 6d1ff3b466dd5cd257299f9e469c1a811043f863 Mon Sep 17 00:00:00 2001 From: CrypticaScriptura <7396812+CrypticaScriptura@users.noreply.github.com> Date: Fri, 29 Mar 2024 07:28:15 -0400 Subject: [PATCH 6/6] chore: v9.0.0 (#1668) --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6bdd7a0d..050dc980 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lamassu-server", - "version": "9.0.0-rc.2", + "version": "9.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 031ed131..64e9f2c7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lamassu-server", "description": "bitcoin atm client server protocol module", "keywords": [], - "version": "9.0.0-rc.2", + "version": "9.0.0", "license": "./LICENSE", "author": "Lamassu (https://lamassu.is)", "dependencies": {