From 401fa6deb5238f1e7634771deed57008b4037bc0 Mon Sep 17 00:00:00 2001
From: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Sat, 15 Jul 2023 01:23:08 +1200
Subject: [PATCH] fix: Misc fixes

---
 invokeai/frontend/web/public/locales/en.json     |  4 ++--
 .../ModelManager/subpanels/MergeModelsPanel.tsx  | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json
index a841cb95f9..a8f52742d4 100644
--- a/invokeai/frontend/web/public/locales/en.json
+++ b/invokeai/frontend/web/public/locales/en.json
@@ -398,8 +398,8 @@
         "delete": "Delete",
         "deleteModel": "Delete Model",
         "deleteConfig": "Delete Config",
-        "deleteMsg1": "Are you sure you want to delete this model entry from InvokeAI?",
-        "deleteMsg2": "This will not delete the model checkpoint file from your disk. You can readd them if you wish to.",
+        "deleteMsg1": "Are you sure you want to delete this model from InvokeAI?",
+        "deleteMsg2": "This WILL delete the model from disk if it is in the InvokeAI root folder. If you are using a custom location, then the model WILL NOT be deleted from disk.",
         "formMessageDiffusersModelLocation": "Diffusers Model Location",
         "formMessageDiffusersModelLocationDesc": "Please enter at least one.",
         "formMessageDiffusersVAELocation": "VAE Location",
diff --git a/invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/MergeModelsPanel.tsx b/invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/MergeModelsPanel.tsx
index d6743fbf07..bf9ede9874 100644
--- a/invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/MergeModelsPanel.tsx
+++ b/invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/MergeModelsPanel.tsx
@@ -30,10 +30,15 @@ const baseModelTypeSelectData = [
   { label: 'Stable Diffusion 2', value: 'sd-2' },
 ];
 
+type MergeInterpolationMethods =
+  | 'weighted_sum'
+  | 'sigmoid'
+  | 'inv_sigmoid'
+  | 'add_difference';
+
 export default function MergeModelsPanel() {
   const { t } = useTranslation();
   const { colorMode } = useColorMode();
-
   const dispatch = useAppDispatch();
 
   const { data } = useGetMainModelsQuery();
@@ -74,9 +79,8 @@ export default function MergeModelsPanel() {
   const [mergedModelName, setMergedModelName] = useState<string>('');
   const [modelMergeAlpha, setModelMergeAlpha] = useState<number>(0.5);
 
-  const [modelMergeInterp, setModelMergeInterp] = useState<
-    'weighted_sum' | 'sigmoid' | 'inv_sigmoid' | 'add_difference'
-  >('weighted_sum');
+  const [modelMergeInterp, setModelMergeInterp] =
+    useState<MergeInterpolationMethods>('weighted_sum');
 
   const [modelMergeSaveLocType, setModelMergeSaveLocType] = useState<
     'root' | 'custom'
@@ -256,9 +260,7 @@ export default function MergeModelsPanel() {
         </Text>
         <RadioGroup
           value={modelMergeInterp}
-          onChange={(
-            v: 'weighted_sum' | 'sigmoid' | 'inv_sigmoid' | 'add_difference'
-          ) => setModelMergeInterp(v)}
+          onChange={(v: MergeInterpolationMethods) => setModelMergeInterp(v)}
         >
           <Flex columnGap={4}>
             {modelThree === null ? (