From 57dc842d591a724bb4d6a14e8a5157120f2e4f0b Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:40:59 +0200
Subject: [PATCH 1/2] fix: display error status
---
.../src/pages/Transactions/CopyToClipboard.js | 4 +++-
.../src/pages/Transactions/DetailsCard.js | 15 ++++++++-------
.../src/pages/Transactions/DetailsCard.styles.js | 4 ++++
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js
index 1c14a2e34..b6c639142 100644
--- a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js
+++ b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js
@@ -17,6 +17,7 @@ const CopyToClipboard = ({
buttonClassname,
children,
wrapperClassname,
+ removeSpace = true,
...props
}) => {
const [anchorEl, setAnchorEl] = useState(null)
@@ -46,7 +47,8 @@ const CopyToClipboard = ({
{children}
-
+
- {getStatusDetails(tx) ? (
-
- {getStatusDetails(tx)}
-
- ) : (
- errorElements
- )}
+ {errorElements}
{((tx.txClass === 'cashOut' && getStatus(tx) === 'Pending') ||
(tx.txClass === 'cashIn' && getStatus(tx) === 'Batched')) && (
Date: Thu, 20 Oct 2022 23:25:33 +0200
Subject: [PATCH 2/2] fix: typeface
---
new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js
index a55d40db0..e7ec6e01a 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js
@@ -1,7 +1,7 @@
import typographyStyles from 'src/components/typography/styles'
import { offColor, comet, white, tomato } from 'src/styling/variables'
-const { p } = typographyStyles
+const { p, label3 } = typographyStyles
export default {
wrapper: {
@@ -139,6 +139,7 @@ export default {
width: 250
},
errorCopy: {
+ extend: label3,
lineBreak: 'normal',
maxWidth: 180
}