Merge branch 'main' of github.com:safe-global/web-core into dev

safe-global · Nov 30, 2022 · 94cd4d4 · 94cd4d4
2 parents 7823e6c + 51e0792
commit 94cd4d4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 31 deletions.
diff --git a/public/images/common/copy.svg b/public/images/common/copy.svg
diff --git a/public/images/sidebar/copy-bold.svg b/public/images/sidebar/copy-bold.svg
diff --git a/public/images/sidebar/copy.svg b/public/images/sidebar/copy.svg
diff --git a/public/images/sidebar/qr.svg b/public/images/sidebar/qr.svg
diff --git a/src/components/common/CopyButton/index.tsx b/src/components/common/CopyButton/index.tsx
@@ -36,19 +36,7 @@ const CopyButton = ({
   return (
     <Tooltip title={tooltipText} placement="top" onMouseLeave={handleMouseLeave}>
       <IconButton aria-label={initialToolTipText} onClick={handleCopy} size="small" className={className}>
-        {children ?? (
-          <SvgIcon
-            component={CopyIcon}
-            inheritViewBox
-            color="primary"
-            sx={{
-              '& path': {
-                fill: ({ palette }) => palette.border.main,
-              },
-            }}
-            fontSize="small"
-          />
-        )}
+        {children ?? <SvgIcon component={CopyIcon} inheritViewBox color="border" fontSize="small" />}
       </IconButton>
     </Tooltip>
   )

diff --git a/src/components/dashboard/Overview/Overview.tsx b/src/components/dashboard/Overview/Overview.tsx
@@ -125,7 +125,7 @@ const Overview = (): ReactElement => {
             </Grid>
 
             <Box mt={2} mb={4}>
-              <EthHashInfo showAvatar={false} address={safeAddress} shortAddress={false} />
+              <EthHashInfo showAvatar={false} address={safeAddress} shortAddress={false} showCopyButton hasExplorer />
             </Box>
 
             <Grid container>

diff --git a/src/components/safe-apps/AppFrame/TransactionQueueBar/styles.module.css b/src/components/safe-apps/AppFrame/TransactionQueueBar/styles.module.css
@@ -3,7 +3,9 @@
   bottom: 0;
   right: 0;
   width: 100%;
-  z-index: var(--onboard-modal-z-index, var(--modal-z-index));
+
+  /* MUI Drawer z-index default value see: https://mui.com/material-ui/customization/default-theme/?expand-path=$.zIndex */
+  z-index: 1200;
 
   /*this rule is needed to prevent the bar from being expanded outside the screen without scrolling on mobile devices*/
   max-height: 90vh;

diff --git a/src/components/sidebar/SidebarHeader/index.tsx b/src/components/sidebar/SidebarHeader/index.tsx
@@ -101,7 +101,7 @@ const SafeHeader = (): ReactElement => {
           </Track>
 
           <Track {...OVERVIEW_EVENTS.OPEN_EXPLORER}>
-            <a target="_blank" rel="noreferrer" href={blockExplorerLink?.href || '#'}>
+            <a target="_blank" rel="noreferrer" href={blockExplorerLink?.href || ''}>
               <HeaderIconButton title={blockExplorerLink?.title || ''}>
                 <SvgIcon component={LinkIconBold} inheritViewBox fontSize="small" color="primary" />
               </HeaderIconButton>