diff --git a/renderer/src/builtins/addon-manager/commands/list.js b/renderer/src/builtins/addon-manager/commands/list.js index f0365f4c..82bb7d47 100644 --- a/renderer/src/builtins/addon-manager/commands/list.js +++ b/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 => ( ); + /> + )); }} /> diff --git a/renderer/src/builtins/settings/index.js b/renderer/src/builtins/settings/index.js index 60919939..c84b1206 100644 --- a/renderer/src/builtins/settings/index.js +++ b/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(() => DiscordNative.app.relaunch()} - onCancel={closeModal} - > -
- {Messages.VIZALITY_SETTINGS_RESTART} -
-
); + openModal(() => props => ( + + DiscordNative.app.relaunch()} + onCancel={closeModal} + > +
+ {Messages.VIZALITY_SETTINGS_RESTART} +
+
+
+ )); } async patchSettingsContextMenu () { diff --git a/renderer/src/builtins/updater/components/Settings.jsx b/renderer/src/builtins/updater/components/Settings.jsx index 413e89d2..5b15f070 100644 --- a/renderer/src/builtins/updater/components/Settings.jsx +++ b/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 => (