diff --git a/apps/mobile/app/(app)/(tabs)/home/queue.tsx b/apps/mobile/app/(app)/(tabs)/home/queue.tsx index a1b4283..1a1257e 100644 --- a/apps/mobile/app/(app)/(tabs)/home/queue.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/queue.tsx @@ -1,5 +1,5 @@ import { usePaginatedQuery, useQuery } from "convex/react" -import { Stack } from "expo-router" +import { Stack, useRouter } from "expo-router" import { FlatList, Pressable, StyleSheet, Text, View } from "react-native" import { Button, LoadingView } from "@/components/ui/primitives" @@ -12,6 +12,7 @@ import { spacing, useThemeColors } from "@/lib/theme" const PAGE_SIZE = 50 export default function QueueScreen() { + const router = useRouter() const colors = useThemeColors() const { queueSongIds, @@ -42,6 +43,18 @@ export default function QueueScreen() { void reorderQueue(next) } + function handleClearQueue() { + if (router.canGoBack()) { + router.back() + setTimeout(() => { + void clearQueue() + }, 0) + return + } + + void clearQueue() + } + if (queueSongs === undefined) { return } @@ -52,7 +65,7 @@ export default function QueueScreen() { options={{ headerRight: () => queueSongIds.length > 0 ? ( -