From 820e79e2d0d78ea35a976bdb590e8bed78f9ff4b Mon Sep 17 00:00:00 2001
From: Dylan Jeffers <dylan@audius.co>
Date: Fri, 23 Jun 2023 20:31:17 -0700
Subject: [PATCH] Fix user profile always showing artist tabs (#3648)

---
 .../profile-screen/ProfileTabNavigator.tsx    | 31 ++-----------------
 .../src/screens/profile-screen/useIsArtist.ts | 24 ++++++++++++++
 2 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 packages/mobile/src/screens/profile-screen/useIsArtist.ts

diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabNavigator.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabNavigator.tsx
index cf848c76b7..6e05e6ce4e 100644
--- a/packages/mobile/src/screens/profile-screen/ProfileTabNavigator.tsx
+++ b/packages/mobile/src/screens/profile-screen/ProfileTabNavigator.tsx
@@ -1,9 +1,6 @@
 import type { ReactNode } from 'react'
-import { useEffect } from 'react'
 
-import { accountActions, accountSelectors } from '@audius/common'
 import type { Animated } from 'react-native'
-import { useDispatch, useSelector } from 'react-redux'
 
 import IconAlbum from 'app/assets/images/iconAlbum.svg'
 import IconCollectibles from 'app/assets/images/iconCollectibles.svg'
@@ -22,11 +19,9 @@ import { PlaylistsTab } from './PlaylistsTab'
 import { RepostsTab } from './RepostsTab'
 import { TracksTab } from './TracksTab'
 import { useSelectProfile } from './selectors'
+import { useIsArtist } from './useIsArtist'
 import { useShouldShowCollectiblesTab } from './utils'
 
-const { fetchHasTracks } = accountActions
-const { getUserId, getUserHandle, getAccountHasTracks } = accountSelectors
-
 // Height of a typical profile header
 const INITIAL_PROFILE_HEADER_HEIGHT = 1081
 
@@ -52,31 +47,11 @@ export const ProfileTabNavigator = ({
   refreshing,
   onRefresh
 }: ProfileTabNavigatorProps) => {
-  const { user_id, track_count } = useSelectProfile(['user_id', 'track_count'])
+  const { user_id } = useSelectProfile(['user_id'])
   const { params } = useRoute<'Profile'>()
 
   const initialParams = { id: user_id, handle: params.handle }
-
-  const accountHasTracks = useSelector(getAccountHasTracks)
-  const isArtist = accountHasTracks || track_count > 0
-
-  const currentUserId = useSelector(getUserId)
-  const currentUserHandle = useSelector(getUserHandle)
-  const dispatch = useDispatch()
-  useEffect(() => {
-    if (
-      currentUserId === initialParams.id ||
-      currentUserHandle === initialParams.handle
-    ) {
-      dispatch(fetchHasTracks())
-    }
-  }, [
-    currentUserHandle,
-    currentUserId,
-    dispatch,
-    initialParams.handle,
-    initialParams.id
-  ])
+  const isArtist = useIsArtist()
 
   const showCollectiblesTab = useShouldShowCollectiblesTab()
 
diff --git a/packages/mobile/src/screens/profile-screen/useIsArtist.ts b/packages/mobile/src/screens/profile-screen/useIsArtist.ts
new file mode 100644
index 0000000000..643a51148a
--- /dev/null
+++ b/packages/mobile/src/screens/profile-screen/useIsArtist.ts
@@ -0,0 +1,24 @@
+import { useEffect } from 'react'
+
+import { accountActions, accountSelectors } from '@audius/common'
+import { useDispatch, useSelector } from 'react-redux'
+
+import { useSelectProfile } from './selectors'
+
+const { fetchHasTracks } = accountActions
+const { getUserId, getAccountHasTracks } = accountSelectors
+
+export const useIsArtist = () => {
+  const { user_id, track_count } = useSelectProfile(['user_id', 'track_count'])
+  const accountHasTracks = useSelector(getAccountHasTracks)
+  const currentUserId = useSelector(getUserId)
+  const dispatch = useDispatch()
+
+  useEffect(() => {
+    if (accountHasTracks === null && currentUserId === user_id) {
+      dispatch(fetchHasTracks())
+    }
+  }, [accountHasTracks, currentUserId, user_id, dispatch])
+
+  return (user_id === currentUserId && accountHasTracks) || track_count > 0
+}