fix spash screen; expo upgrade; fix manuel server navigation

Author: naltatis

assets/icon-solid-dark.svg

@@ -29,17 +29,17 @@
     "@ui-kitten/eva-icons": "^5.3.1",
     "axios": "^1.12.0",
     "base-64": "^1.0.0",
-    "expo": "^54.0.7",
-    "expo-build-properties": "~1.0.8",
-    "expo-dev-client": "~6.0.12",
+    "expo": "^54.0.12",
+    "expo-build-properties": "~1.0.9",
+    "expo-dev-client": "~6.0.13",
     "expo-file-system": "~19.0.12",
     "expo-linking": "~8.0.8",
     "expo-localization": "~17.0.7",
     "expo-sharing": "~14.0.7",
     "expo-splash-screen": "~31.0.9",
     "expo-status-bar": "~3.0.8",
     "expo-system-ui": "~6.0.7",
-    "expo-web-browser": "~15.0.7",
+    "expo-web-browser": "~15.0.8",
     "i18next": "^24.1.0",
     "react": "19.1.0",
     "react-dom": "19.1.0",
@@ -88,4 +88,4 @@
     }
   },
   "private": true
-}
+}

assets/splash-icon-dark.png

@@ -13,7 +13,7 @@ function ServerManualScreen({
   navigation,
 }: NativeStackScreenProps<RootStackParamList, "ServerManual">) {
   const { t } = useTranslation();
-  const { updateServerUrl } = useAppContext();
+  const { serverUrl, updateServerUrl } = useAppContext();
 
   const { url: initialUrl = "", username, password } = route.params || {};
 
@@ -30,14 +30,19 @@ function ServerManualScreen({
   }, [initialUrl, username, password]);
 
   const serverSelected = React.useCallback(
-    (nextUrl: string, nextBasicAuth: BasicAuth) => {
+    async (nextUrl: string, nextBasicAuth: BasicAuth) => {
       console.log("serverSelected");
       setUrl(nextUrl);
       setBasicAuth(nextBasicAuth);
-      updateServerUrl(nextUrl, nextBasicAuth);
-      navigation.navigate("Main");
+      await updateServerUrl(nextUrl, nextBasicAuth);
+
+      // After setting serverUrl, navigate to Main which will be available in the new stack
+      navigation.reset({
+        index: 0,
+        routes: [{ name: "Main" }],
+      });
     },
-    [updateServerUrl],
+    [updateServerUrl, navigation],
   );
 
   const memoizedHeader = React.useMemo(
@@ -49,12 +54,12 @@ function ServerManualScreen({
           if (navigation.canGoBack()) {
             navigation.goBack();
           } else {
-            navigation.navigate("Main");
+            navigation.navigate(serverUrl ? "Main" : "Server");
           }
         }}
       />
     ),
-    [navigation, t],
+    [navigation, serverUrl, t],
   );
 
   return (

assets/splash-icon-light.png

@@ -19,6 +19,9 @@ function SettingsScreen({
   const saveServer = React.useCallback(
     (url: string, basicAuth: BasicAuth) => {
       updateServerUrl(url, basicAuth);
+      if (navigation.canGoBack()) {
+        navigation.goBack();
+      }
     },
     [navigation, updateServerUrl],
   );
@@ -31,7 +34,7 @@ function SettingsScreen({
         serverSelected={saveServer}
       />
     ),
-    [serverUrl, saveServer],
+    [serverUrl, basicAuth, saveServer],
   );
 
   const openGitHubReleases = () => {