Only prevent link from opening if never opened before

safe-global · Dec 2, 2024 · 691a5a2 · 691a5a2
1 parent 97d4391
commit 691a5a2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/src/components/dashboard/SafeAppsDashboardSection/SafeAppsDashboardSection.tsx b/src/components/dashboard/SafeAppsDashboardSection/SafeAppsDashboardSection.tsx
@@ -37,7 +37,11 @@ const SafeAppsDashboardSection = () => {
               safeApp={rankedSafeApp}
               onBookmarkSafeApp={(appId) => togglePin(appId, SAFE_APPS_LABELS.dashboard)}
               isBookmarked={pinnedSafeAppIds.has(rankedSafeApp.id)}
-              onClickSafeApp={() => openPreviewDrawer(rankedSafeApp)}
+              onClickSafeApp={(e) => {
+                // Don't open link
+                e.preventDefault()
+                openPreviewDrawer(rankedSafeApp)
+              }}
               openPreviewDrawer={openPreviewDrawer}
             />
           </Grid>

diff --git a/src/components/safe-apps/SafeAppCard/index.tsx b/src/components/safe-apps/SafeAppCard/index.tsx
@@ -21,7 +21,7 @@ import css from './styles.module.css'
 
 type SafeAppCardProps = {
   safeApp: SafeAppData
-  onClickSafeApp?: () => void
+  onClickSafeApp?: (e: SyntheticEvent) => void
   isBookmarked?: boolean
   onBookmarkSafeApp?: (safeAppId: number) => void
   removeCustomApp?: (safeApp: SafeAppData) => void
@@ -66,7 +66,7 @@ export const getSafeAppUrl = (router: NextRouter, safeAppUrl: string) => {
 
 type SafeAppCardViewProps = {
   safeApp: SafeAppData
-  onClickSafeApp?: () => void
+  onClickSafeApp?: (e: SyntheticEvent) => void
   safeAppUrl: string
   isBookmarked?: boolean
   onBookmarkSafeApp?: (safeAppId: number) => void
@@ -137,7 +137,7 @@ const SafeAppCardGridView = ({
 }
 
 type SafeAppCardContainerProps = {
-  onClickSafeApp?: () => void
+  onClickSafeApp?: (e: SyntheticEvent) => void
   safeAppUrl: string
   children: ReactNode
   height?: string
@@ -153,8 +153,7 @@ export const SafeAppCardContainer = ({
 }: SafeAppCardContainerProps) => {
   const handleClickSafeApp = (event: SyntheticEvent) => {
     if (onClickSafeApp) {
-      event.preventDefault()
-      onClickSafeApp()
+      onClickSafeApp(event)
     }
   }
 

diff --git a/src/components/safe-apps/SafeAppList/index.tsx b/src/components/safe-apps/SafeAppList/index.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react'
+import { type SyntheticEvent, useCallback } from 'react'
 import type { SafeAppData } from '@safe-global/safe-gateway-typescript-sdk'
 
 import SafeAppCard from '@/components/safe-apps/SafeAppCard'
@@ -46,18 +46,16 @@ const SafeAppList = ({
   const showZeroResultsPlaceholder = query && safeAppsList.length === 0
 
   const handleSafeAppClick = useCallback(
-    (safeApp: SafeAppData) => {
-      if (openedSafeAppIds.includes(safeApp.id)) {
+    (e: SyntheticEvent, safeApp: SafeAppData) => {
+      const isCustomApp = safeApp.id < 1
+      if (!openedSafeAppIds.includes(safeApp.id) && !isCustomApp) {
+        // Don't open link
+        e.preventDefault()
+        openPreviewDrawer(safeApp)
+      } else {
         // We only track if not previously opened as it is then tracked in preview drawer
         trackSafeAppEvent({ ...SAFE_APPS_EVENTS.OPEN_APP, label: eventLabel }, safeApp.name)
-        return
       }
-
-      const isCustomApp = safeApp.id < 1
-
-      if (isCustomApp) return
-
-      openPreviewDrawer(safeApp)
     },
     [eventLabel, openPreviewDrawer, openedSafeAppIds],
   )
@@ -93,7 +91,7 @@ const SafeAppList = ({
               isBookmarked={bookmarkedSafeAppsId?.has(safeApp.id)}
               onBookmarkSafeApp={() => togglePin(safeApp.id, eventLabel)}
               removeCustomApp={removeCustomApp}
-              onClickSafeApp={() => handleSafeAppClick(safeApp)}
+              onClickSafeApp={(e) => handleSafeAppClick(e, safeApp)}
               openPreviewDrawer={openPreviewDrawer}
             />
           </li>