fix: move storing old loader config into settings + other fixes

src/def.d.ts

@@ -197,6 +197,7 @@ interface Settings {
 
 interface ExtendedVeryPrivateSoonToBeMovedSettings extends Settings {
   developmentBuildEnabled: boolean;
+  __previousCustomLoadUrlConfig?: LoaderConfig['customLoadUrl']
 }
 
 interface ApplicationCommand {
@@ -397,13 +398,6 @@ interface LoaderConfig {
   loadReactDevTools: boolean;
 }
 
-interface ExtendedVeryPrivateSoonToBeMovedLoaderConfig extends LoaderConfig {
-  __previousCustomLoadUrlConfig?: {
-    enabled: boolean;
-    url: string;
-  }
-}
-
 interface LoaderIdentity {
   name: string;
   features: {

src/lib/debug.ts

@@ -1,11 +1,12 @@
 import { DEVELOPMENT_DISTRIBUTION_URL } from "@lib/constants";
 import logger from "@lib/logger";
-import { ClientInfoManager, DeviceManager } from "@lib/native";
+import { BundleUpdaterManager, ClientInfoManager, DeviceManager } from "@lib/native";
 import { after } from "@lib/patcher";
 import settings, { loaderConfig } from "@lib/settings";
 import { getCurrentTheme, selectTheme } from "@lib/themes";
 import { ReactNative as RN } from "@metro/common";
-import { type RNConstants } from "@types";
+import { ButtonColors, type RNConstants } from "@types";
+import { showConfirmationAlert } from '@ui/alerts'
 import { getAssetIDByName } from "@ui/assets";
 import { showToast } from "@ui/toasts";
 import { removeCachedScript } from "./storage";
@@ -141,25 +142,35 @@ export function getDebugInfo() {
   };
 }
 
-export async function setDevelopmentBuildEnabled(enabled: boolean) {
+export async function setDevelopmentBuildEnabled(enabled: boolean, showReloadPopup = true) {
   if (enabled) {
-    loaderConfig.__previousCustomLoadUrlConfig = loaderConfig.customLoadUrl;
+    settings.__previousCustomLoadUrlConfig = loaderConfig.customLoadUrl;
     loaderConfig.customLoadUrl = {
       enabled: true,
       url: DEVELOPMENT_DISTRIBUTION_URL
     };
   } else {
-    const previousConfig = loaderConfig.__previousCustomLoadUrlConfig;
+    const previousConfig = settings.__previousCustomLoadUrlConfig;
     if (previousConfig) loaderConfig.customLoadUrl = previousConfig;
     else
       loaderConfig.customLoadUrl = {
         enabled: false,
         url: "http://localhost:4040/revenge.js"
       };
-    loaderConfig.__previousCustomLoadUrlConfig = undefined;
+    settings.__previousCustomLoadUrlConfig = undefined;
   }
 
   settings.developmentBuildEnabled = enabled;
 
   await removeCachedScript();
+
+  showConfirmationAlert({
+    title: "Reload required",
+    content:
+      "Changes will only apply next time the app launches or reloads.",
+    confirmText: "Reload now",
+    cancelText: "Later",
+    confirmColor: ButtonColors.PRIMARY,
+    onConfirm: BundleUpdaterManager.reload
+  });
 }

src/lib/settings.ts

@@ -4,11 +4,11 @@ import {
   createStorage,
   wrapSync
 } from "@lib/storage";
-import type { ExtendedVeryPrivateSoonToBeMovedLoaderConfig, ExtendedVeryPrivateSoonToBeMovedSettings } from "@types";
+import type { LoaderConfig, ExtendedVeryPrivateSoonToBeMovedSettings } from "@types";
 
 export default wrapSync(
   createStorage<ExtendedVeryPrivateSoonToBeMovedSettings>(createMMKVBackend("VENDETTA_SETTINGS"))
 );
 export const loaderConfig = wrapSync(
-  createStorage<ExtendedVeryPrivateSoonToBeMovedLoaderConfig>(createFileBackend("vendetta_loader.json"))
+  createStorage<LoaderConfig>(createFileBackend("vendetta_loader.json"))
 );

src/ui/settings/pages/Developer.tsx

@@ -13,6 +13,7 @@ import AssetBrowser from "@ui/settings/pages/AssetBrowser";
 const { FormSection, FormRow, FormSwitchRow, FormInput, FormDivider } = Forms;
 const { hideActionSheet } = findByProps("openLazy", "hideActionSheet");
 const { showSimpleActionSheet } = findByProps("showSimpleActionSheet");
+const { TextStyleSheet } = findByProps("TextStyleSheet");
 
 export default function Developer() {
   const navigation = NavigationNative.useNavigation();
@@ -67,8 +68,13 @@ export default function Developer() {
                 onPress={() =>
                   showConfirmationAlert({
                     title: "Stop using development builds?",
-                    content:
-                      "You will revert back to using a stable build of Revenge after next app launch or reload.",
+                    content: [
+                      "To use the ",
+                      <RN.Text style={TextStyleSheet["text-md/semibold"]}>
+                        Load from custom URL
+                      </RN.Text>,
+                      " option, you will have to stop using development builds as it overrides this setting."
+                    ],
                     confirmText: "Revert",
                     cancelText: "Cancel",
                     confirmColor: ButtonColors.PRIMARY,

src/ui/settings/pages/General.tsx

@@ -177,16 +177,14 @@ export default function General() {
         <FormSection title="Advanced">
           <FormSwitchRow
             label="Use Development Builds"
+            sublabel="Use development builds for testing new features or bug fixes, may be unstable."
             leading={
               <FormRow.Icon
                 source={getAssetIDByName("ic_progress_wrench_24px")}
               />
             }
             value={settings.developmentBuildEnabled}
             onValueChange={(v: boolean) => {
-              const callback = () =>
-                setDevelopmentBuildEnabled(v).then(showReloadRequiredAlert);
-
               if (v)
                 showConfirmationAlert({
                   title: "Use development builds?",
@@ -195,9 +193,9 @@ export default function General() {
                   confirmText: "Continue",
                   cancelText: "Nevermind",
                   confirmColor: ButtonColors.RED,
-                  onConfirm: callback
+                  onConfirm: () => setDevelopmentBuildEnabled(v)
                 });
-              else callback()
+              else setDevelopmentBuildEnabled(v)
             }}
           />
           <FormDivider />
@@ -246,15 +244,4 @@ export default function General() {
       </RN.ScrollView>
     </ErrorBoundary>
   );
-}
-
-const showReloadRequiredAlert = () =>
-  showConfirmationAlert({
-    title: "Reload required",
-    content:
-      "Changes will only apply next time the app launches or reloads.",
-    confirmText: "Reload now",
-    cancelText: "Later",
-    confirmColor: ButtonColors.PRIMARY,
-    onConfirm: BundleUpdaterManager.reload
-  });
+};