update some leftover old modal stuff

renderer/src/builtins/addon-manager/commands/list.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { LazyImageZoomable, ImageModal, Tooltip, Anchor } from '@vizality/components';
 import { toPlural, toTitleCase } from '@vizality/util/string';
 import { getMediaDimensions } from '@vizality/util/file';
-import { open as openModal } from '@vizality/modal';
+import { openModal } from '@vizality/modal';
 
 export default {
   command: 'list',
@@ -51,12 +51,14 @@ export default {
               shouldLink={false}
               onClick={async () => {
                 const albumDimensions = await getMediaDimensions(addon.manifest.icon);
-                openModal(() =>
+                openModal(() => props => (
                   <ImageModal
+                    {...props}
                     src={addon.manifest.icon}
                     width={albumDimensions.width}
                     height={albumDimensions.height}
-                  />);
+                  />
+                ));
               }}
             />
             <Tooltip text={addonId}>

renderer/src/builtins/settings/index.js

@@ -1,9 +1,9 @@
-import { open as openModal, close as closeModal } from '@vizality/modal';
+import { openModal, closeModal } from '@vizality/modal';
 import { getModuleByDisplayName, getModule, instance } from '@vizality/webpack';
 import { SettingsContextMenu } from '@vizality/components/vizality';
 import { Content, Layout } from '@vizality/components/dashboard';
 import { toPlural, toTitleCase } from '@vizality/util/string';
-import { Confirm, ContextMenu } from '@vizality/components';
+import { Confirm, ContextMenu, Modal } from '@vizality/components';
 import { joinClassNames } from '@vizality/util/dom';
 import { patch, unpatch } from '@vizality/patcher';
 import { Builtin } from '@vizality/entities';
@@ -164,18 +164,23 @@ export default class Settings extends Builtin {
     const { spacing } = getModule('spacing', 'message');
     const { size16 } = getModule('size16');
 
-    openModal(() => <Confirm
-      red
-      header={Messages.ERRORS_RESTART_APP}
-      confirmText={Messages.BUNDLE_READY_RESTART}
-      cancelText={Messages.BUNDLE_READY_LATER}
-      onConfirm={() => DiscordNative.app.relaunch()}
-      onCancel={closeModal}
-    >
-      <div className={joinClassNames(colorStandard, spacing, size16)}>
-        {Messages.VIZALITY_SETTINGS_RESTART}
-      </div>
-    </Confirm>);
+    openModal(() => props => (
+      <Modal.Root {...props}>
+        <Confirm
+          {...props}
+          red
+          header={Messages.ERRORS_RESTART_APP}
+          confirmText={Messages.BUNDLE_READY_RESTART}
+          cancelText={Messages.BUNDLE_READY_LATER}
+          onConfirm={() => DiscordNative.app.relaunch()}
+          onCancel={closeModal}
+        >
+          <div className={joinClassNames(colorStandard, spacing, size16)}>
+            {Messages.VIZALITY_SETTINGS_RESTART}
+          </div>
+        </Confirm>
+      </Modal.Root>
+    ));
   }
 
   async patchSettingsContextMenu () {

renderer/src/builtins/updater/components/Settings.jsx

@@ -1,6 +1,6 @@
 import { SwitchItem, TextInput, Category, FormTitle } from '@vizality/components/settings';
 import { Confirm, Button, FormNotice } from '@vizality/components';
-import { open as openModal, close as closeModal } from '@vizality/modal';
+import { openModal, closeModal } from '@vizality/modal';
 import { Repositories } from '@vizality/constants';
 import React, { useEffect, memo } from 'react';
 import { Messages } from '@vizality/i18n';
@@ -145,8 +145,9 @@ export default memo(({ getSetting, toggleSetting, updateSetting }) => {
     const { colorStandard } = getModule('colorStandard');
     const { spacing } = getModule('spacing', 'message');
     const { size16 } = getModule('size16');
-    openModal(() => (
+    openModal(() => props => (
       <Confirm
+        {...props}
         header={title}
         confirmText={confirm}
         cancelText={Messages.CANCEL}

renderer/src/modules/components/Changelog.jsx

@@ -4,7 +4,7 @@ import cp from 'child_process';
 import { promises } from 'fs';
 import { join } from 'path';
 
-import { open as openModal, close as closeModal } from '@vizality/modal';
+import { openModal, closeModal } from '@vizality/modal';
 import { getModule, getModuleByDisplayName } from '@vizality/webpack';
 import { joinClassNames } from '@vizality/util/dom';
 import { Directories } from '@vizality/constants';