From 54ea708816f3cf84c35cc4d774d5637fcec00cec Mon Sep 17 00:00:00 2001
From: katspaugh <381895+katspaugh@users.noreply.github.com>
Date: Tue, 25 Oct 2022 09:40:48 +0200
Subject: [PATCH] Feat: owned Safes in the welcome page sidebar (#943)

* Feat: owned Safes in the welcome page sidebar

* Increase title bottom margin
---
 src/components/sidebar/OwnedSafes/index.tsx   | 45 ++++++++++++-------
 src/components/sidebar/SafeListItem/index.tsx | 30 +++++++------
 .../sidebar/SafeListItem/styles.module.css    |  1 -
 src/components/sidebar/Sidebar/index.tsx      | 11 +++--
 .../sidebar/Sidebar/styles.module.css         |  5 ++-
 5 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/src/components/sidebar/OwnedSafes/index.tsx b/src/components/sidebar/OwnedSafes/index.tsx
index 10bd9e8394..90ea524c3c 100644
--- a/src/components/sidebar/OwnedSafes/index.tsx
+++ b/src/components/sidebar/OwnedSafes/index.tsx
@@ -1,27 +1,38 @@
-import useChainId from '@/hooks/useChainId'
+import { useCurrentChain } from '@/hooks/useChains'
 import useOwnedSafes from '@/hooks/useOwnedSafes'
-import { List } from '@mui/material'
+import { List, Typography } from '@mui/material'
 import { type ReactElement } from 'react'
 import SafeListItem from '../SafeListItem'
 
 const OwnedSafes = (): ReactElement | null => {
-  const chainId = useChainId()
+  const chain = useCurrentChain()
   const allOwnedSafes = useOwnedSafes()
-  const ownedSafesOnChain = allOwnedSafes[chainId]
+  const ownedSafesOnChain = chain ? allOwnedSafes[chain.chainId] : undefined
 
-  return ownedSafesOnChain?.length > 0 ? (
-    <List sx={{ py: 0 }}>
-      {ownedSafesOnChain?.map((address) => (
-        <SafeListItem
-          key={address}
-          address={address}
-          chainId={chainId}
-          closeDrawer={() => void null}
-          shouldScrollToSafe={false}
-        />
-      ))}
-    </List>
-  ) : null
+  if (!chain || !ownedSafesOnChain?.length) {
+    return null
+  }
+
+  return (
+    <>
+      <Typography variant="body2" display="inline" color="primary.light" textAlign="center" mt={1} mb={2}>
+        Safes owned on {chain.chainName}
+      </Typography>
+
+      <List sx={{ py: 0 }}>
+        {ownedSafesOnChain?.map((address) => (
+          <SafeListItem
+            key={address}
+            address={address}
+            chainId={chain.chainId}
+            closeDrawer={() => void null}
+            shouldScrollToSafe={false}
+            noActions
+          />
+        ))}
+      </List>
+    </>
+  )
 }
 
 export default OwnedSafes
diff --git a/src/components/sidebar/SafeListItem/index.tsx b/src/components/sidebar/SafeListItem/index.tsx
index 62d09af211..0a932a9189 100644
--- a/src/components/sidebar/SafeListItem/index.tsx
+++ b/src/components/sidebar/SafeListItem/index.tsx
@@ -25,6 +25,7 @@ const SafeListItem = ({
   chainId,
   closeDrawer,
   shouldScrollToSafe,
+  noActions = false,
   ...rest
 }: {
   address: string
@@ -33,6 +34,7 @@ const SafeListItem = ({
   shouldScrollToSafe: boolean
   threshold?: string | number
   owners?: string | number
+  noActions?: boolean
 }): ReactElement => {
   const safeRef = useRef<HTMLDivElement>(null)
   const safeAddress = useSafeAddress()
@@ -55,18 +57,20 @@ const SafeListItem = ({
       className={css.container}
       disablePadding
       secondaryAction={
-        <Box display="flex" alignItems="center" gap={1}>
-          <SafeListItemSecondaryAction
-            chainId={chainId}
-            address={address}
-            onClick={closeDrawer}
-            href={{
-              pathname: AppRoutes.load,
-              query: { chain: shortName, address },
-            }}
-          />
-          <SafeListContextMenu name={name} address={address} chainId={chainId} />
-        </Box>
+        noActions ? undefined : (
+          <Box display="flex" alignItems="center" gap={1}>
+            <SafeListItemSecondaryAction
+              chainId={chainId}
+              address={address}
+              onClick={closeDrawer}
+              href={{
+                pathname: AppRoutes.load,
+                query: { chain: shortName, address },
+              }}
+            />
+            <SafeListContextMenu name={name} address={address} chainId={chainId} />
+          </Box>
+        )
       }
     >
       <Link href={{ pathname: AppRoutes.home, query: { safe: `${shortName}:${address}` } }} passHref>
@@ -81,7 +85,7 @@ const SafeListItem = ({
             <SafeIcon address={address} {...rest} />
           </ListItemIcon>
           <ListItemText
-            sx={{ pr: 10 }}
+            sx={noActions ? undefined : { pr: 10 }}
             primaryTypographyProps={{
               variant: 'body2',
               component: 'div',
diff --git a/src/components/sidebar/SafeListItem/styles.module.css b/src/components/sidebar/SafeListItem/styles.module.css
index e4cc16d9ed..3f70bab02d 100644
--- a/src/components/sidebar/SafeListItem/styles.module.css
+++ b/src/components/sidebar/SafeListItem/styles.module.css
@@ -7,7 +7,6 @@
 
 .safe {
   border-radius: 8px;
-  padding-left: 22px;
 }
 
 .open {
diff --git a/src/components/sidebar/Sidebar/index.tsx b/src/components/sidebar/Sidebar/index.tsx
index f516bef292..dccee28cef 100644
--- a/src/components/sidebar/Sidebar/index.tsx
+++ b/src/components/sidebar/Sidebar/index.tsx
@@ -12,6 +12,7 @@ import SidebarFooter from '@/components/sidebar/SidebarFooter'
 import css from './styles.module.css'
 import { trackEvent, OVERVIEW_EVENTS } from '@/services/analytics'
 import KeyholeIcon from '@/components/common/icons/KeyholeIcon'
+import OwnedSafes from '../OwnedSafes'
 
 const Sidebar = (): ReactElement => {
   const router = useRouter()
@@ -39,9 +40,13 @@ const Sidebar = (): ReactElement => {
             <SidebarNavigation />
           </>
         ) : (
-          <div className={css.noSafeHeader}>
-            <KeyholeIcon />
-          </div>
+          <>
+            <div className={css.noSafeHeader}>
+              <KeyholeIcon />
+            </div>
+
+            <OwnedSafes />
+          </>
         )}
 
         <div style={{ flexGrow: 1 }} />
diff --git a/src/components/sidebar/Sidebar/styles.module.css b/src/components/sidebar/Sidebar/styles.module.css
index 77787b1984..ddbd1a2f70 100644
--- a/src/components/sidebar/Sidebar/styles.module.css
+++ b/src/components/sidebar/Sidebar/styles.module.css
@@ -35,10 +35,11 @@
 
 .noSafeHeader {
   display: flex;
+  flex-direction: column;
   justify-content: center;
+  align-items: center;
   padding: 10px;
-  min-height: 80px;
-  align-items: flex-start;
+  min-height: 100px;
 }
 
 .drawerButton {