Renamed getGenres and getArtists to getAllGenres and getAllArtists and removed HomeNew from navigation

front/API.ts

@@ -400,7 +400,7 @@ export default class API {
 		};
 	}
 
-	public static getGenres(): Query<Genre[]> {
+	public static getAllGenres(): Query<Genre[]> {
 		return {
 			key: ['genres'],
 			exec: () =>
@@ -446,7 +446,7 @@ export default class API {
 		};
 	}
 
-	public static getArtists(): Query<Artist[]> {
+	public static getAllArtists(): Query<Artist[]> {
 		return {
 			key: ['artists'],
 			exec: () =>

front/Navigation.tsx

@@ -30,7 +30,6 @@ import SigninView from './views/SigninView';
 import SignupView from './views/SignupView';
 import PasswordResetView from './views/PasswordResetView';
 import ForgotPasswordView from './views/ForgotPasswordView';
-import Leaderboardiew from './views/LeaderboardView';
 import DiscoveryView from './views/V2/DiscoveryView';
 import MusicView from './views/MusicView';
 import Leaderboardiew from './views/LeaderboardView';
@@ -50,11 +49,6 @@ const protectedRoutes = () =>
 			options: { headerShown: false },
 			link: '/music',
 		},
-		HomeNew: {
-			component: DiscoveryView,
-			options: { headerShown: false },
-			link: '/V2',
-		},
 		Play: {
 			component: PlayView,
 			options: { headerShown: false, title: translate('play') },

front/components/ScoreModal.tsx

@@ -108,7 +108,7 @@ const ScoreModal = (props: ScoreModalProps) => {
 					onPress={() =>
 						navigation.canGoBack()
 							? navigation.goBack()
-							: navigation.navigate('HomeNew', {})
+							: navigation.navigate('Home', {})
 					}
 				/>
 			</Row>

front/components/UI/ScaffoldCC.tsx

@@ -10,7 +10,7 @@ import ScaffoldMobileCC from './ScaffoldMobileCC';
 import { useAssets } from 'expo-asset';
 
 const menu = [
-	{ type: 'main', title: 'menuDiscovery', icon: Discover, link: 'HomeNew' },
+	{ type: 'main', title: 'menuDiscovery', icon: Discover, link: 'Home' },
 	{ type: 'main', title: 'menuProfile', icon: User, link: 'User' },
 	{ type: 'main', title: 'menuMusic', icon: Music, link: 'Music' },
 	{ type: 'main', title: 'menuSearch', icon: SearchNormal1, link: 'Search' },

front/components/V2/SearchBar.tsx

@@ -43,8 +43,8 @@ const SearchBarComponent = () => {
 	const [query, setQuery] = React.useState('');
 	const [genre, setGenre] = React.useState({} as Genre | undefined);
 	const [artist, setArtist] = React.useState('');
-	const artistsQuery = useQuery(API.getArtists());
-	const genresQuery = useQuery(API.getGenres());
+	const artistsQuery = useQuery(API.getAllArtists());
+	const genresQuery = useQuery(API.getAllGenres());
 
 	if (artistsQuery.isLoading || genresQuery.isLoading) {
 		return <LoadingView />;

front/views/HomeView.tsx

@@ -93,7 +93,7 @@ const HomeView = (props: RouteProps<{}>) => {
 							label={'V2'}
 							colorScheme="gray"
 							size="sm"
-							onPress={() => navigation.navigate('HomeNew', {})}
+							onPress={() => navigation.navigate('Home', {})}
 						/>
 					</HStack>
 					<Box style={{ width: '100%' }}>