From 557312225187f89d896d2915e5334e599773335f Mon Sep 17 00:00:00 2001
From: iamacook <aaron@safe.global>
Date: Tue, 27 Jun 2023 13:06:50 +0200
Subject: [PATCH 1/2] fix: make balance change more compact

---
 .../redefine/RedefineBalanceChange.tsx        | 41 +++++++------------
 src/components/tx/security/redefine/index.tsx |  2 +-
 .../tx/security/redefine/styles.module.css    | 23 +++--------
 src/components/tx/security/tenderly/index.tsx |  2 +-
 4 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/src/components/tx/security/redefine/RedefineBalanceChange.tsx b/src/components/tx/security/redefine/RedefineBalanceChange.tsx
index d77d60e089..0191994ad3 100644
--- a/src/components/tx/security/redefine/RedefineBalanceChange.tsx
+++ b/src/components/tx/security/redefine/RedefineBalanceChange.tsx
@@ -7,19 +7,15 @@ import { type RedefineModuleResponse } from '@/services/security/modules/Redefin
 import { sameAddress } from '@/utils/addresses'
 import { FEATURES } from '@/utils/chains'
 import { formatVisualAmount } from '@/utils/formatters'
-import { Box, Chip, CircularProgress, Grid, SvgIcon, Typography } from '@mui/material'
+import { Box, Chip, CircularProgress, Grid, Typography } from '@mui/material'
 import { TokenType } from '@safe-global/safe-gateway-typescript-sdk'
 import { ErrorBoundary } from '@sentry/react'
 import { useContext } from 'react'
 import { TxSecurityContext } from '../shared/TxSecurityContext'
-import RedefineLogo from '@/public/images/transactions/redefine.svg'
-import RedefineLogoDark from '@/public/images/transactions/redefine-dark-mode.svg'
 import ArrowOutwardIcon from '@/public/images/transactions/outgoing.svg'
 import ArrowDownwardIcon from '@/public/images/transactions/incoming.svg'
 
 import css from './styles.module.css'
-import sharedCss from '@/components/tx/security/shared/styles.module.css'
-import { useDarkMode } from '@/hooks/useDarkMode'
 
 const FungibleBalanceChange = ({
   change,
@@ -43,6 +39,7 @@ const FungibleBalanceChange = ({
       <Typography variant="body2" fontWeight={700} display="inline" ml={0.5}>
         {change.symbol}
       </Typography>
+      <span style={{ margin: 'auto' }} />
       <Chip className={css.categoryChip} label={change.type} />
     </>
   )
@@ -77,6 +74,7 @@ const NFTBalanceChange = ({
       <Typography variant="subtitle2" className={css.nftId} ml={1}>
         #{change.tokenId}
       </Typography>
+      <span style={{ margin: 'auto' }} />
       <Chip className={css.categoryChip} label="NFT" />
     </>
   )
@@ -101,28 +99,28 @@ const BalanceChange = ({
 
 const BalanceChanges = () => {
   const { balanceChange, isLoading } = useContext(TxSecurityContext)
-  const totalBalanceChanges = balanceChange ? balanceChange.in.length + balanceChange.out.length : 0
+  const totalBalanceChanges = balanceChange ? balanceChange.in.length + balanceChange.out.length : undefined
 
   if (isLoading && !balanceChange) {
     return (
       <div className={css.loader}>
         <CircularProgress
-          size={30}
+          size={22}
           sx={{
             color: ({ palette }) => palette.text.secondary,
           }}
         />
-        <Typography variant="body2" color="text.secondary" display="flex" alignItems="center" gap={1} p={2}>
+        <Typography variant="body2" color="text.secondary">
           Calculating...
         </Typography>
       </div>
     )
   }
 
-  if (totalBalanceChanges === 0) {
+  if (totalBalanceChanges && totalBalanceChanges === 0) {
     return (
-      <Typography variant="body2" color="text.secondary" p={2}>
-        None
+      <Typography variant="body2" color="text.secondary" justifySelf="flex-end">
+        No balance change detected
       </Typography>
     )
   }
@@ -143,30 +141,19 @@ const BalanceChanges = () => {
 
 export const RedefineBalanceChanges = () => {
   const isFeatureEnabled = useHasFeature(FEATURES.RISK_MITIGATION)
-  const isDarkMode = useDarkMode()
 
   if (!isFeatureEnabled) {
     return null
   }
 
   return (
-    <Box className={css.box}>
-      <Box className={css.head}>
-        <Typography variant="subtitle2" fontWeight={700}>
-          Balance change
-        </Typography>
-        <Typography variant="caption" className={sharedCss.poweredBy}>
-          Powered by{' '}
-          <SvgIcon
-            inheritViewBox
-            sx={{ height: '40px', width: '52px' }}
-            component={isDarkMode ? RedefineLogoDark : RedefineLogo}
-          />
-        </Typography>
-      </Box>
+    <div className={css.box}>
+      <Typography variant="subtitle2" fontWeight={700} flexShrink={0}>
+        Balance change
+      </Typography>
       <ErrorBoundary fallback={<div>Error showing balance changes</div>}>
         <BalanceChanges />
       </ErrorBoundary>
-    </Box>
+    </div>
   )
 }
diff --git a/src/components/tx/security/redefine/index.tsx b/src/components/tx/security/redefine/index.tsx
index 36697ba0ec..9796da18d9 100644
--- a/src/components/tx/security/redefine/index.tsx
+++ b/src/components/tx/security/redefine/index.tsx
@@ -57,7 +57,7 @@ const RedefineBlock = () => {
         <div className={sharedCss.result}>
           {isLoading ? (
             <CircularProgress
-              size={30}
+              size={22}
               sx={{
                 color: ({ palette }) => palette.text.secondary,
               }}
diff --git a/src/components/tx/security/redefine/styles.module.css b/src/components/tx/security/redefine/styles.module.css
index f1c664eb7f..5081a0bffc 100644
--- a/src/components/tx/security/redefine/styles.module.css
+++ b/src/components/tx/security/redefine/styles.module.css
@@ -25,11 +25,12 @@
 .loader {
   display: flex;
   align-items: center;
-  padding-left: var(--space-2);
+  gap: var(--space-1);
+  padding-right: 12px;
+  justify-self: flex-end;
 }
 
 .balanceChanges {
-  padding: var(--space-2);
   max-height: 300px;
   overflow-y: auto;
   align-items: center;
@@ -38,8 +39,6 @@
 
 .balanceChange {
   display: flex;
-  border-radius: 6px;
-  align-items: center;
   margin-bottom: 6px;
 }
 
@@ -59,23 +58,13 @@
 
 .categoryChip {
   border-radius: 4px;
-  margin-left: auto;
   height: auto;
 }
 
-.head {
-  border-bottom: 1px solid var(--color-border-light);
-  padding: var(--space-1) var(--space-2);
-
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-
 .box {
   border-radius: 6px;
   border: 1px solid var(--color-border-light);
-  display: flex;
-  flex-direction: column;
+  display: grid;
+  grid-template-columns: 35% auto;
+  padding: var(--space-2) 12px;
 }
diff --git a/src/components/tx/security/tenderly/index.tsx b/src/components/tx/security/tenderly/index.tsx
index 7e8d99a9f1..d00045272c 100644
--- a/src/components/tx/security/tenderly/index.tsx
+++ b/src/components/tx/security/tenderly/index.tsx
@@ -87,7 +87,7 @@ const TxSimulationBlock = ({ transactions, disabled, gasLimit }: TxSimulationPro
       <div className={sharedCss.result}>
         {isLoading ? (
           <CircularProgress
-            size={30}
+            size={22}
             sx={{
               color: ({ palette }) => palette.text.secondary,
             }}

From 523df389898473fbf2c3890e12f426f223ff7ddb Mon Sep 17 00:00:00 2001
From: iamacook <aaron@safe.global>
Date: Tue, 27 Jun 2023 13:33:58 +0200
Subject: [PATCH 2/2] fix: increase `gap` between changes

---
 src/components/tx/security/redefine/styles.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/tx/security/redefine/styles.module.css b/src/components/tx/security/redefine/styles.module.css
index 5081a0bffc..48f7809ff9 100644
--- a/src/components/tx/security/redefine/styles.module.css
+++ b/src/components/tx/security/redefine/styles.module.css
@@ -34,7 +34,7 @@
   max-height: 300px;
   overflow-y: auto;
   align-items: center;
-  gap: 1px;
+  gap: var(--space-1);
 }
 
 .balanceChange {