From ee60b1adbcc473ee28f2336108d69a976f60d82f Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Tue, 28 Jul 2026 21:18:40 -0700
Subject: [PATCH] Replace final usage of legacy modal

---
 apps/frontend/src/components/ui/Modal.vue     | 156 ---------------
 .../src/pages/settings/applications.vue       |  72 ++++---
 packages/ui/src/components/modal/Modal.vue    | 184 ------------------
 packages/ui/src/components/modal/index.ts     |   1 -
 packages/ui/src/stories/add-stories.md        |   8 +-
 5 files changed, 38 insertions(+), 383 deletions(-)
 delete mode 100644 apps/frontend/src/components/ui/Modal.vue
 delete mode 100644 packages/ui/src/components/modal/Modal.vue

diff --git a/apps/frontend/src/components/ui/Modal.vue b/apps/frontend/src/components/ui/Modal.vue
deleted file mode 100644
index c6a9aa6657..0000000000
--- a/apps/frontend/src/components/ui/Modal.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-	<div v-if="shown">
-		<div
-			:class="{
-				shown: actuallyShown,
-				noblur: !$orElse(cosmetics.advancedRendering, true),
-			}"
-			class="modal-overlay"
-			@click="hide"
-		/>
-		<div class="modal-container" :class="{ shown: actuallyShown }">
-			<div class="modal-body">
-				<div v-if="header" class="header">
-					<strong>{{ header }}</strong>
-					<ButtonStyled circular type="transparent">
-						<button @click="hide">
-							<XIcon />
-						</button>
-					</ButtonStyled>
-				</div>
-				<div class="content">
-					<slot />
-				</div>
-			</div>
-		</div>
-	</div>
-	<div v-else />
-</template>
-
-<script>
-import { XIcon } from '@modrinth/assets'
-import { ButtonStyled } from '@modrinth/ui'
-
-export default {
-	components: {
-		ButtonStyled,
-		XIcon,
-	},
-	props: {
-		header: {
-			type: String,
-			default: null,
-		},
-	},
-	setup() {
-		const cosmetics = useCosmetics()
-
-		return { cosmetics }
-	},
-	data() {
-		return {
-			shown: false,
-			actuallyShown: false,
-		}
-	},
-	methods: {
-		show() {
-			this.shown = true
-			setTimeout(() => {
-				this.actuallyShown = true
-			}, 50)
-		},
-		hide() {
-			this.actuallyShown = false
-			setTimeout(() => {
-				this.shown = false
-			}, 300)
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.modal-overlay {
-	visibility: hidden;
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 20;
-	transition: all 0.3s ease-in-out;
-
-	&.shown {
-		opacity: 1;
-		visibility: visible;
-		background: hsla(0, 0%, 0%, 0.5);
-		backdrop-filter: blur(3px);
-	}
-
-	&.noblur {
-		backdrop-filter: none;
-	}
-}
-
-.modal-container {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	z-index: 21;
-	visibility: hidden;
-	pointer-events: none;
-
-	&.shown {
-		visibility: visible;
-
-		.modal-body {
-			opacity: 1;
-			visibility: visible;
-			transform: translateY(0);
-		}
-	}
-
-	.modal-body {
-		position: fixed;
-		box-shadow: var(--shadow-raised), var(--shadow-inset);
-		border-radius: var(--size-rounded-lg);
-		max-height: calc(100% - 2 * var(--spacing-card-bg));
-		overflow-y: auto;
-		width: 600px;
-		pointer-events: auto;
-		outline: 3px solid transparent;
-
-		.header {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			background-color: var(--color-bg);
-			padding: var(--spacing-card-md) var(--spacing-card-lg);
-
-			strong {
-				font-size: 1.25rem;
-				margin: 0.67em 0;
-			}
-		}
-
-		.content {
-			background-color: var(--color-raised-bg);
-		}
-
-		transform: translateY(50vh);
-		visibility: hidden;
-		opacity: 0;
-		transition: all 0.25s ease-in-out;
-
-		@media screen and (max-width: 650px) {
-			width: calc(100% - 2 * var(--spacing-card-bg));
-		}
-	}
-}
-</style>
diff --git a/apps/frontend/src/pages/settings/applications.vue b/apps/frontend/src/pages/settings/applications.vue
index 1fb9c6950c..cf85773eb8 100644
--- a/apps/frontend/src/pages/settings/applications.vue
+++ b/apps/frontend/src/pages/settings/applications.vue
@@ -7,10 +7,10 @@
 			:proceed-label="formatMessage(messages.deleteConfirmButton)"
 			@proceed="removeApp(editingId)"
 		/>
-		<Modal ref="appModal" :header="formatMessage(messages.modalHeader)">
-			<div class="universal-modal">
-				<label for="app-name"
-					><span class="label__title">{{ formatMessage(messages.nameLabel) }}</span>
+		<NewModal ref="appModal" :header="formatMessage(messages.modalHeader)" width="40rem" scrollable>
+			<div class="flex flex-col">
+				<label for="app-name" class="m-0 mb-2 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.nameLabel) }}
 				</label>
 				<StyledInput
 					id="app-name"
@@ -19,8 +19,12 @@
 					autocomplete="off"
 					:placeholder="formatMessage(messages.namePlaceholder)"
 				/>
-				<label v-if="editingId" for="app-icon"
-					><span class="label__title">{{ formatMessage(messages.iconLabel) }}</span>
+				<label
+					v-if="editingId"
+					for="app-icon"
+					class="mb-2 mt-4 text-lg font-semibold text-contrast"
+				>
+					{{ formatMessage(messages.iconLabel) }}
 				</label>
 				<div v-if="editingId" class="icon-submission">
 					<Avatar size="md" :src="icon" />
@@ -36,8 +40,8 @@
 						</FileInput>
 					</ButtonStyled>
 				</div>
-				<label v-if="editingId" for="app-url">
-					<span class="label__title">{{ formatMessage(messages.urlLabel) }}</span>
+				<label v-if="editingId" for="app-url" class="mb-2 mt-4 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.urlLabel) }}
 				</label>
 				<StyledInput
 					v-if="editingId"
@@ -48,8 +52,12 @@
 					autocomplete="off"
 					:placeholder="formatMessage(messages.urlPlaceholder)"
 				/>
-				<label v-if="editingId" for="app-description">
-					<span class="label__title">{{ formatMessage(messages.descriptionLabel) }}</span>
+				<label
+					v-if="editingId"
+					for="app-description"
+					class="mb-2 mt-4 text-lg font-semibold text-contrast"
+				>
+					{{ formatMessage(messages.descriptionLabel) }}
 				</label>
 				<StyledInput
 					v-if="editingId"
@@ -61,15 +69,12 @@
 					:placeholder="formatMessage(messages.descriptionPlaceholder)"
 					input-class="h-24 resize-y"
 				/>
-				<label for="app-scopes"
-					><span class="label__title">{{ formatMessage(messages.scopesLabel) }}</span>
+				<label for="app-scopes" class="mb-2 mt-4 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.scopesLabel) }}
 				</label>
-				<div
-					id="app-scopes"
-					class="scope-items mt-2 grid grid-cols-1 gap-x-6 gap-y-4 min-[600px]:grid-cols-2"
-				>
+				<div id="app-scopes" class="scope-items grid grid-cols-1 gap-6 min-[600px]:grid-cols-2">
 					<div v-for="category in scopeCategories" :key="category.name" class="flex flex-col gap-2">
-						<h4 class="m-0 border-b border-divider pb-1 text-base font-bold text-contrast">
+						<h4 class="m-0 text-base font-medium text-primary">
 							{{ category.name }}
 						</h4>
 						<div class="flex flex-col gap-2">
@@ -83,8 +88,8 @@
 						</div>
 					</div>
 				</div>
-				<label for="app-redirect-uris" class="mt-4"
-					><span class="label__title">{{ formatMessage(messages.redirectUrisLabel) }}</span>
+				<label for="app-redirect-uris" class="mb-2 mt-4 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.redirectUrisLabel) }}
 				</label>
 				<div class="uri-input-list">
 					<div v-for="(_, index) in redirectUris" :key="index">
@@ -93,6 +98,7 @@
 								v-model="redirectUris[index]"
 								:maxlength="2048"
 								type="url"
+								class="w-80"
 								autocomplete="off"
 								:placeholder="formatMessage(messages.redirectUriPlaceholder)"
 							/>
@@ -116,18 +122,20 @@
 						</ButtonStyled>
 					</div>
 				</div>
+			</div>
 
-				<div class="submit-row input-group push-right">
+			<template #actions>
+				<div class="flex justify-end gap-2 p-2">
 					<ButtonStyled>
 						<button @click="$refs.appModal.hide()">
 							<XIcon />
-							{{ formatMessage(messages.cancel) }}
+							{{ formatMessage(commonMessages.cancelButton) }}
 						</button>
 					</ButtonStyled>
 					<ButtonStyled v-if="editingId" color="brand">
 						<button :disabled="!canSubmit" @click="editApp">
 							<SaveIcon />
-							{{ formatMessage(messages.saveChanges) }}
+							{{ formatMessage(commonMessages.saveChangesButton) }}
 						</button>
 					</ButtonStyled>
 					<ButtonStyled v-else color="brand">
@@ -137,8 +145,8 @@
 						</button>
 					</ButtonStyled>
 				</div>
-			</div>
-		</Modal>
+			</template>
+		</NewModal>
 
 		<div class="header__row">
 			<div class="header__title">
@@ -220,7 +228,7 @@
 						"
 					>
 						<EditIcon />
-						{{ formatMessage(messages.edit) }}
+						{{ formatMessage(commonMessages.editButton) }}
 					</button>
 				</ButtonStyled>
 				<ButtonStyled color="red">
@@ -255,6 +263,7 @@ import {
 	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
+	NewModal,
 	normalizeChildren,
 	StyledInput,
 	useFormatDateTime,
@@ -262,7 +271,6 @@ import {
 } from '@modrinth/ui'
 import { useQuery } from '@tanstack/vue-query'
 
-import Modal from '~/components/ui/Modal.vue'
 import {
 	getScopeValue,
 	hasScope,
@@ -355,14 +363,6 @@ const messages = defineMessages({
 		id: 'settings.applications.button.add-redirect-uri',
 		defaultMessage: 'Add a redirect URI',
 	},
-	cancel: {
-		id: 'settings.applications.button.cancel',
-		defaultMessage: 'Cancel',
-	},
-	saveChanges: {
-		id: 'settings.applications.button.save-changes',
-		defaultMessage: 'Save changes',
-	},
 	createApp: {
 		id: 'settings.applications.button.create',
 		defaultMessage: 'Create app',
@@ -396,10 +396,6 @@ const messages = defineMessages({
 		id: 'settings.applications.created-on',
 		defaultMessage: 'Created on {date}',
 	},
-	edit: {
-		id: 'settings.applications.button.edit',
-		defaultMessage: 'Edit',
-	},
 	delete: {
 		id: 'settings.applications.button.delete',
 		defaultMessage: 'Delete',
diff --git a/packages/ui/src/components/modal/Modal.vue b/packages/ui/src/components/modal/Modal.vue
deleted file mode 100644
index c3fa0f4089..0000000000
--- a/packages/ui/src/components/modal/Modal.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-	<div v-if="shown">
-		<div
-			:class="{ shown: actuallyShown }"
-			class="tauri-overlay"
-			data-tauri-drag-region
-			@click="() => (closable ? hide() : {})"
-		/>
-		<div
-			:class="{
-				shown: actuallyShown,
-				noblur: props.noblur,
-			}"
-			class="modal-overlay"
-			@click="() => (closable ? hide() : {})"
-		/>
-		<div class="modal-container" :class="{ shown: actuallyShown }">
-			<div class="modal-body">
-				<div v-if="props.header" class="header">
-					<h1>{{ props.header }}</h1>
-					<button v-if="closable" class="btn icon-only transparent" @click="hide">
-						<XIcon />
-					</button>
-				</div>
-				<div class="content">
-					<slot />
-				</div>
-			</div>
-		</div>
-	</div>
-	<div v-else></div>
-</template>
-
-<script setup>
-import { XIcon } from '@modrinth/assets'
-import { ref } from 'vue'
-
-const props = defineProps({
-	header: {
-		type: String,
-		default: null,
-	},
-	noblur: {
-		type: Boolean,
-		default: false,
-	},
-	closable: {
-		type: Boolean,
-		default: true,
-	},
-	onHide: {
-		type: Function,
-		default() {
-			return () => {}
-		},
-	},
-})
-
-const shown = ref(false)
-const actuallyShown = ref(false)
-
-function show() {
-	shown.value = true
-	setTimeout(() => {
-		actuallyShown.value = true
-	}, 50)
-}
-
-function hide() {
-	props.onHide?.()
-	actuallyShown.value = false
-	setTimeout(() => {
-		shown.value = false
-	}, 300)
-}
-
-defineExpose({
-	show,
-	hide,
-})
-</script>
-
-<style lang="scss" scoped>
-.tauri-overlay {
-	position: fixed;
-	visibility: hidden;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100px;
-	z-index: 20;
-
-	&.shown {
-		opacity: 1;
-		visibility: visible;
-	}
-}
-
-.modal-overlay {
-	visibility: hidden;
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 19;
-	transition: all 0.3s ease-in-out;
-
-	@media (prefers-reduced-motion) {
-		transition: none !important;
-	}
-
-	&.shown {
-		opacity: 1;
-		visibility: visible;
-		background: hsla(0, 0%, 0%, 0.5);
-		backdrop-filter: blur(3px);
-	}
-
-	&.noblur {
-		backdrop-filter: none;
-	}
-}
-
-.modal-container {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	z-index: 21;
-	visibility: hidden;
-	pointer-events: none;
-
-	&.shown {
-		visibility: visible;
-		.modal-body {
-			opacity: 1;
-			visibility: visible;
-			transform: translateY(0);
-		}
-	}
-
-	.modal-body {
-		position: fixed;
-		box-shadow: var(--shadow-raised), var(--shadow-inset);
-		border-radius: var(--radius-lg);
-		background-color: var(--color-raised-bg);
-		max-height: calc(100% - 2 * var(--gap-lg));
-		overflow-y: visible;
-		width: 600px;
-		pointer-events: auto;
-
-		.header {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			background-color: var(--color-bg);
-			padding: var(--gap-md) var(--gap-lg);
-
-			h1 {
-				font-weight: bold;
-				font-size: 1.25rem;
-			}
-		}
-
-		transform: translateY(50vh);
-		visibility: hidden;
-		opacity: 0;
-		transition: all 0.25s ease-in-out;
-
-		@media (prefers-reduced-motion) {
-			transition: none !important;
-		}
-
-		@media screen and (max-width: 650px) {
-			width: calc(100% - 2 * var(--gap-lg));
-		}
-	}
-}
-</style>
diff --git a/packages/ui/src/components/modal/index.ts b/packages/ui/src/components/modal/index.ts
index d85ee9c88a..4f27f8c31c 100644
--- a/packages/ui/src/components/modal/index.ts
+++ b/packages/ui/src/components/modal/index.ts
@@ -1,6 +1,5 @@
 export { default as ConfirmLeaveModal } from './ConfirmLeaveModal.vue'
 export { default as ConfirmModal } from './ConfirmModal.vue'
-export { default as Modal } from './Modal.vue'
 export { default as NewModal } from './NewModal.vue'
 export type { ServerProject as OpenInAppModalServerProject } from './OpenInAppModal.vue'
 export { default as OpenInAppModal } from './OpenInAppModal.vue'
diff --git a/packages/ui/src/stories/add-stories.md b/packages/ui/src/stories/add-stories.md
index 04b775ea5a..19f83c3ba9 100644
--- a/packages/ui/src/stories/add-stories.md
+++ b/packages/ui/src/stories/add-stories.md
@@ -153,9 +153,9 @@ For components that need user interaction to show:
 ```typescript
 export const Default: Story = {
 	render: () => ({
-		components: { Modal, ButtonStyled },
+		components: { NewModal, ButtonStyled },
 		setup() {
-			const modalRef = ref<InstanceType<typeof Modal> | null>(null)
+			const modalRef = ref<InstanceType<typeof NewModal> | null>(null)
 			return { modalRef }
 		},
 		template: /* html */ `
@@ -163,9 +163,9 @@ export const Default: Story = {
                 <ButtonStyled @click="modalRef?.show()">
                     <button>Open Modal</button>
                 </ButtonStyled>
-                <Modal ref="modalRef" header="Example Modal">
+                <NewModal ref="modalRef" header="Example Modal">
                     <p>Modal content</p>
-                </Modal>
+                </NewModal>
             </div>
         `,
 	}),