fix(library): restore filters on new arch, shared sheet, per-library memory & full reset

- present the filter sheet imperatively from the press handler (Reanimated 4 no-op via useEffect) - host filters in a single shared sheet to stop stacked sheets - keep the search input responsive on large option lists (useDeferredValue) - reset (X) also clears sort & order via a shared useFilterReset hook - per-library filter memory, reset on app close, scroll grid back to top - memoize useFilterOptions and drop debug logging
2026-07-16 01:13:27 +01:00 · 2026-07-15 18:51:50 +02:00
37 changed files with 999 additions and 500 deletions
--- a/app/(auth)/(tabs)/(home)/settings.tv.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tv.tsx
@@ -645,7 +645,7 @@ export default function SettingsTV() {
            formatValue={(v) => `${v.toFixed(1)}x`}
          />
          <TVSettingsStepper
-            label={t("home.settings.subtitles.mpv_subtitle_margin_y")}
+            label='Vertical Margin'
            value={settings.mpvSubtitleMarginY ?? 0}
            onDecrease={() => {
              const newValue = Math.max(
@@ -663,11 +663,11 @@ export default function SettingsTV() {
            }}
          />
          <TVSettingsOptionButton
-            label={t("home.settings.subtitles.mpv_subtitle_align_x")}
+            label='Horizontal Alignment'
            value={alignXLabel}
            onPress={() =>
              showOptions({
-                title: t("home.settings.subtitles.mpv_subtitle_align_x"),
+                title: "Horizontal Alignment",
                options: alignXOptions,
                onSelect: (value) =>
                  updateSettings({
@@ -677,11 +677,11 @@ export default function SettingsTV() {
            }
          />
          <TVSettingsOptionButton
-            label={t("home.settings.subtitles.mpv_subtitle_align_y")}
+            label='Vertical Alignment'
            value={alignYLabel}
            onPress={() =>
              showOptions({
-                title: t("home.settings.subtitles.mpv_subtitle_align_y"),
+                title: "Vertical Alignment",
                options: alignYOptions,
                onSelect: (value) =>
                  updateSettings({
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/collections/[collectionId].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/collections/[collectionId].tsx
@@ -23,6 +23,7 @@ import {
  TouchableItemRouter,
 } from "@/components/common/TouchableItemRouter";
 import { FilterButton } from "@/components/filters/FilterButton";
+import { FilterSheetProvider } from "@/components/filters/FilterSheetProvider";
 import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
 import { ItemCardText } from "@/components/ItemCardText";
 import { Loader } from "@/components/Loader";
@@ -134,6 +135,12 @@ const page: React.FC = () => {
  useEffect(() => {
    navigation.setOptions({ title: collection?.Name || "" });
    setSortOrder([SortOrderOption.Ascending]);
+    // Collections open with a clean filter slate: the genre/year/tag atoms are
+    // global, so without this the previously viewed library's selection bleeds
+    // in (libraries now keep their own per-library memory).
+    setSelectedGenres([]);
+    setSelectedYears([]);
+    setSelectedTags([]);

    if (!collection) return;

@@ -204,40 +211,39 @@ const page: React.FC = () => {
    ],
  );

-  const { data, isFetching, fetchNextPage, hasNextPage, isLoading } =
-    useInfiniteQuery({
-      queryKey: [
-        "collection-items",
-        collectionId,
-        selectedGenres,
-        selectedYears,
-        selectedTags,
-        sortBy,
-        sortOrder,
-      ],
-      queryFn: fetchItems,
-      getNextPageParam: (lastPage, pages) => {
-        if (
-          !lastPage?.Items ||
-          !lastPage?.TotalRecordCount ||
-          lastPage?.TotalRecordCount === 0
-        )
-          return undefined;
-
-        const totalItems = lastPage.TotalRecordCount;
-        const accumulatedItems = pages.reduce(
-          (acc, curr) => acc + (curr?.Items?.length || 0),
-          0,
-        );
-
-        if (accumulatedItems < totalItems) {
-          return lastPage?.Items?.length * pages.length;
-        }
+  const { data, fetchNextPage, hasNextPage, isLoading } = useInfiniteQuery({
+    queryKey: [
+      "collection-items",
+      collectionId,
+      selectedGenres,
+      selectedYears,
+      selectedTags,
+      sortBy,
+      sortOrder,
+    ],
+    queryFn: fetchItems,
+    getNextPageParam: (lastPage, pages) => {
+      if (
+        !lastPage?.Items ||
+        !lastPage?.TotalRecordCount ||
+        lastPage?.TotalRecordCount === 0
+      )
        return undefined;
-      },
-      initialPageParam: 0,
-      enabled: !!api && !!user?.Id && !!collection,
-    });
+
+      const totalItems = lastPage.TotalRecordCount;
+      const accumulatedItems = pages.reduce(
+        (acc, curr) => acc + (curr?.Items?.length || 0),
+        0,
+      );
+
+      if (accumulatedItems < totalItems) {
+        return lastPage?.Items?.length * pages.length;
+      }
+      return undefined;
+    },
+    initialPageParam: 0,
+    enabled: !!api && !!user?.Id && !!collection,
+  });

  const flatData = useMemo(() => {
    return (
@@ -326,7 +332,7 @@ const page: React.FC = () => {
        data={[
          {
            key: "reset",
-            component: <ResetFiltersButton />,
+            component: <ResetFiltersButton libraryId={collectionId} />,
          },
          {
            key: "genre",
@@ -466,7 +472,6 @@ const page: React.FC = () => {
      setSortBy,
      sortOrder,
      setSortOrder,
-      isFetching,
    ],
  );

@@ -633,43 +638,45 @@ const page: React.FC = () => {
  // Mobile return
  if (!Platform.isTV) {
    return (
-      <FlashList
-        ListEmptyComponent={
-          <View className='flex flex-col items-center justify-center h-full'>
-            <Text className='font-bold text-xl text-neutral-500'>
-              {t("search.no_results")}
-            </Text>
-          </View>
-        }
-        extraData={[
-          selectedGenres,
-          selectedYears,
-          selectedTags,
-          sortBy,
-          sortOrder,
-        ]}
-        contentInsetAdjustmentBehavior='automatic'
-        data={flatData}
-        renderItem={renderItem}
-        keyExtractor={keyExtractor}
-        numColumns={nrOfCols}
-        onEndReached={() => {
-          if (hasNextPage) {
-            fetchNextPage();
+      <FilterSheetProvider>
+        <FlashList
+          ListEmptyComponent={
+            <View className='flex flex-col items-center justify-center h-full'>
+              <Text className='font-bold text-xl text-neutral-500'>
+                {t("search.no_results")}
+              </Text>
+            </View>
          }
-        }}
-        onEndReachedThreshold={0.5}
-        ListHeaderComponent={ListHeaderComponent}
-        contentContainerStyle={{ paddingBottom: 24 }}
-        ItemSeparatorComponent={() => (
-          <View
-            style={{
-              width: 10,
-              height: 10,
-            }}
-          />
-        )}
-      />
+          extraData={[
+            selectedGenres,
+            selectedYears,
+            selectedTags,
+            sortBy,
+            sortOrder,
+          ]}
+          contentInsetAdjustmentBehavior='automatic'
+          data={flatData}
+          renderItem={renderItem}
+          keyExtractor={keyExtractor}
+          numColumns={nrOfCols}
+          onEndReached={() => {
+            if (hasNextPage) {
+              fetchNextPage();
+            }
+          }}
+          onEndReachedThreshold={0.5}
+          ListHeaderComponent={ListHeaderComponent}
+          contentContainerStyle={{ paddingBottom: 24 }}
+          ItemSeparatorComponent={() => (
+            <View
+              style={{
+                width: 10,
+                height: 10,
+              }}
+            />
+          )}
+        />
+      </FilterSheetProvider>
    );
  }

--- a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
+++ b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
@@ -9,7 +9,7 @@ import {
  getItemsApi,
  getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
-import { FlashList } from "@shopify/flash-list";
+import { FlashList, type FlashListRef } from "@shopify/flash-list";
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
 import {
@@ -35,6 +35,7 @@ import {
  TouchableItemRouter,
 } from "@/components/common/TouchableItemRouter";
 import { FilterButton } from "@/components/filters/FilterButton";
+import { FilterSheetProvider } from "@/components/filters/FilterSheetProvider";
 import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
 import { ItemCardText } from "@/components/ItemCardText";
 import { Loader } from "@/components/Loader";
@@ -44,6 +45,7 @@ import { TVPosterCard } from "@/components/tv/TVPosterCard";
 import { useScaledTVPosterSizes } from "@/constants/TVPosterSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
+import { useFilterReset } from "@/hooks/useFilterReset";
 import { useOrientation } from "@/hooks/useOrientation";
 import { useRefreshLibraryOnFocus } from "@/hooks/useRefreshLibraryOnFocus";
 import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
@@ -55,7 +57,9 @@ import {
  FilterByPreferenceAtom,
  filterByAtom,
  genreFilterAtom,
+  genrePreferenceAtom,
  getFilterByPreference,
+  getMultiFilterPreference,
  getSortByPreference,
  getSortOrderPreference,
  SortByOption,
@@ -66,11 +70,12 @@ import {
  sortOrderAtom,
  sortOrderOptions,
  sortOrderPreferenceAtom,
+  tagPreferenceAtom,
  tagsFilterAtom,
  useFilterOptions,
  yearFilterAtom,
+  yearPreferenceAtom,
 } from "@/utils/atoms/filters";
-import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";

@@ -108,6 +113,9 @@ const Page = () => {
  const [sortOrderPreference, setOrderByPreference] = useAtom(
    sortOrderPreferenceAtom,
  );
+  const [genrePreference, setGenrePreference] = useAtom(genrePreferenceAtom);
+  const [yearPreference, setYearPreference] = useAtom(yearPreferenceAtom);
+  const [tagPreference, setTagPreference] = useAtom(tagPreferenceAtom);

  const { orientation } = useOrientation();

@@ -205,6 +213,13 @@ const Page = () => {
      const fp = getFilterByPreference(libraryId, filterByPreference);
      _setFilterBy(fp ? [fp] : []);
    }
+
+    // Genres / years / tags: per-library saved preference (no URL params), so
+    // switching libraries restores each library's own selection instead of
+    // bleeding the previous one.
+    setSelectedGenres(getMultiFilterPreference(libraryId, genrePreference));
+    setSelectedYears(getMultiFilterPreference(libraryId, yearPreference));
+    setSelectedTags(getMultiFilterPreference(libraryId, tagPreference));
  }, [
    libraryId,
    sortOrderPreference,
@@ -213,6 +228,12 @@ const Page = () => {
    _setSortBy,
    filterByPreference,
    _setFilterBy,
+    genrePreference,
+    yearPreference,
+    tagPreference,
+    setSelectedGenres,
+    setSelectedYears,
+    setSelectedTags,
    searchParams.sortBy,
    searchParams.sortOrder,
    searchParams.filterBy,
@@ -257,6 +278,32 @@ const Page = () => {
    [libraryId, filterByPreference, setFilterByPreference, _setFilterBy],
  );

+  // Genres / years / tags: save the per-library memory then update the active
+  // atom (mirrors setSortBy; avoids a save-effect that would corrupt on switch).
+  const setGenres = useCallback(
+    (genres: string[]) => {
+      setGenrePreference({ ...genrePreference, [libraryId]: genres });
+      setSelectedGenres(genres);
+    },
+    [libraryId, genrePreference, setGenrePreference, setSelectedGenres],
+  );
+
+  const setYears = useCallback(
+    (years: string[]) => {
+      setYearPreference({ ...yearPreference, [libraryId]: years });
+      setSelectedYears(years);
+    },
+    [libraryId, yearPreference, setYearPreference, setSelectedYears],
+  );
+
+  const setTags = useCallback(
+    (tags: string[]) => {
+      setTagPreference({ ...tagPreference, [libraryId]: tags });
+      setSelectedTags(tags);
+    },
+    [libraryId, tagPreference, setTagPreference, setSelectedTags],
+  );
+
  const nrOfCols = useMemo(() => {
    if (Platform.isTV) {
      // TV uses flexWrap, so nrOfCols is just for mobile
@@ -415,6 +462,29 @@ const Page = () => {
    );
  }, [data]);

+  const flashListRef = useRef<FlashListRef<BaseItemDto>>(null);
+
+  // Jump the grid to the top when the filters/sort change (incl. reset).
+  const filterSignature = `${selectedGenres}|${selectedYears}|${selectedTags}|${sortBy[0]}|${sortOrder[0]}|${filterBy}`;
+  const pendingScrollTopRef = useRef(false);
+
+  // Instant feedback: pin to the top the moment the filters change, without
+  // waiting for the new fetch — and flag a re-pin for once it settles.
+  useEffect(() => {
+    flashListRef.current?.scrollToOffset({ offset: 0, animated: false });
+    pendingScrollTopRef.current = true;
+  }, [filterSignature]);
+
+  // Safety net: FlashList can restore the previous offset as the filtered list
+  // grows, so re-pin once the fetch settles. Pagination keeps the same
+  // signature, so it never re-pins.
+  useEffect(() => {
+    if (pendingScrollTopRef.current && !isFetching) {
+      pendingScrollTopRef.current = false;
+      flashListRef.current?.scrollToOffset({ offset: 0, animated: false });
+    }
+  }, [isFetching, flatData]);
+
  const renderItem = useCallback(
    ({ item, index }: { item: BaseItemDto; index: number }) => (
      <TouchableItemRouter
@@ -530,7 +600,6 @@ const Page = () => {

  const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);
  const generalFilters = useFilterOptions();
-  const settings = useSettings();
  const ListHeaderComponent = useCallback(
    () => (
      <FlatList
@@ -545,7 +614,7 @@ const Page = () => {
        data={[
          {
            key: "reset",
-            component: <ResetFiltersButton />,
+            component: <ResetFiltersButton libraryId={libraryId} />,
          },
          {
            key: "genre",
@@ -564,7 +633,7 @@ const Page = () => {
                  });
                  return response.data.Genres || [];
                }}
-                set={setSelectedGenres}
+                set={setGenres}
                values={selectedGenres}
                title={t("library.filters.genres")}
                renderItemLabel={(item) => item.toString()}
@@ -591,7 +660,7 @@ const Page = () => {
                  });
                  return response.data.Years || [];
                }}
-                set={setSelectedYears}
+                set={setYears}
                values={selectedYears}
                title={t("library.filters.years")}
                renderItemLabel={(item) => item.toString()}
@@ -616,7 +685,7 @@ const Page = () => {
                  });
                  return response.data.Tags || [];
                }}
-                set={setSelectedTags}
+                set={setTags}
                values={selectedTags}
                title={t("library.filters.tags")}
                renderItemLabel={(item) => item.toString()}
@@ -696,35 +765,23 @@ const Page = () => {
      api,
      user?.Id,
      selectedGenres,
-      setSelectedGenres,
+      setGenres,
      selectedYears,
-      setSelectedYears,
+      setYears,
      selectedTags,
-      setSelectedTags,
+      setTags,
      sortBy,
      setSortBy,
      sortOrder,
      setSortOrder,
-      isFetching,
      filterBy,
      setFilter,
-      settings,
    ],
  );

-  // TV Filter bar header
-  const hasActiveFilters =
-    selectedGenres.length > 0 ||
-    selectedYears.length > 0 ||
-    selectedTags.length > 0 ||
-    filterBy.length > 0;
-
-  const resetAllFilters = useCallback(() => {
-    setSelectedGenres([]);
-    setSelectedYears([]);
-    setSelectedTags([]);
-    _setFilterBy([]);
-  }, [setSelectedGenres, setSelectedYears, setSelectedTags, _setFilterBy]);
+  // Filter bar reset + visibility, shared with the mobile ResetFiltersButton so
+  // sort/order can't be forgotten on one path (it used to be reset on neither).
+  const { hasActiveFilters, resetAllFilters } = useFilterReset(libraryId);

  // TV Filter options - with "All" option for clearable filters
  const tvGenreFilterOptions = useMemo(
@@ -818,15 +875,15 @@ const Page = () => {
      options: tvGenreFilterOptions,
      onSelect: (value: string) => {
        if (value === "__all__") {
-          setSelectedGenres([]);
+          setGenres([]);
        } else if (selectedGenres.includes(value)) {
-          setSelectedGenres(selectedGenres.filter((g) => g !== value));
+          setGenres(selectedGenres.filter((g) => g !== value));
        } else {
-          setSelectedGenres([...selectedGenres, value]);
+          setGenres([...selectedGenres, value]);
        }
      },
    });
-  }, [showOptions, t, tvGenreFilterOptions, selectedGenres, setSelectedGenres]);
+  }, [showOptions, t, tvGenreFilterOptions, selectedGenres, setGenres]);

  const handleShowYearFilter = useCallback(() => {
    showOptions({
@@ -834,15 +891,15 @@ const Page = () => {
      options: tvYearFilterOptions,
      onSelect: (value: string) => {
        if (value === "__all__") {
-          setSelectedYears([]);
+          setYears([]);
        } else if (selectedYears.includes(value)) {
-          setSelectedYears(selectedYears.filter((y) => y !== value));
+          setYears(selectedYears.filter((y) => y !== value));
        } else {
-          setSelectedYears([...selectedYears, value]);
+          setYears([...selectedYears, value]);
        }
      },
    });
-  }, [showOptions, t, tvYearFilterOptions, selectedYears, setSelectedYears]);
+  }, [showOptions, t, tvYearFilterOptions, selectedYears, setYears]);

  const handleShowTagFilter = useCallback(() => {
    showOptions({
@@ -850,15 +907,15 @@ const Page = () => {
      options: tvTagFilterOptions,
      onSelect: (value: string) => {
        if (value === "__all__") {
-          setSelectedTags([]);
+          setTags([]);
        } else if (selectedTags.includes(value)) {
-          setSelectedTags(selectedTags.filter((tag) => tag !== value));
+          setTags(selectedTags.filter((tag) => tag !== value));
        } else {
-          setSelectedTags([...selectedTags, value]);
+          setTags([...selectedTags, value]);
        }
      },
    });
-  }, [showOptions, t, tvTagFilterOptions, selectedTags, setSelectedTags]);
+  }, [showOptions, t, tvTagFilterOptions, selectedTags, setTags]);

  const handleShowSortByFilter = useCallback(() => {
    showOptions({
@@ -906,42 +963,45 @@ const Page = () => {
  // Mobile return
  if (!Platform.isTV) {
    return (
-      <FlashList
-        key={orientation}
-        ListEmptyComponent={
-          <View className='flex flex-col items-center justify-center h-full'>
-            <Text className='font-bold text-xl text-neutral-500'>
-              {t("library.no_results")}
-            </Text>
-          </View>
-        }
-        contentInsetAdjustmentBehavior='automatic'
-        data={flatData}
-        renderItem={renderItem}
-        extraData={[orientation, nrOfCols]}
-        keyExtractor={keyExtractor}
-        numColumns={nrOfCols}
-        onEndReached={() => {
-          if (hasNextPage) {
-            fetchNextPage();
+      <FilterSheetProvider>
+        <FlashList
+          ref={flashListRef}
+          key={orientation}
+          ListEmptyComponent={
+            <View className='flex flex-col items-center justify-center h-full'>
+              <Text className='font-bold text-xl text-neutral-500'>
+                {t("library.no_results")}
+              </Text>
+            </View>
          }
-        }}
-        onEndReachedThreshold={1}
-        ListHeaderComponent={ListHeaderComponent}
-        contentContainerStyle={{
-          paddingBottom: 24,
-          paddingLeft: insets.left,
-          paddingRight: insets.right,
-        }}
-        ItemSeparatorComponent={() => (
-          <View
-            style={{
-              width: 10,
-              height: 10,
-            }}
-          />
-        )}
-      />
+          contentInsetAdjustmentBehavior='automatic'
+          data={flatData}
+          renderItem={renderItem}
+          extraData={[orientation, nrOfCols]}
+          keyExtractor={keyExtractor}
+          numColumns={nrOfCols}
+          onEndReached={() => {
+            if (hasNextPage) {
+              fetchNextPage();
+            }
+          }}
+          onEndReachedThreshold={1}
+          ListHeaderComponent={ListHeaderComponent}
+          contentContainerStyle={{
+            paddingBottom: 24,
+            paddingLeft: insets.left,
+            paddingRight: insets.right,
+          }}
+          ItemSeparatorComponent={() => (
+            <View
+              style={{
+                width: 10,
+                height: 10,
+              }}
+            />
+          )}
+        />
+      </FilterSheetProvider>
    );
  }

--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/artists.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/artists.tsx
@@ -89,7 +89,7 @@ export default function ArtistsScreen() {
    return (
      <View className='flex-1 justify-center items-center bg-black px-6'>
        <Text className='text-neutral-500 text-center'>
-          {t("music.missing_library_id")}
+          Missing music library id.
        </Text>
      </View>
    );
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/playlists.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/playlists.tsx
@@ -122,7 +122,7 @@ export default function PlaylistsScreen() {
    return (
      <View className='flex-1 justify-center items-center bg-black px-6'>
        <Text className='text-neutral-500 text-center'>
-          {t("music.missing_library_id")}
+          Missing music library id.
        </Text>
      </View>
    );
--- a/app/(auth)/(tabs)/(libraries)/music/[libraryId]/suggestions.tsx
+++ b/app/(auth)/(tabs)/(libraries)/music/[libraryId]/suggestions.tsx
@@ -226,7 +226,7 @@ export default function SuggestionsScreen() {
    return (
      <View className='flex-1 justify-center items-center bg-black px-6'>
        <Text className='text-neutral-500 text-center'>
-          {t("music.missing_library_id")}
+          Missing music library id.
        </Text>
      </View>
    );
--- a/app/(auth)/now-playing.tsx
+++ b/app/(auth)/now-playing.tsx
@@ -14,7 +14,6 @@ import React, {
  useRef,
  useState,
 } from "react";
-import { useTranslation } from "react-i18next";
 import {
  ActivityIndicator,
  Dimensions,
@@ -73,7 +72,6 @@ const ARTWORK_SIZE = SCREEN_WIDTH - 80;
 type ViewMode = "player" | "queue";

 export default function NowPlayingScreen() {
-  const { t } = useTranslation();
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const router = useRouter();
@@ -232,9 +230,7 @@ export default function NowPlayingScreen() {
            paddingBottom: Platform.OS === "android" ? insets.bottom : 0,
          }}
        >
-          <Text className='text-neutral-500'>
-            {t("music.no_track_playing")}
-          </Text>
+          <Text className='text-neutral-500'>No track playing</Text>
        </View>
      </BottomSheetModalProvider>
    );
@@ -271,7 +267,7 @@ export default function NowPlayingScreen() {
                    : "text-neutral-500"
                }
              >
-                {t("music.now_playing")}
+                Now Playing
              </Text>
            </TouchableOpacity>
            <TouchableOpacity
@@ -722,7 +718,6 @@ const QueueView: React.FC<QueueViewProps> = ({
  onRemoveFromQueue,
  onReorderQueue,
 }) => {
-  const { t } = useTranslation();
  const renderQueueItem = useCallback(
    ({ item, drag, isActive, getIndex }: RenderItemParams<BaseItemDto>) => {
      const index = getIndex() ?? 0;
@@ -836,15 +831,13 @@ const QueueView: React.FC<QueueViewProps> = ({
      ListHeaderComponent={
        <View className='px-4 py-2'>
          <Text className='text-neutral-400 text-xs uppercase tracking-wider'>
-            {history.length > 0
-              ? t("music.playing_from_queue")
-              : t("music.up_next")}
+            {history.length > 0 ? "Playing from queue" : "Up next"}
          </Text>
        </View>
      }
      ListEmptyComponent={
        <View className='flex-1 items-center justify-center py-20'>
-          <Text className='text-neutral-500'>{t("music.queue_empty")}</Text>
+          <Text className='text-neutral-500'>Queue is empty</Text>
        </View>
      }
    />
--- a/app/(auth)/tv-subtitle-modal.tsx
+++ b/app/(auth)/tv-subtitle-modal.tsx
@@ -192,7 +192,6 @@ const SubtitleResultCard = React.forwardRef<
 >(({ result, hasTVPreferredFocus, isDownloading, onPress }, ref) => {
  const { focused, handleFocus, handleBlur, animatedStyle } =
    useTVFocusAnimation({ scaleAmount: 1.03 });
-  const { t } = useTranslation();

  return (
    <Pressable
@@ -329,7 +328,7 @@ const SubtitleResultCard = React.forwardRef<
              ]}
            >
              <Text style={[styles.flagText, { fontSize: scaleSize(10) }]}>
-                {t("player.hash_match")}
+                Hash Match
              </Text>
            </View>
          )}
--- a/app/+not-found.tsx
+++ b/app/+not-found.tsx
@@ -1,20 +1,17 @@
 import { Link, Stack } from "expo-router";
-import { useTranslation } from "react-i18next";
 import { StyleSheet } from "react-native";

 import { ThemedText } from "@/components/ThemedText";
 import { ThemedView } from "@/components/ThemedView";

 export default function NotFoundScreen() {
-  const { t } = useTranslation();
-
  return (
    <>
-      <Stack.Screen options={{ title: t("home.oops") }} />
+      <Stack.Screen options={{ title: "Oops!" }} />
      <ThemedView style={styles.container}>
-        <ThemedText type='title'>{t("not_found.title")}</ThemedText>
+        <ThemedText type='title'>This screen doesn't exist.</ThemedText>
        <Link href={"/home"} style={styles.link}>
-          <ThemedText type='link'>{t("not_found.go_home")}</ThemedText>
+          <ThemedText type='link'>Go to home screen!</ThemedText>
        </Link>
      </ThemedView>
    </>
--- a/components/BitRateSheet.tsx
+++ b/components/BitRateSheet.tsx
@@ -1,4 +1,5 @@
-import { useMemo, useState } from "react";
+import type { BottomSheetModal } from "@gorhom/bottom-sheet";
+import { useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
 import { Text } from "./common/Text";
@@ -61,6 +62,7 @@ export const BitrateSheet: React.FC<Props> = ({
  const isTv = Platform.isTV;
  const { t } = useTranslation();
  const [open, setOpen] = useState(false);
+  const sheetModalRef = useRef<BottomSheetModal | null>(null);

  const sorted = useMemo(() => {
    if (inverted)
@@ -92,7 +94,10 @@ export const BitrateSheet: React.FC<Props> = ({
        </Text>
        <TouchableOpacity
          className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'
-          onPress={() => setOpen(true)}
+          onPress={() => {
+            setOpen(true);
+            sheetModalRef.current?.present();
+          }}
        >
          <Text numberOfLines={1}>
            {BITRATES.find((b) => b.value === selected?.value)?.key}
@@ -103,6 +108,7 @@ export const BitrateSheet: React.FC<Props> = ({
      <FilterSheet
        open={open}
        setOpen={setOpen}
+        modalRef={sheetModalRef}
        title={t("item_card.quality")}
        data={sorted}
        values={selected ? [selected] : []}
--- a/components/MediaSourceSheet.tsx
+++ b/components/MediaSourceSheet.tsx
@@ -1,8 +1,9 @@
+import type { BottomSheetModal } from "@gorhom/bottom-sheet";
 import type {
  BaseItemDto,
  MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
 import { Text } from "./common/Text";
@@ -23,6 +24,7 @@ export const MediaSourceSheet: React.FC<Props> = ({
  const isTv = Platform.isTV;
  const { t } = useTranslation();
  const [open, setOpen] = useState(false);
+  const sheetModalRef = useRef<BottomSheetModal | null>(null);

  const getDisplayName = useCallback((source: MediaSourceInfo) => {
    const videoStream = source.MediaStreams?.find((x) => x.Type === "Video");
@@ -44,7 +46,10 @@ export const MediaSourceSheet: React.FC<Props> = ({
        <Text className='opacity-50 mb-1 text-xs'>{t("item_card.video")}</Text>
        <TouchableOpacity
          className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center'
-          onPress={() => setOpen(true)}
+          onPress={() => {
+            setOpen(true);
+            sheetModalRef.current?.present();
+          }}
        >
          <Text numberOfLines={1}>{selectedName}</Text>
        </TouchableOpacity>
@@ -53,6 +58,7 @@ export const MediaSourceSheet: React.FC<Props> = ({
      <FilterSheet
        open={open}
        setOpen={setOpen}
+        modalRef={sheetModalRef}
        title={t("item_card.video")}
        data={item.MediaSources || []}
        values={selected ? [selected] : []}
--- a/components/PlatformDropdown.tsx
+++ b/components/PlatformDropdown.tsx
@@ -1,7 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
 import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, StyleSheet, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
@@ -210,7 +209,6 @@ const PlatformDropdownComponent = ({
  expoUIConfig,
  bottomSheetConfig,
 }: PlatformDropdownProps) => {
-  const { t } = useTranslation();
  const { showModal, hideModal, isVisible } = useGlobalModal();

  // Handle controlled open state for Android
@@ -382,7 +380,7 @@ const PlatformDropdownComponent = ({

  return (
    <TouchableOpacity onPress={handlePress} activeOpacity={0.7}>
-      {trigger || <Text className='text-white'>{t("common.open_menu")}</Text>}
+      {trigger || <Text className='text-white'>Open Menu</Text>}
    </TouchableOpacity>
  );
 };
--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -502,8 +502,8 @@ export const PlayButton: React.FC<Props> = ({
  return (
    <TouchableOpacity
      disabled={!item}
-      accessibilityLabel={t("accessibility.play_button")}
-      accessibilityHint={t("accessibility.play_hint")}
+      accessibilityLabel='Play button'
+      accessibilityHint='Tap to play the media'
      onPress={onPress}
      className={"relative flex-1"}
    >
--- a/components/PlayButton.tv.tsx
+++ b/components/PlayButton.tv.tsx
@@ -2,7 +2,6 @@ import { Ionicons } from "@expo/vector-icons";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import { useAtom } from "jotai";
 import { useCallback, useEffect } from "react";
-import { useTranslation } from "react-i18next";
 import { TouchableOpacity, View } from "react-native";
 import Animated, {
  Easing,
@@ -37,7 +36,6 @@ export const PlayButton: React.FC<Props> = ({
  colors,
  ...props
 }: Props) => {
-  const { t } = useTranslation();
  const [globalColorAtom] = useAtom(itemThemeColorAtom);

  // Use colors prop if provided, otherwise fallback to global atom
@@ -170,8 +168,8 @@ export const PlayButton: React.FC<Props> = ({

  return (
    <TouchableOpacity
-      accessibilityLabel={t("accessibility.play_button")}
-      accessibilityHint={t("accessibility.play_hint")}
+      accessibilityLabel='Play button'
+      accessibilityHint='Tap to play the media'
      onPress={onPress}
      className={"relative"}
      {...props}
--- a/components/PlayInRemoteSession.tsx
+++ b/components/PlayInRemoteSession.tsx
@@ -6,7 +6,6 @@ import {
 import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
 import { useAtomValue } from "jotai";
 import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
 import {
  FlatList,
  Modal,
@@ -32,7 +31,6 @@ export const PlayInRemoteSessionButton: React.FC<Props> = ({
  const [modalVisible, setModalVisible] = useState(false);
  const api = useAtomValue(apiAtom);
  const { sessions, isLoading } = useAllSessions({} as useSessionsProps);
-  const { t } = useTranslation();
  const handlePlayInSession = async (sessionId: string) => {
    if (!api || !item.Id) return;

@@ -67,9 +65,7 @@ export const PlayInRemoteSessionButton: React.FC<Props> = ({
        <View style={styles.centeredView}>
          <View style={styles.modalView}>
            <View style={styles.modalHeader}>
-              <Text style={styles.modalTitle}>
-                {t("home.sessions.select_session")}
-              </Text>
+              <Text style={styles.modalTitle}>Select Session</Text>
              <TouchableOpacity onPress={() => setModalVisible(false)}>
                <Ionicons name='close' size={24} color='white' />
              </TouchableOpacity>
@@ -82,7 +78,7 @@ export const PlayInRemoteSessionButton: React.FC<Props> = ({
                </View>
              ) : !sessions || sessions.length === 0 ? (
                <Text style={styles.noSessionsText}>
-                  {t("home.sessions.no_active_sessions")}
+                  No active sessions found
                </Text>
              ) : (
                <FlatList
@@ -102,7 +98,7 @@ export const PlayInRemoteSessionButton: React.FC<Props> = ({
                        </Text>
                        {session.NowPlayingItem && (
                          <Text style={styles.nowPlaying} numberOfLines={1}>
-                            {t("home.sessions.now_playing")}{" "}
+                            Now playing:{" "}
                            {session.NowPlayingItem.SeriesName
                              ? `${session.NowPlayingItem.SeriesName} :`
                              : ""}
--- a/components/downloads/DownloadCard.tsx
+++ b/components/downloads/DownloadCard.tsx
@@ -1,7 +1,7 @@
 import { Ionicons } from "@expo/vector-icons";
 import { Image } from "expo-image";
+import { t } from "i18next";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
 import {
  ActivityIndicator,
  TouchableOpacity,
@@ -35,7 +35,6 @@ interface DownloadCardProps extends TouchableOpacityProps {
 }

 export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
-  const { t } = useTranslation();
  const { cancelDownload } = useDownload();
  const router = useRouter();
  const queryClient = useNetworkAwareQueryClient();
@@ -174,9 +173,7 @@ export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {

            {isTranscoding && (
              <View className='bg-purple-600/20 px-2 py-0.5 rounded-md mt-1 self-start'>
-                <Text className='text-xs text-purple-400'>
-                  {t("home.downloads.transcoding")}
-                </Text>
+                <Text className='text-xs text-purple-400'>Transcoding</Text>
              </View>
            )}

--- a/components/filters/FilterButton.tsx
+++ b/components/filters/FilterButton.tsx
@@ -1,9 +1,11 @@
 import { FontAwesome, Ionicons } from "@expo/vector-icons";
+import type { BottomSheetModal } from "@gorhom/bottom-sheet";
 import { useQuery } from "@tanstack/react-query";
-import { useState } from "react";
+import { useCallback, useRef, useState } from "react";
 import { TouchableOpacity, View, type ViewProps } from "react-native";
 import { Text } from "@/components/common/Text";
 import { FilterSheet } from "./FilterSheet";
+import { useFilterSheet } from "./FilterSheetProvider";

 interface FilterButtonProps<T> extends ViewProps {
  id: string;
@@ -33,22 +35,63 @@ export const FilterButton = <T,>({
  icon = "filter",
  ...props
 }: FilterButtonProps<T>) => {
-  const [open, setOpen] = useState(false);
+  // When a FilterSheetProvider is present (library / collections), all buttons
+  // share one sheet so two can never stack. Outside a provider (e.g. logs,
+  // discover), fall back to this button's own standalone sheet.
+  const shared = useFilterSheet();

-  const { data: filters } = useQuery<T[]>({
+  const { data: filters, isLoading } = useQuery<T[]>({
    queryKey: ["filters", title, queryKey, id],
    queryFn,
    staleTime: 0,
    enabled: !!id && !!queryFn && !!queryKey,
  });

+  // Standalone-mode state (unused in shared mode).
+  const [open, setOpen] = useState(false);
+  const sheetModalRef = useRef<BottomSheetModal | null>(null);
+
+  const onButtonPress = useCallback(() => {
+    if (shared) {
+      shared.openFilter({
+        key: `${id}:${queryKey}`,
+        id,
+        queryKey,
+        queryFn,
+        title,
+        values: values as unknown[],
+        set: set as (value: unknown[]) => void,
+        renderItemLabel: renderItemLabel as (item: unknown) => React.ReactNode,
+        searchFilter: searchFilter as
+          | ((item: unknown, query: string) => boolean)
+          | undefined,
+        disableSearch,
+        multiple,
+      });
+      return;
+    }
+    // present() must run from the press handler: from an effect after a state
+    // update it silently no-ops on the new architecture and the sheet never
+    // appears.
+    setOpen(true);
+    sheetModalRef.current?.present();
+  }, [
+    shared,
+    id,
+    queryKey,
+    queryFn,
+    title,
+    values,
+    set,
+    renderItemLabel,
+    searchFilter,
+    disableSearch,
+    multiple,
+  ]);
+
  return (
    <>
-      <TouchableOpacity
-        onPress={() => {
-          filters?.length && setOpen(true);
-        }}
-      >
+      <TouchableOpacity onPress={onButtonPress}>
        <View
          className={`
            px-3 py-1.5 rounded-full flex flex-row items-center space-x-1
@@ -85,18 +128,22 @@ export const FilterButton = <T,>({
          )}
        </View>
      </TouchableOpacity>
-      <FilterSheet<T>
-        title={title}
-        open={open}
-        setOpen={setOpen}
-        data={filters}
-        values={values}
-        set={set}
-        renderItemLabel={renderItemLabel}
-        searchFilter={searchFilter}
-        disableSearch={disableSearch}
-        multiple={multiple}
-      />
+      {!shared && (
+        <FilterSheet<T>
+          title={title}
+          open={open}
+          setOpen={setOpen}
+          modalRef={sheetModalRef}
+          loading={isLoading}
+          data={filters}
+          values={values}
+          set={set}
+          renderItemLabel={renderItemLabel}
+          searchFilter={searchFilter}
+          disableSearch={disableSearch}
+          multiple={multiple}
+        />
+      )}
    </>
  );
 };
--- a/components/filters/FilterSheet.tsx
+++ b/components/filters/FilterSheet.tsx
@@ -7,7 +7,14 @@ import {
 } from "@gorhom/bottom-sheet";
 import { isEqual } from "lodash";
 import type React from "react";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+  useCallback,
+  useDeferredValue,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import { useTranslation } from "react-i18next";
 import {
  StyleSheet,
@@ -19,11 +26,21 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { Button } from "../Button";
 import { Input } from "../common/Input";
+import { Loader } from "../Loader";

 interface Props<T> extends ViewProps {
  open: boolean;
  setOpen: (open: boolean) => void;
+  /**
+   * Modal ref the opener must use to present() the sheet from inside its
+   * press handler. On the new architecture with Reanimated 4, present()
+   * called from an effect after a state update silently no-ops — the sheet
+   * mounts nothing. Presenting straight from the gesture handler works.
+   */
+  modalRef: React.RefObject<BottomSheetModal | null>;
  data?: T[] | null;
+  /** True while the options are loading — shows a loader inside the sheet. */
+  loading?: boolean;
  values: T[];
  set: (value: T[]) => void;
  title: string;
@@ -66,16 +83,18 @@ const LIMIT = 100;
 export const FilterSheet = <T,>({
  values,
  data: _data,
+  loading = false,
  open,
  set,
  setOpen,
+  modalRef,
  title,
  searchFilter,
  renderItemLabel,
  disableSearch = false,
  multiple = false,
 }: Props<T>) => {
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
+  const bottomSheetModalRef = modalRef;
  const snapPoints = useMemo(() => ["85%"], []);
  const { t } = useTranslation();
  const insets = useSafeAreaInsets();
@@ -84,19 +103,24 @@ export const FilterSheet = <T,>({
  const [offset, setOffset] = useState<number>(0);

  const [search, setSearch] = useState<string>("");
+  // Filtering and re-rendering the option list on every keystroke blocks the
+  // JS thread on large lists (2000+ tags); the controlled input then snaps the
+  // native text back to a stale value (lost/reappearing letters). Deferring the
+  // value keeps the keystroke render cheap and runs the list update after.
+  const deferredSearch = useDeferredValue(search);

  const [showSearch, setShowSearch] = useState<boolean>(false);

  const filteredData = useMemo(() => {
-    if (!search) return _data;
+    if (!deferredSearch) return _data;
    const results = [];
    for (let i = 0; i < (_data?.length || 0); i++) {
-      if (_data && searchFilter?.(_data[i], search)) {
+      if (_data && searchFilter?.(_data[i], deferredSearch)) {
        results.push(_data[i]);
      }
    }
    return results.slice(0, 100);
-  }, [search, _data, searchFilter]);
+  }, [deferredSearch, _data, searchFilter]);

  useEffect(() => {
    if (!data || data.length === 0 || disableSearch) return;
@@ -127,21 +151,28 @@ export const FilterSheet = <T,>({
    setData(newData);
  }, [offset, _data]);

+  // Opening is imperative (see the modalRef prop); this effect only closes.
+  // It also never calls dismiss() on a modal that was never presented.
+  const wasPresentedRef = useRef(false);
  useEffect(() => {
-    if (open) bottomSheetModalRef.current?.present();
-    else bottomSheetModalRef.current?.dismiss();
+    if (!open && wasPresentedRef.current) {
+      bottomSheetModalRef.current?.dismiss();
+    }
  }, [open]);

  const handleSheetChanges = useCallback((index: number) => {
-    if (index === -1) {
+    if (index >= 0) {
+      wasPresentedRef.current = true;
+    } else if (index === -1) {
+      wasPresentedRef.current = false;
      setOpen(false);
    }
  }, []);

  const renderData = useMemo(() => {
-    if (search.length > 0 && showSearch) return filteredData;
+    if (deferredSearch.length > 0 && showSearch) return filteredData;
    return data;
-  }, [search, filteredData, data]);
+  }, [deferredSearch, showSearch, filteredData, data]);

  const renderBackdrop = useCallback(
    (props: BottomSheetBackdropProps) => (
@@ -154,6 +185,54 @@ export const FilterSheet = <T,>({
    [],
  );

+  // Memoized so typing in the search input (urgent render with an unchanged
+  // deferred value) doesn't rebuild up to 100 row elements per keystroke.
+  const renderedRows = useMemo(
+    () =>
+      renderData?.map((item, index) => (
+        <View key={index}>
+          <TouchableOpacity
+            onPress={() => {
+              // Match the deep-equality rule used to render the selected
+              // state below — option objects are recreated across renders,
+              // so reference checks would re-add an already selected item.
+              const isSelected = values.some((value) => isEqual(value, item));
+              if (multiple) {
+                if (!isSelected) set(values.concat(item));
+                else set(values.filter((value) => !isEqual(value, item)));
+
+                setTimeout(() => {
+                  setOpen(false);
+                }, 250);
+              } else {
+                if (!isSelected) {
+                  set([item]);
+                  setTimeout(() => {
+                    setOpen(false);
+                  }, 250);
+                }
+              }
+            }}
+            className=' bg-neutral-800 px-4 py-3 flex flex-row items-center justify-between'
+          >
+            <Text className='flex shrink'>{renderItemLabel(item)}</Text>
+            {values.some((i) => isEqual(i, item)) ? (
+              <Ionicons name='radio-button-on' size={24} color='white' />
+            ) : (
+              <Ionicons name='radio-button-off' size={24} color='white' />
+            )}
+          </TouchableOpacity>
+          <View
+            style={{
+              height: StyleSheet.hairlineWidth,
+            }}
+            className='h-1 divide-neutral-700 '
+          />
+        </View>
+      )),
+    [renderData, values, multiple, set, setOpen, renderItemLabel],
+  );
+
  return (
    <BottomSheetModal
      ref={bottomSheetModalRef}
@@ -182,9 +261,15 @@ export const FilterSheet = <T,>({
          }}
        >
          <Text className='font-bold text-2xl'>{title}</Text>
-          <Text className='mb-2 text-neutral-500'>
-            {t("search.x_items", { count: _data?.length })}
-          </Text>
+          {loading ? (
+            <View className='my-8 flex items-center justify-center'>
+              <Loader />
+            </View>
+          ) : (
+            <Text className='mb-2 text-neutral-500'>
+              {t("search.x_items", { count: _data?.length })}
+            </Text>
+          )}
          {showSearch && (
            <Input
              placeholder={t("search.search")}
@@ -203,43 +288,7 @@ export const FilterSheet = <T,>({
            }}
            className='mb-4 flex flex-col rounded-xl overflow-hidden'
          >
-            {renderData?.map((item, index) => (
-              <View key={index}>
-                <TouchableOpacity
-                  onPress={() => {
-                    if (multiple) {
-                      if (!values.includes(item)) set(values.concat(item));
-                      else set(values.filter((v) => v !== item));
-
-                      setTimeout(() => {
-                        setOpen(false);
-                      }, 250);
-                    } else {
-                      if (!values.includes(item)) {
-                        set([item]);
-                        setTimeout(() => {
-                          setOpen(false);
-                        }, 250);
-                      }
-                    }
-                  }}
-                  className=' bg-neutral-800 px-4 py-3 flex flex-row items-center justify-between'
-                >
-                  <Text className='flex shrink'>{renderItemLabel(item)}</Text>
-                  {values.some((i) => isEqual(i, item)) ? (
-                    <Ionicons name='radio-button-on' size={24} color='white' />
-                  ) : (
-                    <Ionicons name='radio-button-off' size={24} color='white' />
-                  )}
-                </TouchableOpacity>
-                <View
-                  style={{
-                    height: StyleSheet.hairlineWidth,
-                  }}
-                  className='h-1 divide-neutral-700 '
-                />
-              </View>
-            ))}
+            {renderedRows}
          </View>
          {data.length < (_data?.length || 0) && (
            <Button
--- a/components/filters/FilterSheetProvider.tsx
+++ b/components/filters/FilterSheetProvider.tsx
@@ -0,0 +1,74 @@
+import type { BottomSheetModal } from "@gorhom/bottom-sheet";
+import {
+  createContext,
+  type PropsWithChildren,
+  useCallback,
+  useContext,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { type FilterConfig, SharedFilterSheet } from "./SharedFilterSheet";
+
+interface FilterSheetContextType {
+  openFilter: (config: FilterConfig) => void;
+}
+
+const FilterSheetContext = createContext<FilterSheetContextType | null>(null);
+
+/**
+ * Returns the shared-sheet controller, or null when rendered outside a
+ * FilterSheetProvider — FilterButton then falls back to its own standalone
+ * sheet (used by screens that don't host a provider, e.g. logs / discover).
+ */
+export const useFilterSheet = (): FilterSheetContextType | null =>
+  useContext(FilterSheetContext);
+
+/**
+ * Hosts the single shared filter sheet for a screen. Every FilterButton under
+ * it calls openFilter() to show its options in that one sheet — so two sheets
+ * can never stack regardless of how fast the buttons are tapped. present() runs
+ * synchronously from the button's press handler (the modal is always mounted).
+ */
+export const FilterSheetProvider: React.FC<PropsWithChildren> = ({
+  children,
+}) => {
+  const modalRef = useRef<BottomSheetModal | null>(null);
+  const [open, setOpen] = useState(false);
+  const [config, setConfig] = useState<FilterConfig | null>(null);
+
+  // First-wins guard. With a single shared sheet there is exactly one source of
+  // truth (this ref) reset on the one close path — so unlike a per-button guard
+  // it can't get stuck on remounts or multiple instances. A second tap during
+  // the first sheet's open animation is ignored; the first tapped filter wins.
+  const openRef = useRef(false);
+
+  const openFilter = useCallback((next: FilterConfig) => {
+    if (openRef.current) return;
+    openRef.current = true;
+    setConfig(next);
+    setOpen(true);
+    modalRef.current?.present();
+  }, []);
+
+  // Single close path for every dismissal (select / swipe / backdrop) — frees
+  // the guard reliably.
+  const closeSheet = useCallback(() => {
+    openRef.current = false;
+    setOpen(false);
+  }, []);
+
+  const value = useMemo(() => ({ openFilter }), [openFilter]);
+
+  return (
+    <FilterSheetContext.Provider value={value}>
+      {children}
+      <SharedFilterSheet
+        modalRef={modalRef}
+        open={open}
+        setOpen={closeSheet}
+        config={config}
+      />
+    </FilterSheetContext.Provider>
+  );
+};
--- a/components/filters/ResetFiltersButton.tsx
+++ b/components/filters/ResetFiltersButton.tsx
@@ -1,38 +1,24 @@
 import { Ionicons } from "@expo/vector-icons";
-import { useAtom } from "jotai";
 import { TouchableOpacity, type TouchableOpacityProps } from "react-native";
-import {
-  filterByAtom,
-  genreFilterAtom,
-  tagsFilterAtom,
-  yearFilterAtom,
-} from "@/utils/atoms/filters";
+import { useFilterReset } from "@/hooks/useFilterReset";

-interface Props extends TouchableOpacityProps {}
+interface Props extends TouchableOpacityProps {
+  libraryId: string;
+}

-export const ResetFiltersButton: React.FC<Props> = ({ ...props }) => {
-  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
-  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
-  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
-  const [selectedFilters, setSelectedFilters] = useAtom(filterByAtom);
+export const ResetFiltersButton: React.FC<Props> = ({
+  libraryId,
+  ...props
+}) => {
+  const { hasActiveFilters, resetAllFilters } = useFilterReset(libraryId);

-  if (
-    selectedGenres.length === 0 &&
-    selectedTags.length === 0 &&
-    selectedYears.length === 0 &&
-    selectedFilters.length === 0
-  ) {
+  if (!hasActiveFilters) {
    return null;
  }

  return (
    <TouchableOpacity
-      onPress={() => {
-        setSelectedGenres([]);
-        setSelectedTags([]);
-        setSelectedYears([]);
-        setSelectedFilters([]);
-      }}
+      onPress={resetAllFilters}
      className='bg-purple-600 rounded-full w-[30px] h-[30px] flex items-center justify-center mr-1'
      {...props}
    >
--- a/components/filters/SharedFilterSheet.tsx
+++ b/components/filters/SharedFilterSheet.tsx
@@ -0,0 +1,286 @@
+import { Ionicons } from "@expo/vector-icons";
+import {
+  BottomSheetBackdrop,
+  type BottomSheetBackdropProps,
+  BottomSheetModal,
+  BottomSheetScrollView,
+} from "@gorhom/bottom-sheet";
+import { useQuery } from "@tanstack/react-query";
+import { isEqual } from "lodash";
+import type React from "react";
+import {
+  useCallback,
+  useDeferredValue,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { useTranslation } from "react-i18next";
+import { StyleSheet, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Text } from "@/components/common/Text";
+import { Button } from "../Button";
+import { Input } from "../common/Input";
+import { Loader } from "../Loader";
+
+/**
+ * Config for the filter currently shown by the shared sheet. Generics are erased
+ * at the FilterButton → provider boundary, so item-typed callbacks use `any`.
+ */
+export interface FilterConfig {
+  /** Stable identity — changing it remounts the content with fresh state. */
+  key: string;
+  id: string;
+  queryKey: string;
+  queryFn: (params: any) => Promise<any>;
+  title: string;
+  values: any[];
+  set: (value: any[]) => void;
+  renderItemLabel: (item: any) => React.ReactNode;
+  searchFilter?: (item: any, query: string) => boolean;
+  disableSearch?: boolean;
+  multiple?: boolean;
+}
+
+const LIMIT = 100;
+
+interface SharedFilterSheetProps {
+  modalRef: React.RefObject<BottomSheetModal | null>;
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  config: FilterConfig | null;
+}
+
+/**
+ * The single shared filter sheet — one BottomSheetModal hosted by
+ * FilterSheetProvider for a whole screen; FilterButtons only swap its `config`.
+ * Because only one modal ever exists, rapid taps across buttons can never stack
+ * two sheets, so no guard/timer is needed. The modal shell stays mounted with a
+ * stable ref (present() can run synchronously from the tapping button); the
+ * inner content is keyed by the active filter so its pagination/search reset
+ * cleanly between filters.
+ */
+export const SharedFilterSheet: React.FC<SharedFilterSheetProps> = ({
+  modalRef,
+  open,
+  setOpen,
+  config,
+}) => {
+  const snapPoints = useMemo(() => ["85%"], []);
+  const insets = useSafeAreaInsets();
+
+  // Opening is imperative (the provider calls present()); this effect only
+  // closes, and never dismisses a modal that was never presented.
+  const wasPresentedRef = useRef(false);
+  useEffect(() => {
+    if (!open && wasPresentedRef.current) {
+      modalRef.current?.dismiss();
+    }
+  }, [open, modalRef]);
+
+  const handleSheetChanges = useCallback(
+    (index: number) => {
+      if (index >= 0) {
+        wasPresentedRef.current = true;
+      } else if (index === -1) {
+        wasPresentedRef.current = false;
+        setOpen(false);
+      }
+    },
+    [setOpen],
+  );
+
+  const requestClose = useCallback(() => setOpen(false), [setOpen]);
+
+  const renderBackdrop = useCallback(
+    (props: BottomSheetBackdropProps) => (
+      <BottomSheetBackdrop
+        {...props}
+        disappearsOnIndex={-1}
+        appearsOnIndex={0}
+      />
+    ),
+    [],
+  );
+
+  return (
+    <BottomSheetModal
+      ref={modalRef}
+      index={0}
+      snapPoints={snapPoints}
+      onChange={handleSheetChanges}
+      backdropComponent={renderBackdrop}
+      handleIndicatorStyle={{ backgroundColor: "white" }}
+      backgroundStyle={{ backgroundColor: "#171717" }}
+    >
+      <BottomSheetScrollView style={{ flex: 1 }}>
+        <View
+          className='mt-2 mb-8'
+          style={{
+            paddingLeft: Math.max(16, insets.left),
+            paddingRight: Math.max(16, insets.right),
+          }}
+        >
+          {config && (
+            <SharedFilterSheetContent
+              key={config.key}
+              config={config}
+              onRequestClose={requestClose}
+            />
+          )}
+        </View>
+      </BottomSheetScrollView>
+    </BottomSheetModal>
+  );
+};
+
+interface SharedFilterSheetContentProps {
+  config: FilterConfig;
+  onRequestClose: () => void;
+}
+
+const SharedFilterSheetContent: React.FC<SharedFilterSheetContentProps> = ({
+  config,
+  onRequestClose,
+}) => {
+  const {
+    id,
+    queryKey,
+    queryFn,
+    title,
+    values,
+    set,
+    renderItemLabel,
+    searchFilter,
+    disableSearch = false,
+    multiple = false,
+  } = config;
+  const { t } = useTranslation();
+
+  // The options query lives here (deduped with the FilterButton's own query via
+  // the shared React Query key), so the list stays live after the sheet opens.
+  const { data: _data, isLoading: loading } = useQuery<any[]>({
+    queryKey: ["filters", title, queryKey, id],
+    queryFn,
+    staleTime: 0,
+    enabled: !!id && !!queryFn && !!queryKey,
+  });
+
+  const [data, setData] = useState<any[]>([]);
+  const [offset, setOffset] = useState(0);
+
+  const [search, setSearch] = useState("");
+  // Filtering on every keystroke blocks the JS thread on large lists; defer the
+  // value so the keystroke render stays cheap and the list update runs after.
+  const deferredSearch = useDeferredValue(search);
+  const [showSearch, setShowSearch] = useState(false);
+
+  const filteredData = useMemo(() => {
+    if (!deferredSearch) return _data;
+    const results = [];
+    for (let i = 0; i < (_data?.length || 0); i++) {
+      if (_data && searchFilter?.(_data[i], deferredSearch)) {
+        results.push(_data[i]);
+      }
+    }
+    return results.slice(0, 100);
+  }, [deferredSearch, _data, searchFilter]);
+
+  useEffect(() => {
+    if (!data || data.length === 0 || disableSearch) return;
+    if (data.length > 15) {
+      setShowSearch(true);
+    }
+  }, [data, disableSearch]);
+
+  // Loads data in batches of LIMIT from offset (efficient "load more").
+  useEffect(() => {
+    if (!_data || _data.length === 0) return;
+
+    const newData = [...data];
+    for (let i = offset; i < Math.min(_data.length, offset + LIMIT); i++) {
+      const item = _data[i];
+      // Option objects are recreated across renders → dedupe by value.
+      const exists = newData.some((existingItem) =>
+        isEqual(existingItem, item),
+      );
+      if (!exists) {
+        newData.push(item);
+      }
+    }
+    setData(newData);
+  }, [offset, _data]);
+
+  const renderData = useMemo(() => {
+    if (deferredSearch.length > 0 && showSearch) return filteredData;
+    return data;
+  }, [deferredSearch, showSearch, filteredData, data]);
+
+  const renderedRows = useMemo(
+    () =>
+      renderData?.map((item, index) => (
+        <View key={index}>
+          <TouchableOpacity
+            onPress={() => {
+              const isSelected = values.some((value) => isEqual(value, item));
+              if (multiple) {
+                if (!isSelected) set(values.concat(item));
+                else set(values.filter((value) => !isEqual(value, item)));
+                setTimeout(() => onRequestClose(), 250);
+              } else if (!isSelected) {
+                set([item]);
+                setTimeout(() => onRequestClose(), 250);
+              }
+            }}
+            className='bg-neutral-800 px-4 py-3 flex flex-row items-center justify-between'
+          >
+            <Text className='flex shrink'>{renderItemLabel(item)}</Text>
+            {values.some((i) => isEqual(i, item)) ? (
+              <Ionicons name='radio-button-on' size={24} color='white' />
+            ) : (
+              <Ionicons name='radio-button-off' size={24} color='white' />
+            )}
+          </TouchableOpacity>
+          <View
+            style={{ height: StyleSheet.hairlineWidth }}
+            className='h-1 divide-neutral-700'
+          />
+        </View>
+      )),
+    [renderData, values, multiple, set, renderItemLabel, onRequestClose],
+  );
+
+  return (
+    <>
+      <Text className='font-bold text-2xl'>{title}</Text>
+      {loading ? (
+        <View className='my-8 flex items-center justify-center'>
+          <Loader />
+        </View>
+      ) : (
+        <Text className='mb-2 text-neutral-500'>
+          {t("search.x_items", { count: _data?.length })}
+        </Text>
+      )}
+      {showSearch && (
+        <Input
+          placeholder={t("search.search")}
+          className='my-2 border-neutral-800 border'
+          value={search}
+          onChangeText={setSearch}
+          returnKeyType='done'
+        />
+      )}
+      <View
+        style={{ borderRadius: 20, overflow: "hidden" }}
+        className='mb-4 flex flex-col rounded-xl overflow-hidden'
+      >
+        {renderedRows}
+      </View>
+      {data.length < (_data?.length || 0) && (
+        <Button onPress={() => setOffset(offset + LIMIT)}>Load more</Button>
+      )}
+    </>
+  );
+};
--- a/components/livetv/TVGuideProgramCell.tsx
+++ b/components/livetv/TVGuideProgramCell.tsx
@@ -1,6 +1,5 @@
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import React from "react";
-import { useTranslation } from "react-i18next";
 import { Animated, Pressable, StyleSheet, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
@@ -23,7 +22,6 @@ export const TVGuideProgramCell: React.FC<TVGuideProgramCellProps> = ({
  disabled = false,
  refSetter,
 }) => {
-  const { t } = useTranslation();
  const typography = useScaledTVTypography();
  const { focused, handleFocus, handleBlur } = useTVFocusAnimation({
    scaleAmount: 1,
@@ -70,7 +68,7 @@ export const TVGuideProgramCell: React.FC<TVGuideProgramCellProps> = ({
            <Text
              style={[styles.liveBadgeText, { fontSize: typography.callout }]}
            >
-              {t("player.live")}
+              LIVE
            </Text>
          </View>
        )}
--- a/components/livetv/TVLiveTVPage.tsx
+++ b/components/livetv/TVLiveTVPage.tsx
@@ -235,7 +235,7 @@ export const TVLiveTVPage: React.FC = () => {
            marginBottom: 24,
          }}
        >
-          {t("live_tv.title")}
+          Live TV
        </Text>

        {/* Tab Bar */}
--- a/components/search/TVSearchTabBadges.tsx
+++ b/components/search/TVSearchTabBadges.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import { useTranslation } from "react-i18next";
 import { Animated, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
@@ -89,8 +88,6 @@ export const TVSearchTabBadges: React.FC<TVSearchTabBadgesProps> = ({
  showDiscover,
  disabled = false,
 }) => {
-  const { t } = useTranslation();
-
  if (!showDiscover) {
    return null;
  }
@@ -104,13 +101,13 @@ export const TVSearchTabBadges: React.FC<TVSearchTabBadgesProps> = ({
      }}
    >
      <TVSearchTabBadge
-        label={t("search.library")}
+        label='Library'
        isSelected={searchType === "Library"}
        onPress={() => setSearchType("Library")}
        disabled={disabled}
      />
      <TVSearchTabBadge
-        label={t("search.discover")}
+        label='Discover'
        isSelected={searchType === "Discover"}
        onPress={() => setSearchType("Discover")}
        disabled={disabled}
--- a/components/settings/MpvSubtitleSettings.tsx
+++ b/components/settings/MpvSubtitleSettings.tsx
@@ -1,6 +1,5 @@
 import { Ionicons } from "@expo/vector-icons";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, Switch, View, type ViewProps } from "react-native";
 import { Stepper } from "@/components/inputs/Stepper";
 import { Text } from "../common/Text";
@@ -18,21 +17,20 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
  const isTv = Platform.isTV;
  const media = useMedia();
  const { settings, updateSettings } = media;
-  const { t } = useTranslation();

  const alignXOptions: AlignX[] = ["left", "center", "right"];
  const alignYOptions: AlignY[] = ["top", "center", "bottom"];

  const alignXLabels: Record<AlignX, string> = {
-    left: t("home.settings.subtitles.align.left"),
-    center: t("home.settings.subtitles.align.center"),
-    right: t("home.settings.subtitles.align.right"),
+    left: "Left",
+    center: "Center",
+    right: "Right",
  };

  const alignYLabels: Record<AlignY, string> = {
-    top: t("home.settings.subtitles.align.top"),
-    center: t("home.settings.subtitles.align.center"),
-    bottom: t("home.settings.subtitles.align.bottom"),
+    top: "Top",
+    center: "Center",
+    bottom: "Bottom",
  };

  const alignXOptionGroups = useMemo(() => {
@@ -62,18 +60,16 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
  return (
    <View {...props}>
      <ListGroup
-        title={t("home.settings.subtitles.mpv_settings_title")}
+        title='MPV Subtitle Settings'
        description={
          <Text className='text-[#8E8D91] text-xs'>
-            {t("home.settings.subtitles.mpv_settings_description")}
+            Advanced subtitle customization for MPV player
          </Text>
        }
      >
        {!isTv && (
          <>
-            <ListItem
-              title={t("home.settings.subtitles.mpv_subtitle_margin_y")}
-            >
+            <ListItem title='Vertical Margin'>
              <Stepper
                value={settings.mpvSubtitleMarginY ?? 0}
                step={5}
@@ -85,7 +81,7 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
              />
            </ListItem>

-            <ListItem title={t("home.settings.subtitles.mpv_subtitle_align_x")}>
+            <ListItem title='Horizontal Alignment'>
              <PlatformDropdown
                groups={alignXOptionGroups}
                trigger={
@@ -100,11 +96,11 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
                    />
                  </View>
                }
-                title={t("home.settings.subtitles.mpv_subtitle_align_x")}
+                title='Horizontal Alignment'
              />
            </ListItem>

-            <ListItem title={t("home.settings.subtitles.mpv_subtitle_align_y")}>
+            <ListItem title='Vertical Alignment'>
              <PlatformDropdown
                groups={alignYOptionGroups}
                trigger={
@@ -119,13 +115,13 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
                    />
                  </View>
                }
-                title={t("home.settings.subtitles.mpv_subtitle_align_y")}
+                title='Vertical Alignment'
              />
            </ListItem>
          </>
        )}

-        <ListItem title={t("home.settings.subtitles.opaque_background")}>
+        <ListItem title='Opaque Background'>
          <Switch
            value={settings.mpvSubtitleBackgroundEnabled ?? false}
            onValueChange={(value) =>
@@ -135,7 +131,7 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
        </ListItem>

        {settings.mpvSubtitleBackgroundEnabled && (
-          <ListItem title={t("home.settings.subtitles.background_opacity")}>
+          <ListItem title='Background Opacity'>
            <Stepper
              value={settings.mpvSubtitleBackgroundOpacity ?? 75}
              step={5}
--- a/components/tv/TVSubtitleResultCard.tsx
+++ b/components/tv/TVSubtitleResultCard.tsx
@@ -1,6 +1,5 @@
 import { Ionicons } from "@expo/vector-icons";
 import React from "react";
-import { useTranslation } from "react-i18next";
 import {
  ActivityIndicator,
  Animated,
@@ -29,7 +28,6 @@ export const TVSubtitleResultCard = React.forwardRef<
  const styles = createStyles(typography);
  const { focused, handleFocus, handleBlur, animatedStyle } =
    useTVFocusAnimation({ scaleAmount: 1.03 });
-  const { t } = useTranslation();

  return (
    <Pressable
@@ -154,7 +152,7 @@ export const TVSubtitleResultCard = React.forwardRef<
                },
              ]}
            >
-              <Text style={styles.flagText}>{t("player.hash_match")}</Text>
+              <Text style={styles.flagText}>Hash Match</Text>
            </View>
          )}
          {result.hearingImpaired && (
--- a/components/video-player/controls/BottomControls.tsx
+++ b/components/video-player/controls/BottomControls.tsx
@@ -183,7 +183,7 @@ export const BottomControls: FC<BottomControlsProps> = ({
          <SkipButton
            showButton={showSkipButton}
            onPress={skipIntro}
-            buttonText={t("player.skip_intro")}
+            buttonText='Skip Intro'
          />
          {/* Smart Skip Credits behavior:
              - Show "Skip Credits" if there's content after credits OR no next episode
@@ -193,7 +193,7 @@ export const BottomControls: FC<BottomControlsProps> = ({
              showSkipCreditButton && (hasContentAfterCredits || !nextItem)
            }
            onPress={skipCredit}
-            buttonText={t("player.skip_credits")}
+            buttonText='Skip Credits'
          />
          {settings.autoPlayNextEpisode !== false &&
            (settings.maxAutoPlayEpisodeCount.value === -1 ||
--- a/components/video-player/controls/ContinueWatchingOverlay.tsx
+++ b/components/video-player/controls/ContinueWatchingOverlay.tsx
@@ -27,7 +27,7 @@ const ContinueWatchingOverlay: React.FC<ContinueWatchingOverlayProps> = ({
      }
    >
      <Text className='text-2xl font-bold text-white py-4 '>
-        {t("player.still_watching")}
+        Are you still watching ?
      </Text>
      <Button
        onPress={() => {
--- a/components/video-player/controls/HeaderControls.tsx
+++ b/components/video-player/controls/HeaderControls.tsx
@@ -4,7 +4,6 @@ import type {
  MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client";
 import { type FC, useCallback, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
 import useRouter from "@/hooks/useAppRouter";
 import { useControlsSafeAreaInsets } from "@/hooks/useControlsSafeAreaInsets";
@@ -58,7 +57,6 @@ export const HeaderControls: FC<HeaderControlsProps> = ({
  showTechnicalInfo = false,
  onToggleTechnicalInfo,
 }) => {
-  const { t } = useTranslation();
  const router = useRouter();
  const insets = useControlsSafeAreaInsets();
  const lightHapticFeedback = useHaptic("light");
@@ -129,8 +127,8 @@ export const HeaderControls: FC<HeaderControlsProps> = ({
            onPress={toggleOrientation}
            disabled={isTogglingOrientation}
            className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
-            accessibilityLabel={t("accessibility.toggle_orientation")}
-            accessibilityHint={t("accessibility.toggle_orientation_hint")}
+            accessibilityLabel='Toggle screen orientation'
+            accessibilityHint='Toggles the screen orientation between portrait and landscape'
          >
            <MaterialIcons
              name='screen-rotation'
--- a/components/video-player/controls/TechnicalInfoOverlay.tsx
+++ b/components/video-player/controls/TechnicalInfoOverlay.tsx
@@ -7,7 +7,6 @@ import {
  useMemo,
  useState,
 } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, StyleSheet, Text, View } from "react-native";
 import Animated, {
  Easing,
@@ -185,7 +184,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
    currentAudioIndex,
  }) => {
    const typography = useScaledTVTypography();
-    const { t } = useTranslation();
    const insets = useSafeAreaInsets();
    const safeInsets = useControlsSafeAreaInsets();
    const [info, setInfo] = useState<TechnicalInfo | null>(null);
@@ -314,13 +312,13 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          )}
          {info?.videoCodec && (
            <Text style={textStyle}>
-              {t("player.technical_info.video")} {formatCodec(info.videoCodec)}
+              Video: {formatCodec(info.videoCodec)}
              {info.fps ? ` @ ${formatFps(info.fps)} fps` : ""}
            </Text>
          )}
          {info?.audioCodec && (
            <Text style={textStyle}>
-              {t("player.technical_info.audio")} {formatCodec(info.audioCodec)}
+              Audio: {formatCodec(info.audioCodec)}
              {streamInfo?.audioChannels
                ? ` ${formatAudioChannels(streamInfo.audioChannels)}`
                : ""}
@@ -328,13 +326,12 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          )}
          {streamInfo?.subtitleCodec && (
            <Text style={textStyle}>
-              {t("player.technical_info.subtitle")}{" "}
-              {formatCodec(streamInfo.subtitleCodec)}
+              Subtitle: {formatCodec(streamInfo.subtitleCodec)}
            </Text>
          )}
          {(info?.videoBitrate || info?.audioBitrate) && (
            <Text style={textStyle}>
-              {t("player.technical_info.bitrate")}{" "}
+              Bitrate:{" "}
              {info.videoBitrate
                ? formatBitrate(info.videoBitrate)
                : info.audioBitrate
@@ -344,9 +341,7 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          )}
          {info?.cacheSeconds !== undefined && (
            <Text style={textStyle}>
-              {t("player.technical_info.buffer_seconds", {
-                seconds: info.cacheSeconds.toFixed(1),
-              })}
+              Buffer: {info.cacheSeconds.toFixed(1)}s
              {info?.demuxerMaxBytes !== undefined
                ? ` (cap ${info.demuxerMaxBytes}MB` +
                  `${info.demuxerMaxBackBytes !== undefined ? ` / ${info.demuxerMaxBackBytes}MB back` : ""}` +
@@ -357,7 +352,7 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          )}
          {info?.voDriver && (
            <Text style={textStyle}>
-              {t("player.technical_info.vo")} {info.voDriver}
+              VO: {info.voDriver}
              {info.hwdec ? ` / ${info.hwdec}` : ""}
            </Text>
          )}
@@ -369,14 +364,10 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
          )}
          {info?.droppedFrames !== undefined && info.droppedFrames > 0 && (
            <Text style={[textStyle, styles.warningText]}>
-              {t("player.technical_info.dropped_frames", {
-                count: info.droppedFrames,
-              })}
+              Dropped: {info.droppedFrames} frames
            </Text>
          )}
-          {!info && !playMethod && (
-            <Text style={textStyle}>{t("player.technical_info.loading")}</Text>
-          )}
+          {!info && !playMethod && <Text style={textStyle}>Loading...</Text>}
        </View>
      </Animated.View>
    );
--- a/components/video-player/controls/VideoScalingModeSelector.tsx
+++ b/components/video-player/controls/VideoScalingModeSelector.tsx
@@ -1,6 +1,5 @@
 import { Ionicons } from "@expo/vector-icons";
 import React, { useMemo } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import {
  type OptionGroup,
@@ -55,7 +54,6 @@ export const AspectRatioSelector: React.FC<AspectRatioSelectorProps> = ({
  onRatioChange,
  disabled = false,
 }) => {
-  const { t } = useTranslation();
  const lightHapticFeedback = useHaptic("light");

  const handleRatioSelect = (ratio: AspectRatio) => {
@@ -68,10 +66,7 @@ export const AspectRatioSelector: React.FC<AspectRatioSelectorProps> = ({
      {
        options: ASPECT_RATIO_OPTIONS.map((option) => ({
          type: "radio" as const,
-          label:
-            option.id === "default"
-              ? t("player.aspect_ratio_original")
-              : option.label,
+          label: option.label,
          value: option.id,
          selected: option.id === currentRatio,
          onPress: () => handleRatioSelect(option.id),
@@ -99,7 +94,7 @@ export const AspectRatioSelector: React.FC<AspectRatioSelectorProps> = ({

  return (
    <PlatformDropdown
-      title={t("player.aspect_ratio")}
+      title='Aspect Ratio'
      groups={optionGroups}
      trigger={trigger}
      bottomSheetConfig={{
--- a/components/video-player/controls/dropdown/DropdownView.tsx
+++ b/components/video-player/controls/dropdown/DropdownView.tsx
@@ -1,7 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useCallback, useMemo, useRef } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { BITRATES } from "@/components/BitrateSelector";
 import {
@@ -48,7 +47,6 @@ const DropdownView = ({
  const { settings, updateSettings } = useSettings();
  const router = useRouter();
  const isOffline = useOfflineMode();
-  const { t } = useTranslation();

  const { subtitleIndex, audioIndex, bitrateValue, playbackPosition } =
    useLocalSearchParams<{
@@ -103,7 +101,7 @@ const DropdownView = ({
    // Quality Section
    if (!isOffline) {
      groups.push({
-        title: t("player.menu.quality"),
+        title: "Quality",
        options:
          BITRATES?.map((bitrate) => ({
            type: "radio" as const,
@@ -118,7 +116,7 @@ const DropdownView = ({
    // Subtitle Section
    if (subtitleTracks && subtitleTracks.length > 0) {
      groups.push({
-        title: t("player.menu.subtitles"),
+        title: "Subtitles",
        options: subtitleTracks.map((sub) => ({
          type: "radio" as const,
          label: sub.name,
@@ -130,7 +128,7 @@ const DropdownView = ({

      // Subtitle Scale Section
      groups.push({
-        title: t("player.menu.subtitle_scale"),
+        title: "Subtitle Scale",
        options: SUBTITLE_SCALE_PRESETS.map((preset) => ({
          type: "radio" as const,
          label: preset.label,
@@ -144,7 +142,7 @@ const DropdownView = ({
    // Audio Section
    if (audioTracks && audioTracks.length > 0) {
      groups.push({
-        title: t("player.menu.audio"),
+        title: "Audio",
        options: audioTracks.map((track) => ({
          type: "radio" as const,
          label: track.name,
@@ -158,7 +156,7 @@ const DropdownView = ({
    // Speed Section
    if (setPlaybackSpeed) {
      groups.push({
-        title: t("player.menu.speed"),
+        title: "Speed",
        options: PLAYBACK_SPEEDS.map((speed) => ({
          type: "radio" as const,
          label: speed.label,
@@ -176,8 +174,8 @@ const DropdownView = ({
          {
            type: "action" as const,
            label: showTechnicalInfo
-              ? t("player.menu.hide_technical_info")
-              : t("player.menu.show_technical_info"),
+              ? "Hide Technical Info"
+              : "Show Technical Info",
            onPress: onToggleTechnicalInfo,
          },
        ],
@@ -187,7 +185,6 @@ const DropdownView = ({
    return groups;
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [
-    t,
    isOffline,
    bitrateValue,
    changeBitrate,
@@ -220,7 +217,7 @@ const DropdownView = ({

  return (
    <PlatformDropdown
-      title={t("player.menu.playback_options")}
+      title='Playback Options'
      groups={optionGroups}
      trigger={trigger}
      expoUIConfig={{}}
--- a/components/video-player/controls/hooks/useRemoteControl.ts
+++ b/components/video-player/controls/hooks/useRemoteControl.ts
@@ -3,7 +3,6 @@ import { Alert } from "react-native";
 import { type SharedValue, useSharedValue } from "react-native-reanimated";
 import { useTVBackPress } from "@/hooks/useTVBackPress";
 import { useTVEventHandler } from "@/hooks/useTVEventHandler";
-import i18n from "@/i18n";

 interface UseRemoteControlProps {
  showControls: boolean;
@@ -125,23 +124,17 @@ export function useRemoteControl({

      // Controls are hidden, so confirm before leaving playback.
      Alert.alert(
-        i18n.t("player.stopPlayback"),
+        "Stop Playback",
        videoTitleRef.current
-          ? i18n.t("player.stopPlayingTitle", {
-              title: videoTitleRef.current,
-            })
-          : i18n.t("player.stopPlayingConfirm"),
+          ? `Stop playing "${videoTitleRef.current}"?`
+          : "Are you sure you want to stop playback?",
        [
          {
-            text: i18n.t("common.cancel"),
+            text: "Cancel",
            style: "cancel",
            onPress: () => onCancelExitRef.current?.(),
          },
-          {
-            text: i18n.t("common.stop"),
-            style: "destructive",
-            onPress: onBackRef.current,
-          },
+          { text: "Stop", style: "destructive", onPress: onBackRef.current },
        ],
      );
      return true;
--- a/hooks/useFilterReset.ts
+++ b/hooks/useFilterReset.ts
@@ -0,0 +1,108 @@
+import { useAtom } from "jotai";
+import { useCallback } from "react";
+import {
+  FilterByPreferenceAtom,
+  filterByAtom,
+  genreFilterAtom,
+  genrePreferenceAtom,
+  SortByOption,
+  SortOrderOption,
+  sortByAtom,
+  sortByPreferenceAtom,
+  sortOrderAtom,
+  sortOrderPreferenceAtom,
+  tagPreferenceAtom,
+  tagsFilterAtom,
+  yearFilterAtom,
+  yearPreferenceAtom,
+} from "@/utils/atoms/filters";
+
+/**
+ * Single source of truth for the library filter bar's "reset" action and its
+ * visibility. The mobile ResetFiltersButton and the TV filter header both use
+ * this so they can't drift — sort/order used to be reset on neither path, so
+ * the reset (X) never reflected a changed sort.
+ *
+ * A reset clears the session filters AND the per-library in-memory preferences
+ * (sort, order, filterBy, genres, years, tags); otherwise the saved preference
+ * resurfaces when the library's mount effect re-applies it on the next entry.
+ */
+export const useFilterReset = (libraryId: string) => {
+  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
+  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
+  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
+  const [filterBy, setFilterBy] = useAtom(filterByAtom);
+  const [sortBy, setSortBy] = useAtom(sortByAtom);
+  const [sortOrder, setSortOrder] = useAtom(sortOrderAtom);
+  const [, setSortByPreference] = useAtom(sortByPreferenceAtom);
+  const [, setSortOrderPreference] = useAtom(sortOrderPreferenceAtom);
+  const [, setFilterByPreference] = useAtom(FilterByPreferenceAtom);
+  const [, setGenrePreference] = useAtom(genrePreferenceAtom);
+  const [, setYearPreference] = useAtom(yearPreferenceAtom);
+  const [, setTagPreference] = useAtom(tagPreferenceAtom);
+
+  // SortName / Ascending is the baseline a library opens with (mount-effect
+  // fallback), so any other value counts as an active, resettable sort.
+  const hasActiveFilters =
+    selectedGenres.length > 0 ||
+    selectedYears.length > 0 ||
+    selectedTags.length > 0 ||
+    filterBy.length > 0 ||
+    sortBy[0] !== SortByOption.SortName ||
+    sortOrder[0] !== SortOrderOption.Ascending;
+
+  const resetAllFilters = useCallback(() => {
+    setSelectedGenres([]);
+    setSelectedYears([]);
+    setSelectedTags([]);
+    setFilterBy([]);
+    setSortBy([SortByOption.SortName]);
+    setSortOrder([SortOrderOption.Ascending]);
+    setSortByPreference((prev) => {
+      const next = { ...prev };
+      delete next[libraryId];
+      return next;
+    });
+    setSortOrderPreference((prev) => {
+      const next = { ...prev };
+      delete next[libraryId];
+      return next;
+    });
+    setFilterByPreference((prev) => {
+      const next = { ...prev };
+      delete next[libraryId];
+      return next;
+    });
+    setGenrePreference((prev) => {
+      const next = { ...prev };
+      delete next[libraryId];
+      return next;
+    });
+    setYearPreference((prev) => {
+      const next = { ...prev };
+      delete next[libraryId];
+      return next;
+    });
+    setTagPreference((prev) => {
+      const next = { ...prev };
+      delete next[libraryId];
+      return next;
+    });
+  }, [
+    libraryId,
+    setSelectedGenres,
+    setSelectedYears,
+    setSelectedTags,
+    setFilterBy,
+    setSortBy,
+    setSortOrder,
+    setSortByPreference,
+    setSortOrderPreference,
+    setFilterByPreference,
+    setGenrePreference,
+    setYearPreference,
+    setTagPreference,
+  ]);
+
+  return { hasActiveFilters, resetAllFilters };
+};
--- a/hooks/useJellyseerr.ts
+++ b/hooks/useJellyseerr.ts
@@ -143,7 +143,7 @@ export class JellyseerrApi {
        if (inRange(status, 200, 299)) {
          if (data.version < "2.0.0") {
            const error = t(
-              "jellyseerr.toasts.jellyseerr_does_not_meet_requirements",
+              "jellyseerr.toasts.jellyseer_does_not_meet_requirements",
            );
            toast.error(error);
            throw Error(error);
--- a/translations/en.json
+++ b/translations/en.json
@@ -270,10 +270,6 @@
        "mpv_subtitle_margin_y": "Vertical margin",
        "mpv_subtitle_align_x": "Horizontal align",
        "mpv_subtitle_align_y": "Vertical align",
-        "mpv_settings_title": "MPV Subtitle Settings",
-        "mpv_settings_description": "Advanced subtitle customization for MPV player",
-        "opaque_background": "Opaque Background",
-        "background_opacity": "Background Opacity",
        "align": {
          "left": "Left",
          "center": "Center",
@@ -441,13 +437,10 @@
    },
    "sessions": {
      "title": "Sessions",
-      "no_active_sessions": "No active sessions",
-      "select_session": "Select Session",
-      "now_playing": "Now playing:"
+      "no_active_sessions": "No active sessions"
    },
    "downloads": {
      "downloads_title": "Downloads",
-      "transcoding": "Transcoding",
      "series": "Series",
      "movies": "Movies",
      "other_media": "Other media",
@@ -503,8 +496,6 @@
    "none": "None",
    "track": "Track",
    "cancel": "Cancel",
-    "stop": "Stop",
-    "open_menu": "Open Menu",
    "delete": "Delete",
    "ok": "OK",
    "remove": "Remove",
@@ -606,31 +597,7 @@
  },
  "player": {
    "live": "LIVE",
-    "menu": {
-      "quality": "Quality",
-      "subtitles": "Subtitles",
-      "subtitle_scale": "Subtitle Scale",
-      "audio": "Audio",
-      "speed": "Speed",
-      "playback_options": "Playback Options",
-      "show_technical_info": "Show Technical Info",
-      "hide_technical_info": "Hide Technical Info"
-    },
-    "technical_info": {
-      "video": "Video:",
-      "audio": "Audio:",
-      "subtitle": "Subtitle:",
-      "bitrate": "Bitrate:",
-      "buffer_seconds": "Buffer: {{seconds}}s",
-      "vo": "VO:",
-      "dropped_frames": "Dropped: {{count}} frames",
-      "loading": "Loading..."
-    },
    "mpv_player_title": "MPV player",
-    "aspect_ratio": "Aspect Ratio",
-    "aspect_ratio_original": "Original",
-    "hash_match": "Hash Match",
-    "still_watching": "Are you still watching?",
    "error": "Error",
    "failed_to_get_stream_url": "Failed to get the stream URL",
    "an_error_occurred_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
@@ -730,7 +697,6 @@
    "no_data_available": "No data available"
  },
  "live_tv": {
-    "title": "Live TV",
    "next": "Next",
    "previous": "Previous",
    "coming_soon": "Coming soon",
@@ -802,7 +768,7 @@
    "request_selected": "Request selected",
    "n_selected": "{{count}} selected",
    "toasts": {
-      "jellyseerr_does_not_meet_requirements": "Seerr server does not meet minimum version requirements! Please update to at least 2.0.0",
+      "jellyseer_does_not_meet_requirements": "Seerr server does not meet minimum version requirements! Please update to at least 2.0.0",
      "jellyseerr_test_failed": "Seerr test failed. Please try again.",
      "failed_to_test_jellyseerr_server_url": "Failed to test Seerr server url",
      "issue_submitted": "Issue submitted!",
@@ -815,16 +781,6 @@
      "failed_to_decline_request": "Failed to decline request"
    }
  },
-  "accessibility": {
-    "play_button": "Play button",
-    "play_hint": "Tap to play the media",
-    "toggle_orientation": "Toggle screen orientation",
-    "toggle_orientation_hint": "Toggles the screen orientation between portrait and landscape"
-  },
-  "not_found": {
-    "title": "This screen doesn't exist.",
-    "go_home": "Go to home screen!"
-  },
  "tabs": {
    "home": "Home",
    "search": "Search",
@@ -835,12 +791,6 @@
  },
  "music": {
    "title": "Music",
-    "no_track_playing": "No track playing",
-    "queue_empty": "Queue is empty",
-    "playing_from_queue": "Playing from queue",
-    "up_next": "Up next",
-    "now_playing": "Now Playing",
-    "missing_library_id": "Missing music library id.",
    "tabs": {
      "suggestions": "Suggestions",
      "albums": "Albums",
--- a/utils/atoms/filters.ts
+++ b/utils/atoms/filters.ts
@@ -1,6 +1,5 @@
 import { atom } from "jotai";
-import { atomWithStorage } from "jotai/utils";
-import { storage } from "../mmkv";
+import { useMemo } from "react";
 import { useSettings } from "./settings";

 export enum SortByOption {
@@ -59,32 +58,36 @@ export const sortOptions: {

 export const useFilterOptions = () => {
  const { settings } = useSettings();
-  // We want to only show the watchlist option if someone has ticked that setting.
-  const filterOptions = settings?.useKefinTweaks
-    ? [
-        {
-          key: FilterByOption.IsFavoriteOrLiked,
-          value: "Is Favorite Or Liked",
-        },
-        { key: FilterByOption.IsUnplayed, value: "Is Unplayed" },
-        { key: FilterByOption.IsPlayed, value: "Is Played" },
-        { key: FilterByOption.IsFavorite, value: "Is Favorite" },
-        { key: FilterByOption.IsResumable, value: "Is Resumable" },
-        { key: FilterByOption.Likes, value: "Watchlist" },
-      ]
-    : [
-        {
-          key: FilterByOption.IsFavoriteOrLiked,
-          value: "Is Favorite Or Liked",
-        },
-        { key: FilterByOption.IsUnplayed, value: "Is Unplayed" },
-        { key: FilterByOption.IsPlayed, value: "Is Played" },
-        { key: FilterByOption.IsFavorite, value: "Is Favorite" },
-        { key: FilterByOption.IsResumable, value: "Is Resumable" },
-      ];
-  console.log("filterOptions");
-  console.log(filterOptions);
-  return filterOptions;
+  // Memoized so the array identity stays stable across renders. A fresh array
+  // each render cascades into ListHeaderComponent re-creation and, under heavy
+  // re-rendering (active downloads), trips React's max-update-depth guard.
+  // We only show the watchlist option if someone has ticked that setting.
+  return useMemo(
+    () =>
+      settings?.useKefinTweaks
+        ? [
+            {
+              key: FilterByOption.IsFavoriteOrLiked,
+              value: "Is Favorite Or Liked",
+            },
+            { key: FilterByOption.IsUnplayed, value: "Is Unplayed" },
+            { key: FilterByOption.IsPlayed, value: "Is Played" },
+            { key: FilterByOption.IsFavorite, value: "Is Favorite" },
+            { key: FilterByOption.IsResumable, value: "Is Resumable" },
+            { key: FilterByOption.Likes, value: "Watchlist" },
+          ]
+        : [
+            {
+              key: FilterByOption.IsFavoriteOrLiked,
+              value: "Is Favorite Or Liked",
+            },
+            { key: FilterByOption.IsUnplayed, value: "Is Unplayed" },
+            { key: FilterByOption.IsPlayed, value: "Is Played" },
+            { key: FilterByOption.IsFavorite, value: "Is Favorite" },
+            { key: FilterByOption.IsResumable, value: "Is Resumable" },
+          ],
+    [settings?.useKefinTweaks],
+  );
 };

 export const sortOrderOptions: {
@@ -120,57 +123,28 @@ const defaultSortPreference: SortPreference = {};
 const defaultSortOrderPreference: SortOrderPreference = {};
 const defaultFilterPreference: FilterPreference = {};

-export const sortByPreferenceAtom = atomWithStorage<SortPreference>(
-  "sortByPreference",
-  defaultSortPreference,
-  {
-    getItem: (key) => {
-      const value = storage.getString(key);
-      return value ? JSON.parse(value) : null;
-    },
-    setItem: (key, value) => {
-      storage.set(key, JSON.stringify(value));
-    },
-    removeItem: (key) => {
-      storage.remove(key);
-    },
-  },
-);
+// Per-library filter memory is intentionally in-memory (NOT atomWithStorage):
+// each library keeps its own filters for the session, and everything resets
+// when the app is fully closed.
+export const sortByPreferenceAtom = atom<SortPreference>(defaultSortPreference);

-export const FilterByPreferenceAtom = atomWithStorage<FilterPreference>(
-  "filterByPreference",
+export const FilterByPreferenceAtom = atom<FilterPreference>(
  defaultFilterPreference,
-  {
-    getItem: (key) => {
-      const value = storage.getString(key);
-      return value ? JSON.parse(value) : null;
-    },
-    setItem: (key, value) => {
-      storage.set(key, JSON.stringify(value));
-    },
-    removeItem: (key) => {
-      storage.remove(key);
-    },
-  },
 );

-export const sortOrderPreferenceAtom = atomWithStorage<SortOrderPreference>(
-  "sortOrderPreference",
+export const sortOrderPreferenceAtom = atom<SortOrderPreference>(
  defaultSortOrderPreference,
-  {
-    getItem: (key) => {
-      const value = storage.getString(key);
-      return value ? JSON.parse(value) : null;
-    },
-    setItem: (key, value) => {
-      storage.set(key, JSON.stringify(value));
-    },
-    removeItem: (key) => {
-      storage.remove(key);
-    },
-  },
 );

+// Genres / years / tags are multi-select, so each library remembers an array.
+export interface MultiFilterPreference {
+  [libraryId: string]: string[];
+}
+
+export const genrePreferenceAtom = atom<MultiFilterPreference>({});
+export const yearPreferenceAtom = atom<MultiFilterPreference>({});
+export const tagPreferenceAtom = atom<MultiFilterPreference>({});
+
 export const getSortByPreference = (
  libraryId: string,
  preferences: SortPreference,
@@ -191,3 +165,8 @@ export const getFilterByPreference = (
 ) => {
  return preferences?.[libraryId] || null;
 };
+
+export const getMultiFilterPreference = (
+  libraryId: string,
+  preferences: MultiFilterPreference,
+) => preferences?.[libraryId] ?? [];