fix bunch of other crashes and mistakes

Author: AmyrAhmady

src/containers/AddThirdPartyServer/index.tsx

@@ -17,7 +17,10 @@ import { usePersistentServers } from "../../states/servers";
 import { useTheme } from "../../states/theme";
 import { sc } from "../../utils/sizeScaler";
 import { Server } from "../../utils/types";
-import { validateServerAddress } from "../../utils/validation";
+import {
+  isValidDomain,
+  validateServerAddressIPv4,
+} from "../../utils/validation";
 
 const AddThirdPartyServerModal = () => {
   const { visible, showAddThirdPartyServer } = useAddThirdPartyServerModal();
@@ -36,10 +39,6 @@ const AddThirdPartyServerModal = () => {
     }
   }, [visible]);
 
-  if (!visible) {
-    return null;
-  }
-
   const addServer = useCallback(() => {
     const serverInfo: Server = {
       ip: "",
@@ -66,7 +65,10 @@ const AddThirdPartyServerModal = () => {
         serverInfo.port = parseInt(data[1]);
         serverInfo.hostname += ` (${serverInfo.ip}:${serverInfo.port})`;
       } else {
-        if (validateServerAddress(serverAddress)) {
+        if (
+          validateServerAddressIPv4(serverAddress) ||
+          isValidDomain(serverAddress)
+        ) {
           serverInfo.ip = serverAddress;
           serverInfo.port = 7777;
           serverInfo.hostname += ` (${serverInfo.ip}:${serverInfo.port})`;
@@ -96,6 +98,10 @@ const AddThirdPartyServerModal = () => {
     [height, width, theme]
   );
 
+  if (!visible) {
+    return null;
+  }
+
   return (
     <StaticModal onDismiss={() => showAddThirdPartyServer(false)}>
       <View style={[styles.container, dynamicStyles.container]}>

src/containers/ExternalServerHandler/index.tsx

@@ -18,7 +18,10 @@ import { useTheme } from "../../states/theme";
 import { startGame } from "../../utils/game";
 import { sc } from "../../utils/sizeScaler";
 import { Server } from "../../utils/types";
-import { validateServerAddress } from "../../utils/validation";
+import {
+  isValidDomain,
+  validateServerAddressIPv4,
+} from "../../utils/validation";
 
 const ExternalServerHandler = () => {
   const [visible, showModal] = useState(false);
@@ -101,7 +104,10 @@ const ExternalServerHandler = () => {
         serverInfo.port = parseInt(data[1]);
         serverInfo.hostname += ` (${serverInfo.ip}:${serverInfo.port})`;
       } else {
-        if (validateServerAddress(serverAddress)) {
+        if (
+          validateServerAddressIPv4(serverAddress) ||
+          isValidDomain(serverAddress)
+        ) {
           serverInfo.ip = serverAddress;
           serverInfo.port = 7777;
           serverInfo.hostname += ` (${serverInfo.ip}:${serverInfo.port})`;
@@ -139,7 +145,10 @@ const ExternalServerHandler = () => {
         serverInfo.port = parseInt(data[1]);
         serverInfo.hostname += ` (${serverInfo.ip}:${serverInfo.port})`;
       } else {
-        if (validateServerAddress(serverAddress)) {
+        if (
+          validateServerAddressIPv4(serverAddress) ||
+          isValidDomain(serverAddress)
+        ) {
           serverInfo.ip = serverAddress;
           serverInfo.port = 7777;
           serverInfo.hostname += ` (${serverInfo.ip}:${serverInfo.port})`;

src/containers/Settings/index.tsx

@@ -38,17 +38,17 @@ const SettingsModal = () => {
     { label: t("settings_advanced_tab_title"), type: "advanced" },
   ];
 
-  if (!visible) {
-    return null;
-  }
-
   const renderTab = () => {
     if (selectedTab === "general") return <General />;
     else if (selectedTab === "languages") return <Languages />;
     else if (selectedTab === "advanced") return <Advanced />;
     else return null;
   };
 
+  if (!visible) {
+    return null;
+  }
+
   return (
     <StaticModal onDismiss={() => hide()} key={"settings-" + language}>
       <View

src/utils/helpers.ts

@@ -17,7 +17,7 @@ import {
   Server,
   SortType,
 } from "./types";
-import { validateServerAddress } from "./validation";
+import { validateServerAddressIPv4 } from "./validation";
 
 // Server update configuration
 const SERVER_UPDATE_CONFIG = {
@@ -177,7 +177,7 @@ export const getIpAddress = async (
   }
 
   // Use validation function from validation.ts
-  if (validateServerAddress(hostname)) {
+  if (validateServerAddressIPv4(hostname)) {
     return hostname;
   }
 

src/utils/validation.ts

@@ -16,7 +16,7 @@ export const isValidDomain = (domain: string): boolean => {
   return DOMAIN_REGEX.test(domain);
 };
 
-export const validateServerAddress = (address: string): boolean => {
+export const validateServerAddressIPv4 = (address: string): boolean => {
   if (!address || typeof address !== "string") return false;
 
   // Check localhost first (fastest check)
@@ -25,13 +25,27 @@ export const validateServerAddress = (address: string): boolean => {
   // Check IPv4
   if (isIPv4(address)) return true;
 
-  // Check domain
-  return isValidDomain(address);
+  // Check domain, return false if it's valid (to resolve hostname later)
+  return false;
 };
 
 export const validateWebUrl = (url: string): boolean => {
   if (!url || typeof url !== "string") return false;
-  return WEB_URL_REGEX.test(url);
+
+  // If URL already has protocol, test as-is
+  if (/^https?:\/\//.test(url)) {
+    return WEB_URL_REGEX.test(url);
+  }
+
+  // Try with https:// prefix
+  const httpsUrl = `https://${url}`;
+  if (WEB_URL_REGEX.test(httpsUrl)) {
+    return true;
+  }
+
+  // Try with http:// prefix
+  const httpUrl = `http://${url}`;
+  return WEB_URL_REGEX.test(httpUrl);
 };
 
 export const validatePort = (port: number | string): boolean => {
@@ -43,5 +57,5 @@ export const validateServerEndpoint = (
   ip: string,
   port: number | string
 ): boolean => {
-  return validateServerAddress(ip) && validatePort(port);
+  return validateServerAddressIPv4(ip) && validatePort(port);
 };