diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json index 68c1e758..ba65fec1 100644 --- a/new-lamassu-admin/package-lock.json +++ b/new-lamassu-admin/package-lock.json @@ -23,7 +23,6 @@ "apollo-link-http": "^1.5.17", "apollo-upload-client": "^13.0.0", "axios": "0.21.1", - "base-64": "^1.0.0", "bignumber.js": "9.0.0", "classnames": "2.2.6", "countries-and-timezones": "^2.4.0", @@ -2684,11 +2683,6 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, - "node_modules/base-64": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz", - "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" - }, "node_modules/base-x": { "version": "3.0.10", "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz", diff --git a/new-lamassu-admin/src/components/fake-table/Table.jsx b/new-lamassu-admin/src/components/fake-table/Table.jsx index b43d5bee..5b6acaa7 100644 --- a/new-lamassu-admin/src/components/fake-table/Table.jsx +++ b/new-lamassu-admin/src/components/fake-table/Table.jsx @@ -53,7 +53,7 @@ const Td = ({ [classes.size]: !header, [classes.bold]: !header && bold } - return
{children}
+ return
{children}
} const Th = ({ children, ...props }) => { diff --git a/new-lamassu-admin/src/components/tables/DataTable.jsx b/new-lamassu-admin/src/components/tables/DataTable.jsx index 30b18758..19616a7e 100644 --- a/new-lamassu-admin/src/components/tables/DataTable.jsx +++ b/new-lamassu-admin/src/components/tables/DataTable.jsx @@ -53,6 +53,7 @@ const Row = ({ return (
{ } return ( -
+
-
+
@@ -247,7 +247,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
-
+
{tx.customerPhone && ( @@ -332,11 +332,11 @@ const DetailsRow = ({ it: tx, timezone }) => { )}
-
+
{crypto > 0 ? displayExRate : '-'}
-
+
{`${commission} ${tx.fiatCode} (${commissionPercentage} %)`} @@ -347,13 +347,13 @@ const DetailsRow = ({ it: tx, timezone }) => { )}
-
+
{`${fixedFee} ${tx.fiatCode}`}
-
+
{!R.isNil(tx.walletScore) && ( @@ -368,7 +368,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
-
+
{tx.txClass === 'cashOut' ? ( @@ -379,18 +379,18 @@ const DetailsRow = ({ it: tx, timezone }) => {
{tx.txClass === 'cashIn' && ( -
+
{cryptoFee}
)} -
+
{tx.id}
-
+
{errorElements} {((tx.txClass === 'cashOut' && getStatus(tx) === 'Pending') || (tx.txClass === 'cashIn' && getStatus(tx) === 'Batched')) && ( @@ -409,7 +409,7 @@ const DetailsRow = ({ it: tx, timezone }) => { )}
{!R.isNil(tx.swept) && R.includes(tx.cryptoCode, SWEEPABLE_CRYPTOS) && ( -
+
{tx.swept ? `Swept` : `Unswept`} diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.jsx b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx index 1d58b5d1..cec62569 100644 --- a/new-lamassu-admin/src/pages/Transactions/Transactions.jsx +++ b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx @@ -191,7 +191,7 @@ const Transactions = () => {
{Customer.displayName(it)}
{!it.isAnonymous && ( -
redirect(it.customerId)}> +
redirect(it.customerId)}> {it.hasError || it.batchError ? ( ) : (