Merge remote-tracking branch 'origin/dev' into eip1193-provider

safe-global · May 31, 2024 · 0aa42f8 · 0aa42f8
2 parents 4a34e9d + 1f6e2b6
commit 0aa42f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/components/welcome/MyAccounts/useTrackedSafesCount.ts b/src/components/welcome/MyAccounts/useTrackedSafesCount.ts
@@ -22,11 +22,11 @@ const useTrackSafesCount = (
   }, [wallet?.address])
 
   useEffect(() => {
-    if (!isOwnedSafesTracked && ownedSafes && ownedSafes.length > 0 && isLoginPage) {
+    if (wallet && !isOwnedSafesTracked && ownedSafes && ownedSafes.length > 0 && isLoginPage) {
       trackEvent({ ...OVERVIEW_EVENTS.TOTAL_SAFES_OWNED, label: ownedSafes.length })
       isOwnedSafesTracked = true
     }
-  }, [isLoginPage, ownedSafes])
+  }, [isLoginPage, ownedSafes, wallet])
 
   useEffect(() => {
     if (watchlistSafes && isLoginPage && watchlistSafes.length > 0 && !isWatchlistTracked) {

diff --git a/src/features/recovery/components/RecoverySettings/index.tsx b/src/features/recovery/components/RecoverySettings/index.tsx
@@ -4,7 +4,6 @@ import { RECOVERY_EVENTS } from '@/services/analytics/events/recovery'
 import { Box, Button, Grid, Paper, SvgIcon, Tooltip, Typography } from '@mui/material'
 import { type ReactElement, useMemo, useState } from 'react'
 
-import { Chip } from '@/components/common/Chip'
 import ExternalLink from '@/components/common/ExternalLink'
 import { DelayModifierRow } from './DelayModifierRow'
 import useRecovery from '@/features/recovery/hooks/useRecovery'
@@ -118,8 +117,6 @@ function RecoverySettings(): ReactElement {
             <Typography variant="h4" fontWeight="bold">
               Account recovery
             </Typography>
-
-            <Chip label="New" />
           </Box>
         </Grid>