From a2f03908f649099328d0532415f2b82fda29ee12 Mon Sep 17 00:00:00 2001
From: Fredrik Burmester <fredrik.burmester@gmail.com>
Date: Wed, 19 Feb 2025 14:44:39 +0100
Subject: [PATCH] fix: remove splashscreen provider and handle loading in
 jellyfinprovider

---
 app/_layout.tsx                          |  46 +++++-----
 app/login.tsx                            |   1 -
 bun.lock                                 |   2 +-
 components/settings/SettingsIndex.tsx    |  12 +--
 components/settings/SettingsIndex.tv.tsx |  12 +--
 package.json                             |   2 +-
 providers/.JellyfinProvider.tsx.swp      | Bin 0 -> 16384 bytes
 providers/JellyfinProvider.tsx           | 105 +++++++++++------------
 providers/SplashScreenProvider.tsx       | 103 ----------------------
 utils/atoms/settings.ts                  |   2 +
 10 files changed, 76 insertions(+), 209 deletions(-)
 create mode 100644 providers/.JellyfinProvider.tsx.swp
 delete mode 100644 providers/SplashScreenProvider.tsx

diff --git a/app/_layout.tsx b/app/_layout.tsx
index 55652930..dddfe2a1 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -10,10 +10,6 @@ import {
 } from "@/providers/JellyfinProvider";
 import { JobQueueProvider } from "@/providers/JobQueueProvider";
 import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider";
-import {
-  SplashScreenProvider,
-  useSplashScreenLoading,
-} from "@/providers/SplashScreenProvider";
 import { WebSocketProvider } from "@/providers/WebSocketProvider";
 import { Settings, useSettings } from "@/utils/atoms/settings";
 import { BACKGROUND_FETCH_TASK } from "@/utils/background-tasks";
@@ -36,6 +32,7 @@ import { useFonts } from "expo-font";
 import { useKeepAwake } from "expo-keep-awake";
 const Notifications = !Platform.isTV ? require("expo-notifications") : null;
 import { router, Stack } from "expo-router";
+import * as SplashScreen from "expo-splash-screen";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 const TaskManager = !Platform.isTV ? require("expo-task-manager") : null;
 import { getLocales } from "expo-localization";
@@ -58,6 +55,15 @@ if (!Platform.isTV) {
   });
 }
 
+// Keep the splash screen visible while we fetch resources
+SplashScreen.preventAutoHideAsync();
+
+// Set the animation options. This is optional.
+SplashScreen.setOptions({
+  duration: 500,
+  fade: true,
+});
+
 function useNotificationObserver() {
   if (Platform.isTV) return;
 
@@ -224,17 +230,15 @@ export default function RootLayout() {
   Appearance.setColorScheme("dark");
 
   return (
-    <SplashScreenProvider>
-      <GestureHandlerRootView style={{ flex: 1 }}>
-        <JotaiProvider>
-          <ActionSheetProvider>
-            <I18nextProvider i18n={i18n}>
-              <Layout />
-            </I18nextProvider>
-          </ActionSheetProvider>
-        </JotaiProvider>
-      </GestureHandlerRootView>
-    </SplashScreenProvider>
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <JotaiProvider>
+        <ActionSheetProvider>
+          <I18nextProvider i18n={i18n}>
+            <Layout />
+          </I18nextProvider>
+        </ActionSheetProvider>
+      </JotaiProvider>
+    </GestureHandlerRootView>
   );
 }
 
@@ -303,16 +307,6 @@ function Layout() {
     }, []);
   }
 
-  const [loaded] = useFonts({
-    SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
-  });
-
-  useSplashScreenLoading(!loaded);
-
-  if (!loaded) {
-    return null;
-  }
-
   return (
     <QueryClientProvider client={queryClient}>
       <JobQueueProvider>
@@ -324,7 +318,7 @@ function Layout() {
                   <BottomSheetModalProvider>
                     <SystemBars style="light" hidden={false} />
                     <ThemeProvider value={DarkTheme}>
-                      <Stack>
+                      <Stack initialRouteName="(auth)/(tabs)">
                         <Stack.Screen
                           name="(auth)/(tabs)"
                           options={{
diff --git a/app/login.tsx b/app/login.tsx
index 813b84d9..220c6b97 100644
--- a/app/login.tsx
+++ b/app/login.tsx
@@ -237,7 +237,6 @@ const Login: React.FC = () => {
                       setCredentials({ ...credentials, username: text })
                     }
                     value={credentials.username}
-                    autoFocus
                     secureTextEntry={false}
                     keyboardType="default"
                     returnKeyType="done"
diff --git a/bun.lock b/bun.lock
index 25e70592..33b28594 100644
--- a/bun.lock
+++ b/bun.lock
@@ -44,7 +44,7 @@
         "expo-router": "~4.0.17",
         "expo-screen-orientation": "~8.0.4",
         "expo-sensors": "~14.0.2",
-        "expo-splash-screen": "~0.29.21",
+        "expo-splash-screen": "~0.29.22",
         "expo-status-bar": "~2.0.1",
         "expo-system-ui": "~4.0.8",
         "expo-task-manager": "~12.0.5",
diff --git a/components/settings/SettingsIndex.tsx b/components/settings/SettingsIndex.tsx
index e9213952..964bee31 100644
--- a/components/settings/SettingsIndex.tsx
+++ b/components/settings/SettingsIndex.tsx
@@ -8,10 +8,6 @@ import { Colors } from "@/constants/Colors";
 import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
 import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import {
-  useSplashScreenLoading,
-  useSplashScreenVisible,
-} from "@/providers/SplashScreenProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { Feather, Ionicons } from "@expo/vector-icons";
 import { Api } from "@jellyfin/sdk";
@@ -156,10 +152,6 @@ export const SettingsIndex = () => {
     staleTime: 60 * 1000,
   });
 
-  // show splash screen until query loaded
-  useSplashScreenLoading(l1);
-  const splashScreenVisible = useSplashScreenVisible();
-
   const userViews = useMemo(
     () => data?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!)),
     [data, settings?.hiddenLibraries]
@@ -414,9 +406,7 @@ export const SettingsIndex = () => {
       </View>
     );
 
-  // this spinner should only show up, when user navigates here
-  // on launch the splash screen is used for loading
-  if (l1 && !splashScreenVisible)
+  if (l1)
     return (
       <View className="justify-center items-center h-full">
         <Loader />
diff --git a/components/settings/SettingsIndex.tv.tsx b/components/settings/SettingsIndex.tv.tsx
index 905baad3..afde6937 100644
--- a/components/settings/SettingsIndex.tv.tsx
+++ b/components/settings/SettingsIndex.tv.tsx
@@ -6,10 +6,6 @@ import { Loader } from "@/components/Loader";
 import { MediaListSection } from "@/components/medialists/MediaListSection";
 import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import {
-  useSplashScreenLoading,
-  useSplashScreenVisible,
-} from "@/providers/SplashScreenProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { Ionicons } from "@expo/vector-icons";
 import { Api } from "@jellyfin/sdk";
@@ -124,10 +120,6 @@ export const SettingsIndex = () => {
     staleTime: 60 * 1000,
   });
 
-  // show splash screen until query loaded
-  useSplashScreenLoading(l1);
-  const splashScreenVisible = useSplashScreenVisible();
-
   const userViews = useMemo(
     () => data?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!)),
     [data, settings?.hiddenLibraries]
@@ -382,9 +374,7 @@ export const SettingsIndex = () => {
       </View>
     );
 
-  // this spinner should only show up, when user navigates here
-  // on launch the splash screen is used for loading
-  if (l1 && !splashScreenVisible)
+  if (l1)
     return (
       <View className="justify-center items-center h-full">
         <Loader />
diff --git a/package.json b/package.json
index ee7d0bba..a04b6b4b 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "expo-router": "~4.0.17",
     "expo-screen-orientation": "~8.0.4",
     "expo-sensors": "~14.0.2",
-    "expo-splash-screen": "~0.29.21",
+    "expo-splash-screen": "~0.29.22",
     "expo-status-bar": "~2.0.1",
     "expo-system-ui": "~4.0.8",
     "expo-task-manager": "~12.0.5",
diff --git a/providers/.JellyfinProvider.tsx.swp b/providers/.JellyfinProvider.tsx.swp
new file mode 100644
index 0000000000000000000000000000000000000000..18d4a7ed5ac2cd6eaa90564da7225f99759e94a5
GIT binary patch
literal 16384
zcmeHOO^h5z74ATO4Nf3I%8979u|khCJF{z|0PEeg*K4o632Qr^tWB~QxwpG!x4b>w
zLv{DAo$=bl7AHUuDM&#m;=&D-91t8p5d?+ED3^c);zuG7ARsQ>KmtSfUj6j+j0f-q
z4yZ@^w!5p|dsX$-tJhtxdsin;E-tYTHzpkX-sL#2zV?l^gWr68=cOGtIc>>9DK=Jf
z+2Lu%C5epsEoixPe8~?EB+173ahZ(oX+%ljM`iho!v>oNlOXT#I7^#{MRp`#ZKj#z
ze&>8!#LccuHbux~+I*Nt5f#C#Drsctxw75rykekY;6@nO>3m?%q+06lbH~^{cQ4<F
zQYBL{P%%(3P%%(3P%%(3P%%(3P%-d-!a&x&*|~(Vyv>X!Gsl~Tj&GUYQ>Hv0s{e<n
z@0#*I57qzO)K8o8wrRk&V~VRo#X!YC#X!YC#X!YC#X!YC#X!YC#X!YC#X!Zte}Mr%
zbesoZ_Z~_B;Qhbd|G#;c<9r?H03QVI0)BO;<9rG50T=koPRDr}_&gwh$AKfjUZ4)#
z2fQ1&75M8r9p{h0w}7XCQ@|uJ0lXL30o)GU2K@9Lj`J0u3nai%;9lVOJMeu1@M$0d
zCV?i<0DgCe<NOTx3Gid!bHEj#2Q+}+-0nDU0N(|^1AG;D7D$14U;=P~JAhYibDXaM
zp8=i(Hh_-<%fKw~Ag~*#0dL*vI6nfO0Zsu+z&_vs;9kH1esK$I0vCa8;0a&`aDiKZ
zS8jHkF94T;9<T-+2Hp=iz?*M(oU6e1fR}(T15W`Num`w?xw{Iy1iSz|59GiJ;0Qo-
zdpB@{Kc;>`5~mrHJniCyvl-@Z`66R}S2X-{B1sof?Z*Lcbdxmm9MZ|;dDc^BqRqT9
zh_VY8*jUInMZg!s8mwixjQ2uBTNkm&grD(8a}jLJCvnV!3@zm;pZB9^)ekm2KRq7@
z%&W1PS=ff=cAc$Qi>GU33uXGCDi500X53vpE4S^|*-3m!B9eH<ooMWNs4?lDsVh}d
zKOXs6JCU8nu@;+|nPILUhcXeN%l0vM&Yn*(R~&1(M$6B$^+bv%{R~E@*qJ3B3jcsi
zwo)$Hd?fHu%Z%G9zGguObjN0PX@)cvWx8x<ElsSahNYQW=RSQ3qsdv~oy03sVrY=O
z&9h+rSbTy*i^!b9oa9`Ow5VN5@_1CuVvKKmHvMQZJ^<#|B*elI2CUc=o1B=KV7u8v
z6GIK05^<PpE#TXpw5-o#e>LJTIYzFbb++v+7(Oud(oQBhk@deu=x2V7r94}P#89zS
z&{SEK!e!UA(p*<~Xt&nD^?WWRW=PpG<S}NQwwQo8k0NdR6FHaX7ckF*?nus~svhCz
zr`U>1y~j+WmD4mX-Jc#4=>p9Q581Y!z(>iPr`*}f1QGY;TokEqol?%_K@7M~11?G=
zb=R8cmwIXdr?ur4&oU9OrMi$|#o?Q)biMD0$D@2r#8ynRk48oncSnfkT}%YOPF=Ox
zAM#2u_?46gm|8WEmO8Z^&0uF5pL?OV>;faIXFd9>Mx$9-5$W+HiXfr%7wy%6iPa<l
zb@8m%_M?=SwP`k#BJpN)=CY*YQ3aipg~=m{ZFosp6vajoL!!`Agq)hCn30-|I-UrX
zRX7GKPUvF0=Fq|Z3ct4nBD5>Pmc)LCPca=8j^cc<-b9PIolKb^V)X(Qd=_;L(^du}
z(WVZC2xul2Vq}h0XDsGh%zknQC$$wS;Fv3nxR5YKddm9UEiXUK4h^DDnwA$K<gg%*
zN%)i&TMVtxQ1EATV>r}qBd(RBpIt$jT^f%`KTZ+S5tzvm`e)q9a2BeGwv7!qQ{j&Y
zeH>pL@^IEGPRs6c)_jtvOj#-hOxZ#>cVS`B*tWT;p?~Wl3K5X%4nNmTWM(>SP1x@q
zr`QSZ2U%lbe!5ran8Kq;$l3NR*rd3kx>_{r=<!=~^9cg|Il9qeX<`+c>*=BTlYW%*
z!QSKX1#FJGYfqV5G`iXmX=z~>otULa8YOE<j(d;3d0F92+-q&MK#)}nR6DMokUH!7
zX}Xn2+&pxNqV76<i5uf4qLYM&+eXMZH4T?7DzN^Qgf19uD->w}WAICo#f{9%Wi+yR
zEwOSMLlATeZTkT)7LXxVlZlxbnBc9Hf(xw_9Hvk4)m9R0@N7694(Qn6Wwn+un1fmJ
zZ*@!*vnq&j!{TaU{SZ!=VyK$q@^JJR=?P49l!xXymTnuf&0IK9kd4P!aGQLb%3Ww`
zsUEHE{_4jH9igI^<+wn^Dr?%OvXM$<K`>HU@<ZZc@<TD49r6Qh<64E27Tty@_`wK0
zR+&>BWz2<{LVIPNOzBcBM_PGwF|e5GmH{PFXFYq}Q*&LX_SD?lUY$)cU-U<{8&4Xn
z)s1}IyJ48ehB$JC@l=(Mr>df_(_?sKga0YxExx8ctS;zKnp&W*qMqc@J2pp;^oOKO
z=mA5|k*e#9_7p`q_(EJ&O{k}sLVQ1V1K1G+8%^yG>ba<_-hT}1>zp-Vw3&t*%}A^^
z^Grl(6aHG(v@ULYw*NY{H6C+`nGDDE-LKifq(o`i2%NrNtjf_nD2u0ABK<XlRKv!8
z)3r`#W3w!WdBmMdJ^x%MORG9<BJil{vX%<9^pq!6w_v1SQZloSkLlCqKyBFyD(u7f
zC?#9hS8?|@{apElnnmJ=_W!g;zJfh8?f>oj`5$7x{~GXp;A!BKz!_i#_$Y7+xDWUf
z@&K;`&j6Q!OTb0o5ugTmz<Yo<kOTNN@FMUWAb|tGG_VVBfiZw`1TO;L1}Il>1vm*D
z0`>xT0@siW_$}~D;OD@rzz=|{z-NJv0Z#yr19jjU#`ZVh55UX7bHEpYXMs-vH1^9t
z^{W`D7^oPi7^oPi7^oPi82FzsKsg1I{<Rqzm9?RA?A!H&cmt2oo@?uoWVNRz%VsaJ
z$E7W3WAj1e7_f)3TUnFdwPH1ftt|2p*lgP(Xxg^0RcWcrWT{28WA@?gJPv3RG$L<h
zx6Wj}G^`PJv1><KVOd6Qjb4)IRP%@i^u`-<3)pM7G#6g2Xh&-fHD~kInn3+mC&7>^
zZD7-pNKa=<k(XqFkK8mv0jv<=#bi9(I(D?t^<~OcLI#W|MwfNMfi}?nS3Z<G$96<2
zA+i&w*GHykG__Rej;58`7#c7Y_46D<BOXC;mTd6&Kal$v$qcol9meEGY%`SkrS4L?
zPw%UXJg}kxoT;sMLvrlR1May^kKPc~nqKCwrZ}u89bRkFaKRc_$L^G?Hx6WWUt=+3
z_utRPL_7zr!!Xt@O~<flWYGkMrcJ507G)ztHdK3hHcB-#BW5Hk6UbZATQA*Xm(0T6
zze==PHCkx2_tkVzqP18TC`W28L!Oq0C#dtvHKy3|z!a(_s9tfI#g9%>UQ!P$TgSUJ
zm5Nqb36I{bs68^WvaFNi)#NIt4uot=Wa}vNi_JaSR{tih8B+Wh)0BhPRG0!ih<V+x
zXYHHozH4foau1MZtxXjz8U>x?(=RI3z|0g)7yrR-1RJ)Cvubu2>)8yjUaZ5Z*g~G+
q^<2(pdgu^Qr5fBOBZflHz9H2)+UO$*UK=9cUA%$9Y2U@jhyMw6MhZ0m

literal 0
HcmV?d00001

diff --git a/providers/JellyfinProvider.tsx b/providers/JellyfinProvider.tsx
index 66d1966e..463cc3f6 100644
--- a/providers/JellyfinProvider.tsx
+++ b/providers/JellyfinProvider.tsx
@@ -1,5 +1,7 @@
 import "@/augmentations";
 import { useInterval } from "@/hooks/useInterval";
+import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";
+import { useSettings } from "@/utils/atoms/settings";
 import { storage } from "@/utils/mmkv";
 import { Api, Jellyfin } from "@jellyfin/sdk";
 import { UserDto } from "@jellyfin/sdk/lib/generated-client/models";
@@ -7,6 +9,7 @@ import { getUserApi } from "@jellyfin/sdk/lib/utils/api";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import axios, { AxiosError } from "axios";
 import { router, useSegments } from "expo-router";
+import * as SplashScreen from "expo-splash-screen";
 import { atom, useAtom } from "jotai";
 import React, {
   createContext,
@@ -17,16 +20,10 @@ import React, {
   useMemo,
   useState,
 } from "react";
-import { Platform } from "react-native";
-import uuid from "react-native-uuid";
-import { getDeviceName } from "react-native-device-info";
 import { useTranslation } from "react-i18next";
-import { useSettings } from "@/utils/atoms/settings";
-import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";
-import {
-  useSplashScreenLoading,
-  useSplashScreenVisible,
-} from "./SplashScreenProvider";
+import { Platform } from "react-native";
+import { getDeviceName } from "react-native-device-info";
+import uuid from "react-native-uuid";
 
 interface Server {
   address: string;
@@ -88,22 +85,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
   ] = useSettings();
   const { clearAllJellyseerData, setJellyseerrUser } = useJellyseerr();
 
-  useQuery({
-    queryKey: ["user", api],
-    queryFn: async () => {
-      if (!api) return null;
-      const response = await getUserApi(api).getCurrentUser();
-      if (response.data) setUser(response.data);
-      return user;
-    },
-    enabled: !!api,
-    refetchOnWindowFocus: true,
-    refetchInterval: 1000 * 60,
-    refetchIntervalInBackground: true,
-    refetchOnMount: true,
-    refetchOnReconnect: true,
-  });
-
   const headers = useMemo(() => {
     if (!deviceId) return {};
     return {
@@ -179,14 +160,13 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
     }
   }, [api, secret, headers]);
 
-  useInterval(pollQuickConnect, isPolling ? 1000 : null);
-
   useEffect(() => {
     (async () => {
       await refreshStreamyfinPluginSettings();
     })();
   }, []);
 
+  useInterval(pollQuickConnect, isPolling ? 1000 : null);
   useInterval(refreshStreamyfinPluginSettings, 60 * 5 * 1000); // 5 min
 
   const discoverServers = async (url: string): Promise<Server[]> => {
@@ -312,33 +292,44 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
     },
   });
 
-  const { isLoading, isFetching } = useQuery({
-    queryKey: [
-      "initializeJellyfin",
-      user?.Id,
-      api?.basePath,
-      jellyfin?.clientInfo,
-    ],
-    queryFn: async () => {
+  const [loaded, setLoaded] = useState(false);
+  const [initialLoaded, setInitialLoaded] = useState(false);
+
+  useEffect(() => {
+    if (initialLoaded) {
+      setLoaded(true);
+    }
+  }, [initialLoaded]);
+
+  useEffect(() => {
+    const initializeJellyfin = async () => {
+      if (!jellyfin) return;
+
       try {
         const token = getTokenFromStorage();
         const serverUrl = getServerUrlFromStorage();
-        const user = getUserFromStorage();
-        if (serverUrl && token && user?.Id && jellyfin) {
+        const storedUser = getUserFromStorage();
+
+        if (serverUrl && token) {
           const apiInstance = jellyfin.createApi(serverUrl, token);
           setApi(apiInstance);
-          setUser(user);
-        }
 
-        return true;
+          if (storedUser?.Id) {
+            setUser(storedUser);
+          }
+
+          const response = await getUserApi(apiInstance).getCurrentUser();
+          setUser(response.data);
+        }
       } catch (e) {
         console.error(e);
-        return false;
+      } finally {
+        setInitialLoaded(true);
       }
-    },
-    staleTime: 0,
-    enabled: !user?.Id || !api || !jellyfin,
-  });
+    };
+
+    initializeJellyfin();
+  }, [jellyfin]);
 
   const contextValue: JellyfinContextValue = {
     discoverServers,
@@ -350,17 +341,17 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
     initiateQuickConnect,
   };
 
-  let isLoadingOrFetching = isLoading || isFetching;
-  useProtectedRoute(user, isLoadingOrFetching);
+  useEffect(() => {
+    if (loaded) {
+      SplashScreen.hideAsync();
+    }
+  }, [loaded]);
 
-  // show splash screen until everything loaded
-  useSplashScreenLoading(isLoadingOrFetching);
-  const splashScreenVisible = useSplashScreenVisible();
+  useProtectedRoute(user, loaded);
 
   return (
     <JellyfinContext.Provider value={contextValue}>
-      {/* don't render login page when loading and splash screen visible */}
-      {isLoadingOrFetching && splashScreenVisible ? undefined : children}
+      {children}
     </JellyfinContext.Provider>
   );
 };
@@ -372,20 +363,24 @@ export const useJellyfin = (): JellyfinContextValue => {
   return context;
 };
 
-function useProtectedRoute(user: UserDto | null, loading = false) {
+function useProtectedRoute(user: UserDto | null, loaded = false) {
   const segments = useSegments();
 
   useEffect(() => {
-    if (loading) return;
+    if (loaded === false) return;
+
+    console.log("Loaded", user);
 
     const inAuthGroup = segments[0] === "(auth)";
 
     if (!user?.Id && inAuthGroup) {
+      console.log("Redirected to login");
       router.replace("/login");
     } else if (user?.Id && !inAuthGroup) {
+      console.log("Redirected to home");
       router.replace("/(auth)/(tabs)/(home)/");
     }
-  }, [user, segments, loading]);
+  }, [user, segments, loaded]);
 }
 
 export function getTokenFromStorage(): string | null {
diff --git a/providers/SplashScreenProvider.tsx b/providers/SplashScreenProvider.tsx
deleted file mode 100644
index 2265dd00..00000000
--- a/providers/SplashScreenProvider.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import {
-  createContext,
-  ReactNode,
-  useContext,
-  useEffect,
-  useState,
-  useRef,
-} from "react";
-import * as SplashScreen from "expo-splash-screen";
-
-type SplashScreenContextValue = {
-  registerLoadingComponent: () => () => void;
-  splashScreenVisible: boolean;
-};
-
-const SplashScreenContext = createContext<SplashScreenContextValue | undefined>(
-  undefined
-);
-
-// Prevent splash screen from auto-hiding
-void SplashScreen.preventAutoHideAsync();
-
-export const SplashScreenProvider: React.FC<{ children: ReactNode }> = ({
-  children,
-}) => {
-  const [splashScreenVisible, setSplashScreenVisible] = useState(true);
-  const loadingComponentsCount = useRef(0);
-  const isHidingRef = useRef(false);
-
-  const hideScreenIfNoLoadingComponents = async () => {
-    if (loadingComponentsCount.current === 0 && !isHidingRef.current) {
-      try {
-        isHidingRef.current = true;
-        await SplashScreen.hideAsync();
-        setSplashScreenVisible(false);
-      } catch (error) {
-        console.warn("Failed to hide splash screen:", error);
-      } finally {
-        isHidingRef.current = false;
-      }
-    }
-  };
-
-  const registerLoadingComponent = () => {
-    loadingComponentsCount.current += 1;
-
-    return () => {
-      loadingComponentsCount.current -= 1;
-      void hideScreenIfNoLoadingComponents();
-    };
-  };
-
-  const contextValue: SplashScreenContextValue = {
-    registerLoadingComponent,
-    splashScreenVisible,
-  };
-
-  return (
-    <SplashScreenContext.Provider value={contextValue}>
-      {children}
-    </SplashScreenContext.Provider>
-  );
-};
-
-/**
- * Show the Splash Screen until component is ready to be displayed.
- *
- * @param isLoading The loading state of the component
- *
- * ## Usage
- * ```
- * const isLoading = loadSomething()
- * useSplashScreenLoading(isLoading)    // splash screen visible until isLoading is false
- * ```
- */
-export function useSplashScreenLoading(isLoading: boolean) {
-  const context = useContext(SplashScreenContext);
-  if (!context) {
-    throw new Error(
-      "useSplashScreenLoading must be used within a SplashScreenProvider"
-    );
-  }
-
-  useEffect(() => {
-    if (isLoading) {
-      return context.registerLoadingComponent();
-    }
-  }, [isLoading]);
-}
-
-/**
- * Get the visibility of the Splash Screen.
- * @returns the visibility of the Splash Screen
- */
-export function useSplashScreenVisible() {
-  const context = useContext(SplashScreenContext);
-  if (!context) {
-    throw new Error(
-      "useSplashScreenVisible must be used within a SplashScreenProvider"
-    );
-  }
-  return context.splashScreenVisible;
-}
diff --git a/utils/atoms/settings.ts b/utils/atoms/settings.ts
index 35688e03..52ccf719 100644
--- a/utils/atoms/settings.ts
+++ b/utils/atoms/settings.ts
@@ -268,6 +268,8 @@ export const useSettings = () => {
       const newSettings = { ..._settings, ...update };
 
       setSettings(newSettings);
+
+      // @ts-expect-error
       saveSettings(newSettings);
     }
   };