Merge branch 'feat-disable-plugins' into marios8543/plugin-disable

2 files changed, 16 insertions, 14 deletions

diff --git a/frontend/src/components/settings/pages/plugin_list/index.tsx b/frontend/src/components/settings/pages/plugin_list/index.tsx
index f13cbe2b..da70f4ca 100644
--- a/frontend/src/components/settings/pages/plugin_list/index.tsx
+++ b/frontend/src/components/settings/pages/plugin_list/index.tsx
@@ -83,21 +83,22 @@ function PluginInteractables(props: { entry: ReorderableEntry<PluginTableData> }
         >
           {t('PluginListIndex.uninstall')}
         </MenuItem>
-        {disabled ? <MenuItem
-          onSelected={() =>
-            DeckyPluginLoader.disablePlugin(
-              name,
-              t('PluginLoader.plugin_disable.title', { name }),
-              t('PluginLoader.plugin_disable.button'),
-              t('PluginLoader.plugin_disable.desc', { name }),
-            )
-          }
-        >
-          {t('PluginListIndex.plugin_disable')}
-        </MenuItem> :
+        {disabled ?
           // implement enabler
           <>
-          </>
+          </> :
+          <MenuItem
+            onSelected={() =>
+              DeckyPluginLoader.disablePlugin(
+                name,
+                t('PluginLoader.plugin_disable.title', { name }),
+                t('PluginLoader.plugin_disable.button'),
+                t('PluginLoader.plugin_disable.desc', { name }),
+              )
+            }
+          >
+            {t('PluginListIndex.plugin_disable')}
+          </MenuItem>
         }
         {hidden ? (
           <MenuItem onSelected={onShow}>{t('PluginListIndex.show')}</MenuItem>
diff --git a/frontend/src/plugin-loader.tsx b/frontend/src/plugin-loader.tsx
index 755c4460..36766495 100644
--- a/frontend/src/plugin-loader.tsx
+++ b/frontend/src/plugin-loader.tsx
@@ -39,6 +39,7 @@ import Toaster from './toaster';
 import { getVersionInfo } from './updater';
 import { getSetting, setSetting } from './utils/settings';
 import TranslationHelper, { TranslationClass } from './utils/TranslationHelper';
+import PluginDisablelModal from './components/modals/PluginDisablelModal';
 
 const StorePage = lazy(() => import('./components/store/Store'));
 const SettingsPage = lazy(() => import('./components/settings'));
@@ -342,7 +343,7 @@ class PluginLoader extends Logger {
   }
 
   public disablePlugin(name: string, title: string, buttonText: string, description: string) {
-    showModal(<PluginUninstallModal name={name} title={title} buttonText={buttonText} description={description} />);
+    showModal(<PluginDisablelModal name={name} title={title} buttonText={buttonText} description={description} />);
   }
 
   public hasPlugin(name: string) {