chore: PR comments

Fixing PR comments from coderabbit

Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>

.github/workflows/trivy-scan.yml

@@ -1,60 +0,0 @@
-name: 🛡️ Trivy Security Scan
-
-# Filesystem scan (Streamyfin ships no container image): finds vulnerable dependencies,
-# leaked secrets and misconfigurations, and reports them to GitHub code scanning.
-# Runs post-merge + weekly (not on PRs — dependency-review already gates PRs, and SARIF
-# upload needs a write token that fork PRs don't get).
-on:
-  push:
-    branches: [develop, master]
-  schedule:
-    - cron: "50 7 * * 5" # Weekly, Friday 07:50 UTC
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: trivy-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  trivy:
-    name: 🔎 Filesystem scan
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-      security-events: write # upload SARIF to code scanning
-    steps:
-      - name: 📥 Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      # Rotate the DB cache weekly (matches the scheduled scan): cache hits within the week
-      # instead of a fresh immutable entry per run, still refreshing the DB every week.
-      - name: 🗓️ Compute weekly Trivy cache key
-        id: trivy-cache-key
-        run: echo "value=trivy-db-${{ runner.os }}-$(date -u +%G-%V)" >> "$GITHUB_OUTPUT"
-
-      - name: 💾 Cache Trivy vulnerability DB
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: ~/.cache/trivy
-          key: ${{ steps.trivy-cache-key.outputs.value }}
-          restore-keys: trivy-db-${{ runner.os }}-
-
-      - name: 🔎 Run Trivy filesystem scan
-        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
-        with:
-          scan-type: fs
-          scan-ref: .
-          scanners: vuln,secret,misconfig
-          ignore-unfixed: true
-          severity: CRITICAL,HIGH
-          format: sarif
-          output: trivy-results.sarif
-
-      - name: 📤 Upload results to code scanning
-        uses: github/codeql-action/upload-sarif@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
-        with:
-          sarif_file: trivy-results.sarif
-          category: trivy-fs

app/(auth)/(tabs)/(home)/settings.tv.tsx

@@ -1,12 +1,13 @@
 import { SubtitlePlaybackMode } from "@jellyfin/sdk/lib/generated-client";
-import { useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { Directory, Paths } from "expo-file-system";
 import { Image } from "expo-image";
 import { useAtom } from "jotai";
-import { useMemo, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { toast } from "sonner-native";
 import { Text } from "@/components/common/Text";
 import { TVPasswordEntryModal } from "@/components/login/TVPasswordEntryModal";
 import { TVPINEntryModal } from "@/components/login/TVPINEntryModal";
@@ -21,6 +22,7 @@ import {
   TVSettingsToggle,
 } from "@/components/tv";
 import { useScaledTVTypography } from "@/constants/TVTypography";
+import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";
 import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import { useTVUserSwitchModal } from "@/hooks/useTVUserSwitchModal";
 import { APP_LANGUAGES } from "@/i18n";
@@ -50,7 +52,7 @@ import { clearTopShelfCacheSafely } from "@/utils/topshelf/cache";
 export default function SettingsTV() {
   const { t } = useTranslation();
   const insets = useSafeAreaInsets();
-  const { settings, updateSettings } = useSettings();
+  const { settings, updateSettings, pluginSettings } = useSettings();
   const { logout, loginWithSavedCredential, loginWithPassword } = useJellyfin();
   const [user] = useAtom(userAtom);
   const [api] = useAtom(apiAtom);
@@ -59,6 +61,51 @@ export default function SettingsTV() {
   const { showUserSwitchModal } = useTVUserSwitchModal();
   const typography = useScaledTVTypography();
   const queryClient = useQueryClient();
+  const { jellyseerrApi, setJellyseerrUser, clearAllJellyseerData } =
+    useJellyseerr();
+
+  // Jellyseerr state
+  const [jellyseerrServerUrl, setJellyseerrServerUrl] = useState(
+    settings.jellyseerrServerUrl || "",
+  );
+  const [jellyseerrPassword, setJellyseerrPassword] = useState("");
+
+  const isJellyseerrLocked =
+    pluginSettings?.jellyseerrServerUrl?.locked === true;
+  const isJellyseerrConnected = !!jellyseerrApi;
+
+  const handleJellyseerrUrlBlur = useCallback(() => {
+    const url = jellyseerrServerUrl.trim();
+    updateSettings({ jellyseerrServerUrl: url || undefined });
+  }, [jellyseerrServerUrl, updateSettings]);
+
+  const jellyseerrLoginMutation = useMutation({
+    mutationFn: async () => {
+      const url = jellyseerrServerUrl.trim();
+      if (!url) throw new Error("Missing server url");
+      if (!user?.Name) throw new Error("Missing user info");
+      const tempApi = new JellyseerrApi(url);
+      const testResult = await tempApi.test();
+      if (!testResult.isValid) throw new Error("Invalid server url");
+      return tempApi.login(user.Name, jellyseerrPassword);
+    },
+    onSuccess: (loggedInUser) => {
+      setJellyseerrUser(loggedInUser);
+      updateSettings({ jellyseerrServerUrl: jellyseerrServerUrl.trim() });
+    },
+    onError: () => {
+      toast.error(t("jellyseerr.failed_to_login"));
+    },
+    onSettled: () => {
+      setJellyseerrPassword("");
+    },
+  });
+
+  const handleDisconnectJellyseerr = useCallback(() => {
+    clearAllJellyseerData();
+    setJellyseerrServerUrl("");
+    setJellyseerrPassword("");
+  }, [clearAllJellyseerData]);
 
   // Local state for OpenSubtitles API key (only commit on blur)
   const [openSubtitlesApiKey, setOpenSubtitlesApiKey] = useState(
@@ -877,6 +924,81 @@ export default function SettingsTV() {
             onToggle={(value) => updateSettings({ tvThemeMusicEnabled: value })}
           />
 
+          {/* seerr Section */}
+          <TVSectionHeader title='seerr' />
+          <Text
+            style={{
+              color: "#9CA3AF",
+              fontSize: typography.callout - 2,
+              marginBottom: 16,
+              marginLeft: 8,
+            }}
+          >
+            {t("home.settings.plugins.jellyseerr.server_url_hint") ||
+              "Enter your Jellyseerr server URL to enable discover and request features."}
+          </Text>
+          <TVSettingsTextInput
+            label={
+              t("home.settings.plugins.jellyseerr.server_url") || "Server URL"
+            }
+            value={jellyseerrServerUrl}
+            placeholder={
+              t("home.settings.plugins.jellyseerr.server_url_placeholder") ||
+              "https://jellyseerr.example.com"
+            }
+            onChangeText={setJellyseerrServerUrl}
+            onBlur={handleJellyseerrUrlBlur}
+            disabled={isJellyseerrLocked || jellyseerrLoginMutation.isPending}
+          />
+          {!isJellyseerrConnected && !isJellyseerrLocked && (
+            <>
+              <TVSettingsTextInput
+                label={
+                  t("home.settings.plugins.jellyseerr.password") || "Password"
+                }
+                value={jellyseerrPassword}
+                placeholder={
+                  t("home.settings.plugins.jellyseerr.password_placeholder", {
+                    username: user?.Name,
+                  }) || `Jellyfin password`
+                }
+                onChangeText={setJellyseerrPassword}
+                secureTextEntry
+                disabled={jellyseerrLoginMutation.isPending}
+              />
+              <TVSettingsOptionButton
+                label={
+                  jellyseerrLoginMutation.isPending
+                    ? t("common.connecting", "Connecting...") || "Connecting..."
+                    : t("common.connect", "Connect") || "Connect"
+                }
+                value=''
+                onPress={() => jellyseerrLoginMutation.mutate()}
+                disabled={jellyseerrLoginMutation.isPending}
+              />
+            </>
+          )}
+          <TVSettingsRow
+            label={
+              isJellyseerrConnected
+                ? t("common.connected", "Connected") || "Connected"
+                : t("common.not_connected", "Not connected") || "Not connected"
+            }
+            value=''
+            showChevron={false}
+          />
+          {isJellyseerrConnected && !isJellyseerrLocked && (
+            <TVSettingsOptionButton
+              label={
+                t(
+                  "home.settings.plugins.jellyseerr.reset_jellyseerr_config_button",
+                ) || "Disconnect"
+              }
+              value=''
+              onPress={handleDisconnectJellyseerr}
+            />
+          )}
+
           {/* Storage Section */}
           <TVSectionHeader title={t("home.settings.storage.storage_title")} />
           <TVSettingsOptionButton

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

@@ -7,7 +7,12 @@ import { useAsyncDebouncer } from "@tanstack/react-pacer";
 import { useQuery } from "@tanstack/react-query";
 import axios from "axios";
 import { Image } from "expo-image";
-import { useLocalSearchParams, useNavigation, useSegments } from "expo-router";
+import {
+  useIsFocused,
+  useLocalSearchParams,
+  useNavigation,
+  useSegments,
+} from "expo-router";
 import { useAtom } from "jotai";
 import { orderBy, uniqBy } from "lodash";
 import {
@@ -20,7 +25,13 @@ import {
   useState,
 } from "react";
 import { useTranslation } from "react-i18next";
-import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
+import {
+  Alert,
+  Platform,
+  ScrollView,
+  TouchableOpacity,
+  View,
+} from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
 import { Text } from "@/components/common/Text";
@@ -41,7 +52,10 @@ import { SearchItemWrapper } from "@/components/search/SearchItemWrapper";
 import { SearchTabButtons } from "@/components/search/SearchTabButtons";
 import { TVSearchPage } from "@/components/search/TVSearchPage";
 import useRouter from "@/hooks/useAppRouter";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
+import {
+  useJellyseerr,
+  validateJellyseerrSession,
+} from "@/hooks/useJellyseerr";
 import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
@@ -106,8 +120,44 @@ export default function SearchPage() {
 
   const [api] = useAtom(apiAtom);
 
+  const isFocused = useIsFocused();
   const { settings } = useSettings();
   const { jellyseerrApi } = useJellyseerr();
+
+  // Alert when seerr server is configured but user hasn't connected (only when focused)
+  const jellyseerrAlertedRef = useRef(false);
+  useEffect(() => {
+    if (!isFocused || !settings?.jellyseerrServerUrl || jellyseerrApi) return;
+    if (jellyseerrAlertedRef.current) return;
+    jellyseerrAlertedRef.current = true;
+    Alert.alert(
+      t("jellyseerr.connect_to_jellyseerr", "Connect to Jellyseerr"),
+      t(
+        "jellyseerr.connect_in_settings",
+        "Jellyseerr is available. Connect in Settings to enable request features.",
+      ),
+    );
+  }, [isFocused, settings?.jellyseerrServerUrl, jellyseerrApi, t]);
+
+  // Validate jellyseerr session when switching to Discover
+  useEffect(() => {
+    if (
+      searchType !== "Discover" ||
+      !jellyseerrApi ||
+      !settings?.jellyseerrServerUrl
+    )
+      return;
+    validateJellyseerrSession(settings.jellyseerrServerUrl).then((status) => {
+      if (status.valid) return;
+      Alert.alert(
+        t("jellyseerr.session_expired", "Session expired"),
+        t(
+          "jellyseerr.session_expired_connect_again",
+          "Your Jellyseerr session has expired. Please reconnect in Settings.",
+        ),
+      );
+    });
+  }, [searchType, jellyseerrApi, settings?.jellyseerrServerUrl, t]);
   const [jellyseerrOrderBy, setJellyseerrOrderBy] =
     useState<JellyseerrSearchSort>(
       JellyseerrSearchSort[

components/jellyseerr/discover/TVDiscoverSlide.tsx

@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { Animated, FlatList, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
+import { useScaledTVSizes } from "@/constants/TVSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import {
@@ -22,8 +23,6 @@ import type {
   TvResult,
 } from "@/utils/jellyseerr/server/models/Search";
 
-const SCALE_PADDING = 20;
-
 interface TVDiscoverPosterProps {
   item: MovieResult | TvResult;
   isFirstItem?: boolean;
@@ -34,6 +33,7 @@ const TVDiscoverPoster: React.FC<TVDiscoverPosterProps> = ({
   isFirstItem = false,
 }) => {
   const typography = useScaledTVTypography();
+  const sizes = useScaledTVSizes();
   const router = useRouter();
   const { jellyseerrApi, getTitle, getYear } = useJellyseerr();
   const { focused, handleFocus, handleBlur, animatedStyle } =
@@ -50,6 +50,8 @@ const TVDiscoverPoster: React.FC<TVDiscoverPosterProps> = ({
     item.mediaInfo?.status === MediaStatus.AVAILABLE ||
     item.mediaInfo?.status === MediaStatus.PARTIALLY_AVAILABLE;
 
+  const posterWidth = sizes.posters.poster;
+
   const handlePress = () => {
     router.push({
       pathname: "/(auth)/(tabs)/(search)/jellyseerr/page",
@@ -71,7 +73,7 @@ const TVDiscoverPoster: React.FC<TVDiscoverPosterProps> = ({
         style={[
           animatedStyle,
           {
-            width: 210,
+            width: posterWidth,
             shadowColor: "#fff",
             shadowOffset: { width: 0, height: 0 },
             shadowOpacity: focused ? 0.6 : 0,
@@ -81,9 +83,9 @@ const TVDiscoverPoster: React.FC<TVDiscoverPosterProps> = ({
       >
         <View
           style={{
-            width: 210,
+            width: posterWidth,
             aspectRatio: 10 / 15,
-            borderRadius: 24,
+            borderRadius: sizes.gaps.small,
             overflow: "hidden",
             backgroundColor: "rgba(255,255,255,0.1)",
           }}
@@ -140,12 +142,12 @@ const TVDiscoverPoster: React.FC<TVDiscoverPosterProps> = ({
         >
           {title}
         </Text>
-        {year && (
+        {year != null && (
           <Text
             style={{
               fontSize: typography.callout,
               color: "#9CA3AF",
-              marginTop: 2,
+              marginTop: sizes.gaps.small,
             }}
           >
             {year}
@@ -166,6 +168,7 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
   isFirstSlide = false,
 }) => {
   const typography = useScaledTVTypography();
+  const sizes = useScaledTVSizes();
   const { t } = useTranslation();
   const { jellyseerrApi, isJellyseerrMovieOrTvResult } = useJellyseerr();
 
@@ -231,14 +234,14 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
   if (!flatData || flatData.length === 0) return null;
 
   return (
-    <View style={{ marginBottom: 24 }}>
+    <View style={{ marginBottom: sizes.gaps.section }}>
       <Text
         style={{
           fontSize: typography.heading,
           fontWeight: "bold",
           color: "#FFFFFF",
-          marginBottom: 16,
-          marginLeft: SCALE_PADDING,
+          marginBottom: sizes.gaps.small,
+          marginLeft: sizes.padding.scale,
         }}
       >
         {slideTitle}
@@ -249,9 +252,9 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
         keyExtractor={(item) => item.id.toString()}
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
-          paddingHorizontal: SCALE_PADDING,
-          paddingVertical: SCALE_PADDING,
-          gap: 20,
+          paddingHorizontal: sizes.padding.scale,
+          paddingVertical: sizes.padding.scale,
+          gap: sizes.gaps.item,
         }}
         style={{ overflow: "visible" }}
         onEndReached={() => {

components/search/TVJellyseerrSearchResults.tsx

@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { Animated, FlatList, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
+import { useScaledTVSizes } from "@/constants/TVSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { MediaStatus } from "@/utils/jellyseerr/server/constants/media";
@@ -14,20 +15,21 @@ import type {
   TvResult,
 } from "@/utils/jellyseerr/server/models/Search";
 
-const SCALE_PADDING = 20;
-
 interface TVJellyseerrPosterProps {
   item: MovieResult | TvResult;
   onPress: () => void;
   isFirstItem?: boolean;
+  disabled?: boolean;
 }
 
 const TVJellyseerrPoster: React.FC<TVJellyseerrPosterProps> = ({
   item,
   onPress,
   isFirstItem = false,
+  disabled = false,
 }) => {
   const typography = useScaledTVTypography();
+  const sizes = useScaledTVSizes();
   const { jellyseerrApi, getTitle, getYear } = useJellyseerr();
   const { focused, handleFocus, handleBlur, animatedStyle } =
     useTVFocusAnimation({ scaleAmount: 1.05 });
@@ -43,18 +45,22 @@ const TVJellyseerrPoster: React.FC<TVJellyseerrPosterProps> = ({
     item.mediaInfo?.status === MediaStatus.AVAILABLE ||
     item.mediaInfo?.status === MediaStatus.PARTIALLY_AVAILABLE;
 
+  const posterWidth = sizes.posters.poster;
+
   return (
     <Pressable
       onPress={onPress}
       onFocus={handleFocus}
       onBlur={handleBlur}
-      hasTVPreferredFocus={isFirstItem}
+      hasTVPreferredFocus={isFirstItem && !disabled}
+      disabled={disabled}
+      focusable={!disabled}
     >
       <Animated.View
         style={[
           animatedStyle,
           {
-            width: 210,
+            width: posterWidth,
             shadowColor: "#fff",
             shadowOffset: { width: 0, height: 0 },
             shadowOpacity: focused ? 0.6 : 0,
@@ -64,9 +70,9 @@ const TVJellyseerrPoster: React.FC<TVJellyseerrPosterProps> = ({
       >
         <View
           style={{
-            width: 210,
+            width: posterWidth,
             aspectRatio: 10 / 15,
-            borderRadius: 24,
+            borderRadius: sizes.gaps.small,
             overflow: "hidden",
             backgroundColor: "rgba(255,255,255,0.1)",
           }}
@@ -117,13 +123,13 @@ const TVJellyseerrPoster: React.FC<TVJellyseerrPosterProps> = ({
             fontSize: typography.callout,
             color: "#fff",
             fontWeight: "600",
-            marginTop: 12,
+            marginTop: sizes.gaps.small,
           }}
           numberOfLines={2}
         >
           {title}
         </Text>
-        {year && (
+        {year != null && (
           <Text
             style={{
               fontSize: typography.callout,
@@ -142,13 +148,16 @@ const TVJellyseerrPoster: React.FC<TVJellyseerrPosterProps> = ({
 interface TVJellyseerrPersonPosterProps {
   item: PersonResult;
   onPress: () => void;
+  disabled?: boolean;
 }
 
 const TVJellyseerrPersonPoster: React.FC<TVJellyseerrPersonPosterProps> = ({
   item,
   onPress,
+  disabled = false,
 }) => {
   const typography = useScaledTVTypography();
+  const sizes = useScaledTVSizes();
   const { jellyseerrApi } = useJellyseerr();
   const { focused, handleFocus, handleBlur, animatedStyle } =
     useTVFocusAnimation();
@@ -157,13 +166,21 @@ const TVJellyseerrPersonPoster: React.FC<TVJellyseerrPersonPosterProps> = ({
     ? jellyseerrApi?.imageProxy(item.profilePath, "w185")
     : null;
 
+  const avatarSize = Math.round(sizes.posters.poster * 0.67);
+
   return (
-    <Pressable onPress={onPress} onFocus={handleFocus} onBlur={handleBlur}>
+    <Pressable
+      onPress={onPress}
+      onFocus={handleFocus}
+      onBlur={handleBlur}
+      disabled={disabled}
+      focusable={!disabled}
+    >
       <Animated.View
         style={[
           animatedStyle,
           {
-            width: 160,
+            width: avatarSize,
             alignItems: "center",
             shadowColor: "#fff",
             shadowOffset: { width: 0, height: 0 },
@@ -174,9 +191,9 @@ const TVJellyseerrPersonPoster: React.FC<TVJellyseerrPersonPosterProps> = ({
       >
         <View
           style={{
-            width: 140,
-            height: 140,
-            borderRadius: 70,
+            width: avatarSize,
+            height: avatarSize,
+            borderRadius: avatarSize / 2,
             overflow: "hidden",
             backgroundColor: "rgba(255,255,255,0.1)",
             borderWidth: focused ? 3 : 0,
@@ -198,7 +215,11 @@ const TVJellyseerrPersonPoster: React.FC<TVJellyseerrPersonPosterProps> = ({
                 alignItems: "center",
               }}
             >
-              <Ionicons name='person' size={56} color='rgba(255,255,255,0.4)' />
+              <Ionicons
+                name='person'
+                size={Math.round(avatarSize * 0.35)}
+                color='rgba(255,255,255,0.4)'
+              />
             </View>
           )}
         </View>
@@ -207,7 +228,7 @@ const TVJellyseerrPersonPoster: React.FC<TVJellyseerrPersonPosterProps> = ({
             fontSize: typography.callout,
             color: focused ? "#fff" : "rgba(255,255,255,0.9)",
             fontWeight: "600",
-            marginTop: 12,
+            marginTop: sizes.gaps.small,
             textAlign: "center",
           }}
           numberOfLines={2}
@@ -223,6 +244,7 @@ interface TVJellyseerrMovieSectionProps {
   title: string;
   items: MovieResult[];
   isFirstSection?: boolean;
+  disabled?: boolean;
   onItemPress: (item: MovieResult) => void;
 }
 
@@ -230,20 +252,22 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
   title,
   items,
   isFirstSection = false,
+  disabled = false,
   onItemPress,
 }) => {
   const typography = useScaledTVTypography();
+  const sizes = useScaledTVSizes();
   if (!items || items.length === 0) return null;
 
   return (
-    <View style={{ marginBottom: 24 }}>
+    <View style={{ marginBottom: sizes.gaps.section }}>
       <Text
         style={{
           fontSize: typography.heading,
           fontWeight: "bold",
           color: "#FFFFFF",
-          marginBottom: 16,
-          marginLeft: SCALE_PADDING,
+          marginBottom: sizes.gaps.small,
+          marginLeft: sizes.padding.scale,
         }}
       >
         {title}
@@ -254,9 +278,9 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
         keyExtractor={(item) => item.id.toString()}
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
-          paddingHorizontal: SCALE_PADDING,
-          paddingVertical: SCALE_PADDING,
-          gap: 20,
+          paddingHorizontal: sizes.padding.scale,
+          paddingVertical: sizes.padding.scale,
+          gap: sizes.gaps.item,
         }}
         style={{ overflow: "visible" }}
         renderItem={({ item, index }) => (
@@ -264,6 +288,7 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
             item={item}
             onPress={() => onItemPress(item)}
             isFirstItem={isFirstSection && index === 0}
+            disabled={disabled}
           />
         )}
       />
@@ -275,6 +300,7 @@ interface TVJellyseerrTvSectionProps {
   title: string;
   items: TvResult[];
   isFirstSection?: boolean;
+  disabled?: boolean;
   onItemPress: (item: TvResult) => void;
 }
 
@@ -282,20 +308,22 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
   title,
   items,
   isFirstSection = false,
+  disabled = false,
   onItemPress,
 }) => {
   const typography = useScaledTVTypography();
+  const sizes = useScaledTVSizes();
   if (!items || items.length === 0) return null;
 
   return (
-    <View style={{ marginBottom: 24 }}>
+    <View style={{ marginBottom: sizes.gaps.section }}>
       <Text
         style={{
           fontSize: typography.heading,
           fontWeight: "bold",
           color: "#FFFFFF",
-          marginBottom: 16,
-          marginLeft: SCALE_PADDING,
+          marginBottom: sizes.gaps.small,
+          marginLeft: sizes.padding.scale,
         }}
       >
         {title}
@@ -306,9 +334,9 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
         keyExtractor={(item) => item.id.toString()}
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
-          paddingHorizontal: SCALE_PADDING,
-          paddingVertical: SCALE_PADDING,
-          gap: 20,
+          paddingHorizontal: sizes.padding.scale,
+          paddingVertical: sizes.padding.scale,
+          gap: sizes.gaps.item,
         }}
         style={{ overflow: "visible" }}
         renderItem={({ item, index }) => (
@@ -316,6 +344,7 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
             item={item}
             onPress={() => onItemPress(item)}
             isFirstItem={isFirstSection && index === 0}
+            disabled={disabled}
           />
         )}
       />
@@ -327,6 +356,7 @@ interface TVJellyseerrPersonSectionProps {
   title: string;
   items: PersonResult[];
   isFirstSection?: boolean;
+  disabled?: boolean;
   onItemPress: (item: PersonResult) => void;
 }
 
@@ -334,20 +364,22 @@ const TVJellyseerrPersonSection: React.FC<TVJellyseerrPersonSectionProps> = ({
   title,
   items,
   isFirstSection: _isFirstSection = false,
+  disabled = false,
   onItemPress,
 }) => {
   const typography = useScaledTVTypography();
+  const sizes = useScaledTVSizes();
   if (!items || items.length === 0) return null;
 
   return (
-    <View style={{ marginBottom: 24 }}>
+    <View style={{ marginBottom: sizes.gaps.section }}>
       <Text
         style={{
           fontSize: typography.heading,
           fontWeight: "bold",
           color: "#FFFFFF",
-          marginBottom: 16,
-          marginLeft: SCALE_PADDING,
+          marginBottom: sizes.gaps.small,
+          marginLeft: sizes.padding.scale,
         }}
       >
         {title}
@@ -358,15 +390,16 @@ const TVJellyseerrPersonSection: React.FC<TVJellyseerrPersonSectionProps> = ({
         keyExtractor={(item) => item.id.toString()}
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
-          paddingHorizontal: SCALE_PADDING,
-          paddingVertical: SCALE_PADDING,
-          gap: 20,
+          paddingHorizontal: sizes.padding.scale,
+          paddingVertical: sizes.padding.scale,
+          gap: sizes.gaps.item,
         }}
         style={{ overflow: "visible" }}
         renderItem={({ item }) => (
           <TVJellyseerrPersonPoster
             item={item}
             onPress={() => onItemPress(item)}
+            disabled={disabled}
           />
         )}
       />
@@ -384,6 +417,7 @@ export interface TVJellyseerrSearchResultsProps {
   onMoviePress: (item: MovieResult) => void;
   onTvPress: (item: TvResult) => void;
   onPersonPress: (item: PersonResult) => void;
+  disabled?: boolean;
 }
 
 export const TVJellyseerrSearchResults: React.FC<
@@ -398,8 +432,10 @@ export const TVJellyseerrSearchResults: React.FC<
   onMoviePress,
   onTvPress,
   onPersonPress,
+  disabled = false,
 }) => {
   const { t } = useTranslation();
+  const typography = useScaledTVTypography();
 
   if (loading) {
     return null;
@@ -410,7 +446,7 @@ export const TVJellyseerrSearchResults: React.FC<
       <View style={{ alignItems: "center", paddingTop: 40 }}>
         <Text
           style={{
-            fontSize: 24,
+            fontSize: typography.heading,
             fontWeight: "bold",
             color: "#FFFFFF",
             marginBottom: 8,
@@ -418,7 +454,9 @@ export const TVJellyseerrSearchResults: React.FC<
         >
           {t("search.no_results_found_for")}
         </Text>
-        <Text style={{ fontSize: 18, color: "rgba(255,255,255,0.6)" }}>
+        <Text
+          style={{ fontSize: typography.body, color: "rgba(255,255,255,0.6)" }}
+        >
           "{searchQuery}"
         </Text>
       </View>
@@ -435,18 +473,21 @@ export const TVJellyseerrSearchResults: React.FC<
         title={t("search.request_movies")}
         items={movieResults}
         isFirstSection={false}
+        disabled={disabled}
         onItemPress={onMoviePress}
       />
       <TVJellyseerrTvSection
         title={t("search.request_series")}
         items={tvResults}
         isFirstSection={false}
+        disabled={disabled}
         onItemPress={onTvPress}
       />
       <TVJellyseerrPersonSection
         title={t("search.actors")}
         items={personResults}
         isFirstSection={false}
+        disabled={disabled}
         onItemPress={onPersonPress}
       />
     </View>

components/search/TVSearchPage.tsx

@@ -1,6 +1,6 @@
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useAtom } from "jotai";
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, ScrollView, TextInput, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -166,6 +166,7 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
   const { t } = useTranslation();
   const insets = useSafeAreaInsets();
   const [api] = useAtom(apiAtom);
+  const [isSearchFocused, setIsSearchFocused] = useState(false);
 
   // Image URL getter for music items
   const getImageUrl = useMemo(() => {
@@ -270,6 +271,9 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
               onChangeText={setSearch}
               defaultValue=''
               autoFocus={false}
+              onFocus={() => setIsSearchFocused(true)}
+              onBlur={() => setIsSearchFocused(false)}
+              hasTVPreferredFocus
             />
           </View>
         )}
@@ -290,6 +294,7 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
               searchType={searchType}
               setSearchType={setSearchType}
               showDiscover={showDiscover}
+              disabled={isSearchFocused}
             />
           </View>
         )}
@@ -316,6 +321,7 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
                 // every keystroke as results re-render. User navigates down to the
                 // grid manually.
                 isFirstSection={false}
+                disabled={isSearchFocused}
                 onItemPress={onItemPress}
                 onItemLongPress={onItemLongPress}
                 imageUrlGetter={
@@ -339,6 +345,7 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
             loading={jellyseerrLoading}
             noResults={jellyseerrNoResults}
             searchQuery={debouncedSearch}
+            disabled={isSearchFocused}
             onMoviePress={onJellyseerrMoviePress || (() => {})}
             onTvPress={onJellyseerrTvPress || (() => {})}
             onPersonPress={onJellyseerrPersonPress || (() => {})}

hooks/useJellyseerr.ts

@@ -70,6 +70,30 @@ export const clearJellyseerrStorageData = () => {
   storage.remove(JELLYSEERR_COOKIES);
 };
 
+export type JellyseerrSessionStatus =
+  | { valid: true }
+  | { valid: false; reason: "no_session" | "expired" };
+
+export async function validateJellyseerrSession(
+  serverUrl: string,
+): Promise<JellyseerrSessionStatus> {
+  const user = storage.get<JellyseerrUser>(JELLYSEERR_USER);
+  const cookies = storage.get<string[]>(JELLYSEERR_COOKIES);
+
+  if (!user || !cookies) {
+    return { valid: false, reason: "no_session" };
+  }
+
+  try {
+    const api = new JellyseerrApi(serverUrl);
+    await api.axios.get(Endpoints.API_V1 + Endpoints.STATUS);
+    return { valid: true };
+  } catch {
+    clearJellyseerrStorageData();
+    return { valid: false, reason: "expired" };
+  }
+}
+
 export enum Endpoints {
   STATUS = "/status",
   API_V1 = "/api/v1",
@@ -450,7 +474,8 @@ export const useJellyseerr = () => {
     clearJellyseerrStorageData();
     setJellyseerrUser(undefined);
     updateSettings({ jellyseerrServerUrl: undefined });
-  }, []);
+    queryClient.removeQueries({ queryKey: ["search", "jellyseerr"] });
+  }, [queryClient]);
 
   const requestMedia = useCallback(
     (title: string, request: MediaRequestBody, onSuccess?: () => void) => {

modules/tv-recommendations/android/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
   <application>
     <receiver android:name=".TvRecommendationsReceiver" android:exported="true">
       <intent-filter>

modules/tv-recommendations/android/src/main/java/expo/modules/tvrecommendations/TvRecommendationsPublisher.kt

@@ -16,13 +16,12 @@ import androidx.tvprovider.media.tv.PreviewProgram
 import androidx.tvprovider.media.tv.TvContractCompat
 import org.json.JSONArray
 import org.json.JSONObject
-import java.security.MessageDigest
 
 internal object TvRecommendationsPublisher {
   private const val TAG = "TvRecommendations"
   private const val PREFS_NAME = "StreamyfinTvRecommendations"
   private const val KEY_PAYLOAD = "payload"
-  private const val KEY_CHANNEL_ID_PREFIX = "channelId_"
+  private const val KEY_CHANNEL_ID = "channelId"
   private const val KEY_PROGRAM_IDS = "programIds"
   private const val DEFAULT_CHANNEL_NAME = "Continue and Next Up"
 
@@ -163,24 +162,16 @@ internal object TvRecommendationsPublisher {
     val prefs = preferences(context)
     val programIdsJson = prefs.getString(KEY_PROGRAM_IDS, null) ?: return
     try {
-      val channelMap = JSONObject(programIdsJson)
-      val channelKeys = channelMap.keys()
-      while (channelKeys.hasNext()) {
-        val channelId = channelKeys.next()
-        val inner = channelMap.optJSONObject(channelId) ?: continue
-        val providerKeys = inner.keys()
-        while (providerKeys.hasNext()) {
-          val providerId = providerKeys.next()
-          if (inner.optLong(providerId, -1L) == programId) {
-            inner.remove(providerId)
-            if (inner.length() == 0) {
-              channelMap.remove(channelId)
-            }
+      val programIds = JSONObject(programIdsJson)
+      val keys = programIds.keys()
+      while (keys.hasNext()) {
+        val key = keys.next()
+        if (programIds.optLong(key, -1L) == programId) {
+          programIds.remove(key)
           break
         }
       }
-      }
-      prefs.edit().putString(KEY_PROGRAM_IDS, channelMap.toString()).apply()
+      prefs.edit().putString(KEY_PROGRAM_IDS, programIds.toString()).apply()
     } catch (e: Exception) {
       Log.w(TAG, "removeProgramFromPrefs(): failed to update prefs for programId=$programId", e)
     }
@@ -331,8 +322,7 @@ internal object TvRecommendationsPublisher {
 
   private fun getOrCreateChannel(context: Context, displayName: String): Long {
     val prefs = preferences(context)
-    val channelKey = getChannelKey(displayName)
-    val existingChannelId = prefs.getLong(channelKey, -1L)
+    val existingChannelId = prefs.getLong(KEY_CHANNEL_ID, -1L)
     val contentResolver = context.contentResolver
 
     if (existingChannelId > 0L) {
@@ -373,7 +363,7 @@ internal object TvRecommendationsPublisher {
 
       // Channel truly doesn't exist in provider — recreate
       Log.w(TAG, "getOrCreateChannel(): channelId=$existingChannelId not in provider, recreating")
-      prefs.edit().remove(channelKey).apply()
+      prefs.edit().remove(KEY_CHANNEL_ID).apply()
     }
 
     // Create a new channel
@@ -394,7 +384,6 @@ internal object TvRecommendationsPublisher {
     } ?: return -1L
 
     val channelId = ContentUris.parseId(channelUri)
-    prefs.edit().putLong(channelKey, channelId).apply()
     TvContractCompat.requestChannelBrowsable(context, channelId)
     storeChannelLogo(context, channelId)
     Log.d(TAG, "getOrCreateChannel(): created new channelId=$channelId displayName=\"$displayName\"")
@@ -402,10 +391,6 @@ internal object TvRecommendationsPublisher {
     return channelId
   }
 
-  private fun getChannelKey(displayName: String): String {
-    return KEY_CHANNEL_ID_PREFIX + displayName.hashCode()
-  }
-
   private fun upsertPreviewProgram(
     context: Context,
     channelId: Long,
@@ -477,18 +462,13 @@ internal object TvRecommendationsPublisher {
   }
 
   /**
-   * Append a stable cache key derived from the image URL.
-   * The Jellyfin image URLs already include a `tag=` query param (etag)
-   * that changes whenever the image content changes, so a deterministic
-   * hash of the URL is sufficient — the param only changes when the URL
-   * (and therefore the image) actually changes, avoiding unnecessary
-   * re-downloads on every sync.
+   * Append a cache-busting parameter to ensure unique URIs when images change.
+   * Per Android docs: "Use unique Uris for all images... the old image will
+   * continue to appear if you don't change the Uri."
    */
   private fun appendCacheBuster(imageUrl: String): String {
-    val digest = MessageDigest.getInstance("MD5").digest(imageUrl.toByteArray())
-    val hash = digest.joinToString("") { "%02x".format(it) }.substring(0, 16)
     val separator = if (imageUrl.contains("?")) "&" else "?"
-    return "$imageUrl${separator}_v=$hash"
+    return "$imageUrl${separator}_t=${System.currentTimeMillis()}"
   }
 
   private fun buildIntentUri(context: Context, deepLink: String): Uri {
@@ -551,8 +531,8 @@ internal object TvRecommendationsPublisher {
     return bitmap
   }
 
-  fun getChannelId(context: Context, displayName: String = DEFAULT_CHANNEL_NAME): Long {
-    return preferences(context).getLong(getChannelKey(displayName), -1L)
+  fun getChannelId(context: Context): Long {
+    return preferences(context).getLong(KEY_CHANNEL_ID, -1L)
   }
 
   private fun preferences(context: Context): SharedPreferences {
@@ -589,8 +569,6 @@ internal object TvRecommendationsPublisher {
       } ?: Log.w(TAG, "logProviderState(): channel query returned null for channelId=$channelId")
     } catch (error: SecurityException) {
       Log.w(TAG, "logProviderState(): lost provider permission for channelId=$channelId", error)
-} catch (error: Exception) {
-  Log.w(TAG, "logProviderState(): failed to query channelId=$channelId", error)
     }
   }
 }

modules/tv-recommendations/android/src/main/java/expo/modules/tvrecommendations/TvRecommendationsReceiver.kt

@@ -3,24 +3,16 @@ package expo.modules.tvrecommendations
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.ContentUris
 import android.util.Log
 import androidx.tvprovider.media.tv.TvContractCompat
 
 class TvRecommendationsReceiver : BroadcastReceiver() {
   override fun onReceive(context: Context, intent: Intent) {
-    when (intent.action) {
-      TvContractCompat.ACTION_INITIALIZE_PROGRAMS -> {
+    if (intent.action != TvContractCompat.ACTION_INITIALIZE_PROGRAMS) {
+      return
+    }
+
     Log.d("TvRecommendations", "Handling INITIALIZE_PROGRAMS broadcast")
     TvRecommendationsPublisher.refreshFromCache(context)
   }
-      "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" -> {
-        val programId = intent.data?.let { ContentUris.parseId(it) } ?: -1L
-        if (programId > 0L) {
-          Log.d("TvRecommendations", "Handling PREVIEW_PROGRAM_BROWSABLE_DISABLED for programId=$programId")
-          TvRecommendationsPublisher.deletePreviewProgram(context, programId)
-        }
-      }
-    }
-  }
 }

providers/JellyfinProvider.tsx

@@ -247,12 +247,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
     }
   }, [api, secret, headers, jellyfin]);
 
-  useEffect(() => {
-    (async () => {
-      await refreshStreamyfinPluginSettings();
-    })();
-  }, []);
-
   useEffect(() => {
     store.set(apiAtom, api);
   }, [api]);
@@ -553,7 +547,20 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
         );
 
         // Refresh plugin settings
-        await refreshStreamyfinPluginSettings();
+        const recentPluginSettings = await refreshStreamyfinPluginSettings();
+        if (recentPluginSettings?.jellyseerrServerUrl?.value) {
+          const jellyseerrApi = new JellyseerrApi(
+            recentPluginSettings.jellyseerrServerUrl.value,
+          );
+          await jellyseerrApi.test().then((result) => {
+            if (result.isValid && result.requiresPass) {
+              jellyseerrApi
+                .login(username, password)
+                .then(setJellyseerrUser)
+                .catch(console.error);
+            }
+          });
+        }
       }
     },
     onError: (error) => {

translations/en.json

@@ -592,7 +592,8 @@
     "continue": "Continue",
     "verifying": "Verifying...",
     "login": "Login",
-    "refresh": "Refresh"
+    "refresh": "Refresh",
+    "loading": "Loading..."
   },
   "search": {
     "search": "Search...",
@@ -821,7 +822,11 @@
     "report_issue_button": "Report issue",
     "request_button": "Request",
     "are_you_sure_you_want_to_request_all_seasons": "Are you sure you want to request all seasons?",
-    "failed_to_login": "Failed to log in",
+    "failed_to_login": "Failed to Login",
+    "connect_to_jellyseerr": "Connect to Jellyseerr",
+    "session_expired": "Session expired",
+    "session_expired_connect_again": "Your Jellyseerr session has expired. Please reconnect in Settings.",
+    "connect_in_settings": "Jellyseerr is available. Connect in Settings to enable request features.",
     "cast": "Cast",
     "details": "Details",
     "status": "Status",

utils/jellyfin/media/getDownloadUrl.ts

@@ -50,7 +50,7 @@ export const getDownloadUrl = async ({
   if (maxBitrate.key === "Max" && !streamDetails?.mediaSource?.TranscodingUrl) {
     console.log("Downloading item directly");
     return {
-      url: `${api.basePath}/Items/${mediaSource.Id}/Download?api_key=${api.accessToken}`,
+      url: `${api.basePath}/Items/${item.Id}/Download?api_key=${api.accessToken}`,
       mediaSource: streamDetails?.mediaSource ?? null,
     };
   }