Merge branch 'develop' into feature/bigscreen

app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/[personId].tsx

@@ -223,12 +223,14 @@ export default function page() {
                     mediaType={item.mediaType as "movie" | "tv"}
                   />
                   {/*<Text numberOfLines={1}>{item.title}</Text>*/}
-                  <Text
-                    className="text-xs opacity-50 align-bottom"
-                    numberOfLines={1}
-                  >
-                    as {item.character}
-                  </Text>
+                  {item.character && (
+                    <Text
+                      className="text-xs opacity-50 align-bottom mt-1"
+                      numberOfLines={1}
+                    >
+                      as {item.character}
+                    </Text>
+                  )}
                 </TouchableOpacity>
               )}
               keyExtractor={(item) => item.id.toString()}

app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/page.tsx

@@ -42,22 +42,18 @@ import MediaRequest from "@/utils/jellyseerr/server/entity/MediaRequest";
 import DetailFacts from "@/components/jellyseerr/DetailFacts";
 import { ItemActions } from "@/components/series/SeriesActions";
 import Cast from "@/components/jellyseerr/Cast";
+import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
 
 const Page: React.FC = () => {
   const insets = useSafeAreaInsets();
   const params = useLocalSearchParams();
-  const {
-    mediaTitle,
-    releaseYear,
-    canRequest: canRequestString,
-    posterSrc,
-    ...result
-  } = params as unknown as {
-    mediaTitle: string;
-    releaseYear: number;
-    canRequest: string;
-    posterSrc: string;
-  } & Partial<MovieResult | TvResult>;
+  const { mediaTitle, releaseYear, posterSrc, ...result } =
+    params as unknown as {
+      mediaTitle: string;
+      releaseYear: number;
+      canRequest: string;
+      posterSrc: string;
+    } & Partial<MovieResult | TvResult>;
 
   const navigation = useNavigation();
   const { jellyseerrApi, requestMedia } = useJellyseerr();
@@ -87,19 +83,7 @@ const Page: React.FC = () => {
     },
   });
 
-  const canRequest = useMemo(() => {
-    const pendingRequests = details?.mediaInfo?.requests?.some(
-      (r: MediaRequest) =>
-        r.status == MediaRequestStatus.PENDING ||
-        r.status == MediaRequestStatus.APPROVED
-    );
-
-    return (
-      (details?.mediaInfo?.status === MediaStatus.UNKNOWN &&
-        !pendingRequests) ||
-      (!details?.mediaInfo?.status && canRequestString === "true")
-    );
-  }, [canRequestString, details]);
+  const canRequest = useJellyseerrCanRequest(details);
 
   const renderBackdrop = useCallback(
     (props: BottomSheetBackdropProps) => (
@@ -225,7 +209,9 @@ const Page: React.FC = () => {
               <View className="mb-4">
                 <GenreTags genres={details?.genres?.map((g) => g.name) || []} />
               </View>
-              {canRequest ? (
+              {isLoading || isFetching ? (
+                <Button loading={true} disabled={true} color="purple"></Button>
+              ) : canRequest ? (
                 <Button color="purple" onPress={request}>
                   Request
                 </Button>
@@ -260,7 +246,7 @@ const Page: React.FC = () => {
               className="p-2 border border-neutral-800 bg-neutral-900 rounded-xl"
               details={details}
             />
-            <Cast className="px-4" details={details} />
+            <Cast details={details} />
           </View>
         </View>
       </ParallaxScrollView>

app/(auth)/(tabs)/(search)/index.tsx

@@ -31,13 +31,18 @@ import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDebounce } from "use-debounce";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
-import {MovieResult, PersonResult, TvResult} from "@/utils/jellyseerr/server/models/Search";
+import {
+  MovieResult,
+  PersonResult,
+  TvResult,
+} from "@/utils/jellyseerr/server/models/Search";
 import { MediaType } from "@/utils/jellyseerr/server/constants/media";
 import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
 import { Tag } from "@/components/GenreTags";
 import DiscoverSlide from "@/components/jellyseerr/DiscoverSlide";
 import { sortBy } from "lodash";
 import PersonPoster from "@/components/jellyseerr/PersonPoster";
+import { useReactNavigationQuery } from "@/utils/useReactNavigationQuery";
 
 type SearchType = "Library" | "Discover";
 
@@ -150,8 +155,8 @@ export default function search() {
     enabled: searchType === "Library" && debouncedSearch.length > 0,
   });
 
-  const { data: jellyseerrResults, isFetching: j1 } = useQuery({
-    queryKey: ["search", "jellyseerrResults", debouncedSearch],
+  const { data: jellyseerrResults, isFetching: j1 } = useReactNavigationQuery({
+    queryKey: ["search", "jellyseerr", "results", debouncedSearch],
     queryFn: async () => {
       const response = await jellyseerrApi?.search({
         query: new URLSearchParams(debouncedSearch).toString(),
@@ -167,14 +172,15 @@ export default function search() {
       debouncedSearch.length > 0,
   });
 
-  const { data: jellyseerrDiscoverSettings, isFetching: j2 } = useQuery({
-    queryKey: ["search", "jellyseerrDiscoverSettings", debouncedSearch],
-    queryFn: async () => jellyseerrApi?.discoverSettings(),
-    enabled:
-      !!jellyseerrApi &&
-      searchType === "Discover" &&
-      debouncedSearch.length == 0,
-  });
+  const { data: jellyseerrDiscoverSettings, isFetching: j2 } =
+    useReactNavigationQuery({
+      queryKey: ["search", "jellyseerr", "discoverSettings", debouncedSearch],
+      queryFn: async () => jellyseerrApi?.discoverSettings(),
+      enabled:
+        !!jellyseerrApi &&
+        searchType === "Discover" &&
+        debouncedSearch.length == 0,
+    });
 
   const jellyseerrMovieResults: MovieResult[] | undefined = useMemo(
     () =>
@@ -309,7 +315,7 @@ export default function search() {
           paddingRight: insets.right,
         }}
       >
-        <View className="flex flex-col pt-2">
+        <View className="flex flex-col">
           {Platform.OS === "android" && (
             <View className="mb-4 px-4">
               <Input