From 725d77abbae77463fea725396e169f4148b810b6 Mon Sep 17 00:00:00 2001
From: Zlatko Fedor <zlatko@chia.net>
Date: Wed, 11 May 2022 17:53:00 +0100
Subject: [PATCH] fixed card key truncate

---
 .../components/CardKeyValue/CardKeyValue.tsx    | 17 +++++++++--------
 .../LayoutDashboard/LayoutDashboard.tsx         |  2 +-
 .../core/src/components/Truncate/Truncate.tsx   |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/components/CardKeyValue/CardKeyValue.tsx b/packages/core/src/components/CardKeyValue/CardKeyValue.tsx
index 0a394186c15c..878b24cdeff9 100644
--- a/packages/core/src/components/CardKeyValue/CardKeyValue.tsx
+++ b/packages/core/src/components/CardKeyValue/CardKeyValue.tsx
@@ -20,10 +20,9 @@ const StyledTableCell= styled(({ hideDivider, ...rest }) => (
       padding-right: 0 !important;
     `
       : ''}
-
 `;
 
-type Props = {
+export type CardKeyValueProps = {
   rows: {
     key: string;
     label: ReactNode;
@@ -34,7 +33,7 @@ type Props = {
   size?: 'small' | 'normal' | 'large';
 };
 
-export default function CardKeyValue(props: Props) {
+export default function CardKeyValue(props: CardKeyValueProps) {
   const { rows, label, hideDivider, size } = props;
 
   return (
@@ -47,11 +46,13 @@ export default function CardKeyValue(props: Props) {
                 {row.label}
               </Typography>
             </StyledTableCell>
-            <StyledTableCell align="right" hideDivider={hideDivider}>
-              <Box maxWidth="100%">
-                <Typography component='div' variant="body2" noWrap>
-                  {row.value}
-                </Typography>
+            <StyledTableCell hideDivider={hideDivider} width="100%">
+              <Box ml={2} position="relative">
+                <Box position="absolute" left="0" top="0" bottom="0" right="0" display="flex" alignItems="center" justifyContent="flex-end">
+                  <Typography component='div' variant="body2" noWrap>
+                    {row.value}
+                  </Typography>
+                </Box>
               </Box>
             </StyledTableCell>
           </TableRow>
diff --git a/packages/core/src/components/LayoutDashboard/LayoutDashboard.tsx b/packages/core/src/components/LayoutDashboard/LayoutDashboard.tsx
index f2cd946a692b..761af169757d 100644
--- a/packages/core/src/components/LayoutDashboard/LayoutDashboard.tsx
+++ b/packages/core/src/components/LayoutDashboard/LayoutDashboard.tsx
@@ -119,7 +119,7 @@ export default function LayoutDashboard(props: LayoutDashboardProps) {
                       &nbsp;
                       */}
                       <Tooltip title={<Trans>Logout</Trans>}>
-                        <IconButton onClick={handleLogout} title={t`Log Out`}>
+                        <IconButton onClick={handleLogout}>
                           <ExitToAppIcon />
                         </IconButton>
                       </Tooltip>
diff --git a/packages/core/src/components/Truncate/Truncate.tsx b/packages/core/src/components/Truncate/Truncate.tsx
index 1a2c352d5bd4..628a0bb4c9c9 100644
--- a/packages/core/src/components/Truncate/Truncate.tsx
+++ b/packages/core/src/components/Truncate/Truncate.tsx
@@ -8,7 +8,7 @@ function parseValue(props) {
     leftLength = 4,
     rightLength = 4,
     splitSeparator = ':',
-    prefixes = ['nft1', 'nft0', 'xch', 'txch'],
+    prefixes = ['nft1', 'nft0', 'txch', 'xch', '0x'],
   } = props;
 
   if (!children) {