From 607c42cf01c1c85c5fce2ac5bec779537810275f Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Wed, 2 Jul 2025 15:51:06 -0500
Subject: [PATCH 01/31] Make theseus capable of logging messages from the `log`
 crate

---
 packages/app-lib/src/logger.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/app-lib/src/logger.rs b/packages/app-lib/src/logger.rs
index 30f0305314..5efcdc0983 100644
--- a/packages/app-lib/src/logger.rs
+++ b/packages/app-lib/src/logger.rs
@@ -25,12 +25,11 @@ pub fn start_logger() -> Option<()> {
         .unwrap_or_else(|_| {
             tracing_subscriber::EnvFilter::new("theseus=info,theseus_gui=info")
         });
-    let subscriber = tracing_subscriber::registry()
+    tracing_subscriber::registry()
         .with(tracing_subscriber::fmt::layer())
         .with(filter)
-        .with(tracing_error::ErrorLayer::default());
-    tracing::subscriber::set_global_default(subscriber)
-        .expect("setting default subscriber failed");
+        .with(tracing_error::ErrorLayer::default())
+        .init();
     Some(())
 }
 
@@ -76,7 +75,7 @@ pub fn start_logger() -> Option<()> {
     let filter = tracing_subscriber::EnvFilter::try_from_default_env()
         .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("theseus=info"));
 
-    let subscriber = tracing_subscriber::registry()
+    tracing_subscriber::registry()
         .with(
             tracing_subscriber::fmt::layer()
                 .with_writer(file)
@@ -84,10 +83,8 @@ pub fn start_logger() -> Option<()> {
                 .with_timer(ChronoLocal::rfc_3339()),
         )
         .with(filter)
-        .with(tracing_error::ErrorLayer::default());
-
-    tracing::subscriber::set_global_default(subscriber)
-        .expect("Setting default subscriber failed");
+        .with(tracing_error::ErrorLayer::default())
+        .init();
 
     Some(())
 }

From e59dd086fc2ac1eb9be4970707f17196cfd3a597 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Thu, 3 Jul 2025 12:43:13 -0500
Subject: [PATCH 02/31] Move update checking entirely into JS and open a modal
 if an update is available

---
 apps/app-frontend/src/App.vue                 | 34 +++++++--
 .../src/components/ui/UpdateModal.vue         | 37 +++++++++
 apps/app-frontend/src/helpers/utils.js        |  4 +
 apps/app/src/main.rs                          | 76 ++-----------------
 4 files changed, 77 insertions(+), 74 deletions(-)
 create mode 100644 apps/app-frontend/src/components/ui/UpdateModal.vue

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 1bc25942c7..6b1a389049 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, onUnmounted, ref, watch, provide } from 'vue'
+import { computed, onMounted, onUnmounted, ref, watch, useTemplateRef, provide } from 'vue'
 import { RouterView, useRoute, useRouter } from 'vue-router'
 import {
   ArrowBigUpDashIcon,
@@ -42,7 +42,7 @@ import ModrinthLoadingIndicator from '@/components/LoadingIndicatorBar.vue'
 import { handleError, useNotifications } from '@/store/notifications.js'
 import { command_listener, warning_listener } from '@/helpers/events.js'
 import { type } from '@tauri-apps/plugin-os'
-import { getOS, isDev, restartApp } from '@/helpers/utils.js'
+import {areUpdatesEnabled, getOS, isDev, restartApp} from '@/helpers/utils.js'
 import { debugAnalytics, initAnalytics, optOutAnalytics, trackEvent } from '@/helpers/analytics'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 import { getVersion } from '@tauri-apps/api/app'
@@ -69,6 +69,7 @@ import { hide_ads_window, init_ads_window } from '@/helpers/ads.js'
 import FriendsList from '@/components/ui/friends/FriendsList.vue'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
+import UpdateModal from "@/components/ui/UpdateModal.vue";
 import { get_available_capes, get_available_skins } from './helpers/skins'
 import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer'
 
@@ -209,7 +210,6 @@ async function setupApp() {
     })
 
   get_opening_command().then(handleCommand)
-  checkUpdates()
   fetchCredentials()
 
   try {
@@ -347,15 +347,34 @@ async function handleCommand(e) {
 }
 
 const updateAvailable = ref(false)
+const updateModal = useTemplateRef('updateModal')
 async function checkUpdates() {
-  const update = await check()
-  updateAvailable.value = !!update
+  if (!await areUpdatesEnabled()) {
+    console.log('Skipping update check as updates are disabled in this build')
+    return
+  }
+
+  async function performCheck() {
+    if (updateModal.value.isOpen) {
+      console.log('Skipping update check because the update modal is already open')
+      return
+    }
 
+    const update = await check()
+    updateAvailable.value = !!update
+    if (updateAvailable.value) {
+      console.log(`Update ${update.version} is available. Showing update modal.`)
+      updateModal.value.show()
+    }
+  }
+
+  await performCheck()
   setTimeout(
     () => {
       checkUpdates()
     },
-    5 * 1000 * 60,
+    // 5 * 60 * 1000,
+    30 * 1000,
   )
 }
 
@@ -399,6 +418,9 @@ function handleAuxClick(e) {
   <SplashScreen v-if="!stateFailed" ref="splashScreen" data-tauri-drag-region />
   <div id="teleports"></div>
   <div v-if="stateInitialized" class="app-grid-layout experimental-styles-within relative">
+    <Suspense @resolve="checkUpdates">
+      <UpdateModal ref="updateModal" />
+    </Suspense>
     <Suspense>
       <AppSettingsModal ref="settingsModal" />
     </Suspense>
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
new file mode 100644
index 0000000000..4dd77b93c3
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -0,0 +1,37 @@
+<template>
+  <ModalWrapper
+    ref="modal"
+    :header="header"
+  >
+  </ModalWrapper>
+</template>
+
+<script setup lang="ts">
+import ModalWrapper from "@/components/ui/modal/ModalWrapper.vue";
+import {defineMessage, useVIntl} from "@vintl/vintl";
+import {computed, useTemplateRef, ref} from 'vue';
+
+const {formatMessage} = useVIntl();
+
+const headerMessage = defineMessage({
+  id: 'app.update.modal-header',
+  defaultMessage: `An update is available!`,
+})
+const header = computed(() => formatMessage(headerMessage))
+
+const modal = useTemplateRef('modal')
+const isOpen = ref(false)
+function show() {
+  modal.value.show()
+  isOpen.value = true
+}
+function hide() {
+  modal.value.hide()
+  isOpen.value = false
+}
+
+defineExpose({ show, isOpen })
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index 89ebd52bad..554636dda4 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -5,6 +5,10 @@ export async function isDev() {
   return await invoke('is_dev')
 }
 
+export async function areUpdatesEnabled() {
+  return await invoke('are_updates_enabled')
+}
+
 // One of 'Windows', 'Linux', 'MacOS'
 export async function getOS() {
   return await invoke('plugin:utils|get_os')
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index b6b00ea815..07e9da0c6a 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -21,75 +21,9 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
     tracing::info!("Initializing app event state...");
     theseus::EventState::init(app.clone()).await?;
 
-    #[cfg(feature = "updater")]
-    'updater: {
-        if env::var("MODRINTH_EXTERNAL_UPDATE_PROVIDER").is_ok() {
-            State::init().await?;
-            break 'updater;
-        }
-
-        use tauri_plugin_updater::UpdaterExt;
-
-        let updater = app.updater_builder().build()?;
-
-        let update_fut = updater.check();
-
-        tracing::info!("Initializing app state...");
-        State::init().await?;
-
-        let check_bar = theseus::init_loading(
-            theseus::LoadingBarType::CheckingForUpdates,
-            1.0,
-            "Checking for updates...",
-        )
-        .await?;
-
-        tracing::info!("Checking for updates...");
-        let update = update_fut.await;
-
-        drop(check_bar);
-
-        if let Some(update) = update.ok().flatten() {
-            tracing::info!("Update found: {:?}", update.download_url);
-            let loader_bar_id = theseus::init_loading(
-                theseus::LoadingBarType::LauncherUpdate {
-                    version: update.version.clone(),
-                    current_version: update.current_version.clone(),
-                },
-                1.0,
-                "Updating Modrinth App...",
-            )
-            .await?;
-
-            // 100 MiB
-            const DEFAULT_CONTENT_LENGTH: u64 = 1024 * 1024 * 100;
-
-            update
-                .download_and_install(
-                    |chunk_length, content_length| {
-                        let _ = theseus::emit_loading(
-                            &loader_bar_id,
-                            (chunk_length as f64)
-                                / (content_length
-                                    .unwrap_or(DEFAULT_CONTENT_LENGTH)
-                                    as f64),
-                            None,
-                        );
-                    },
-                    || {},
-                )
-                .await?;
-
-            app.restart();
-        }
-    }
-
-    #[cfg(not(feature = "updater"))]
-    {
-        State::init().await?;
-    }
+    tracing::info!("Initializing app state...");
+    State::init().await?;
 
-    tracing::info!("Finished checking for updates!");
     let state = State::get().await?;
     app.asset_protocol_scope()
         .allow_directory(state.directories.caches_dir(), true)?;
@@ -125,6 +59,11 @@ fn is_dev() -> bool {
     cfg!(debug_assertions)
 }
 
+#[tauri::command]
+fn are_updates_enabled() -> bool {
+    cfg!(feature = "updater")
+}
+
 // Toggles decorations
 #[tauri::command]
 async fn toggle_decorations(b: bool, window: tauri::Window) -> api::Result<()> {
@@ -264,6 +203,7 @@ fn main() {
         .invoke_handler(tauri::generate_handler![
             initialize_state,
             is_dev,
+            are_updates_enabled,
             toggle_decorations,
             show_window,
             restart_app,

From 36cb3f16860172291fb2012581cf3d64a33497f6 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Thu, 3 Jul 2025 13:01:14 -0500
Subject: [PATCH 03/31] Fix formatjs on Windows and run formatjs

---
 apps/app-frontend/package.json                 | 2 +-
 apps/app-frontend/src/locales/en-US/index.json | 3 +++
 apps/frontend/package.json                     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json
index b58e635533..77a697c216 100644
--- a/apps/app-frontend/package.json
+++ b/apps/app-frontend/package.json
@@ -9,7 +9,7 @@
     "tsc:check": "vue-tsc --noEmit",
     "lint": "eslint . && prettier --check .",
     "fix": "eslint . --fix && prettier --write .",
-    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/helpers,src/pages,src/store}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace",
+    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/helpers,src/pages,src/store}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore \"**/*.d.ts\" --ignore node_modules --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace",
     "test": "vue-tsc --noEmit"
   },
   "dependencies": {
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index fa2563da9b..0ed5424ddd 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -20,6 +20,9 @@
   "app.settings.tabs.resource-management": {
     "message": "Resource management"
   },
+  "app.update.modal-header": {
+    "message": "An update is available!"
+  },
   "instance.add-server.add-and-play": {
     "message": "Add and play"
   },
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 3c395e55c5..334c6317a1 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -10,7 +10,7 @@
     "postinstall": "nuxi prepare",
     "lint": "eslint . && prettier --check .",
     "fix": "eslint . --fix && prettier --write .",
-    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/layouts,src/middleware,src/modules,src/pages,src/plugins,src/utils}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" \"src/error.vue\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace",
+    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/layouts,src/middleware,src/modules,src/pages,src/plugins,src/utils}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" \"src/error.vue\" --ignore \"**/*.d.ts\" --ignore node_modules --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace",
     "test": "nuxi build"
   },
   "devDependencies": {

From 35aea3cab26cee561dec48b430c3933915de34cb Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Thu, 3 Jul 2025 13:43:13 -0500
Subject: [PATCH 04/31] Add in the buttons and body

---
 apps/app-frontend/src/App.vue                 |  2 +-
 .../src/components/ui/UpdateModal.vue         | 64 ++++++++++++++++---
 .../app-frontend/src/locales/en-US/index.json | 12 ++++
 packages/assets/generated-icons.ts            |  2 +
 packages/assets/icons/refresh-cw.svg          |  1 +
 5 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 packages/assets/icons/refresh-cw.svg

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 6b1a389049..c9ac718723 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -364,7 +364,7 @@ async function checkUpdates() {
     updateAvailable.value = !!update
     if (updateAvailable.value) {
       console.log(`Update ${update.version} is available. Showing update modal.`)
-      updateModal.value.show()
+      updateModal.value.show(update)
     }
   }
 
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 4dd77b93c3..b6bf0539ce 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -1,32 +1,76 @@
 <template>
   <ModalWrapper
     ref="modal"
-    :header="header"
+    :header="formatMessage(messages.header)"
   >
+    <div>{{ formatMessage(messages.body, { version: update!.version }) }}</div>
+    <div class="mt-4 flex flex-wrap gap-2">
+      <ButtonStyled color="green">
+        <button>
+          <RefreshCwIcon />
+          {{ formatMessage(messages.restartNow) }}
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button @click="hide()">
+          {{ formatMessage(messages.later) }}
+        </button>
+      </ButtonStyled>
+      <ButtonStyled>
+        <button>
+          {{ formatMessage(messages.skip) }}
+        </button>
+      </ButtonStyled>
+    </div>
   </ModalWrapper>
 </template>
 
 <script setup lang="ts">
 import ModalWrapper from "@/components/ui/modal/ModalWrapper.vue";
-import {defineMessage, useVIntl} from "@vintl/vintl";
-import {computed, useTemplateRef, ref} from 'vue';
+import {defineMessages, useVIntl} from "@vintl/vintl";
+import {useTemplateRef, ref} from 'vue';
+import {Update} from "@tauri-apps/plugin-updater";
+import {ButtonStyled} from "@modrinth/ui";
+import {RefreshCwIcon} from "@modrinth/assets";
 
 const {formatMessage} = useVIntl();
 
-const headerMessage = defineMessage({
-  id: 'app.update.modal-header',
-  defaultMessage: `An update is available!`,
+const messages = defineMessages({
+  header: {
+    id: 'app.update.modal-header',
+    defaultMessage: 'An update is available!',
+  },
+  body: {
+    id: 'app.update.modal-body',
+    defaultMessage: 'Version {version} of the Modrinth App is available for installation.',
+  },
+  restartNow: {
+    id: 'app.update.restart',
+    defaultMessage: 'Restart Now',
+  },
+  later: {
+    id: 'app.update.later',
+    defaultMessage: 'Later',
+  },
+  skip: {
+    id: 'app.update.skip',
+    defaultMessage: 'Skip This Update',
+  },
 })
-const header = computed(() => formatMessage(headerMessage))
+
+const update = ref<Update>();
 
 const modal = useTemplateRef('modal')
 const isOpen = ref(false)
-function show() {
-  modal.value.show()
+
+function show(newUpdate: Update) {
+  update.value = newUpdate;
+  modal.value!.show()
   isOpen.value = true
 }
+
 function hide() {
-  modal.value.hide()
+  modal.value!.hide()
   isOpen.value = false
 }
 
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 0ed5424ddd..a4133002e4 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -20,9 +20,21 @@
   "app.settings.tabs.resource-management": {
     "message": "Resource management"
   },
+  "app.update.later": {
+    "message": "Later"
+  },
+  "app.update.modal-body": {
+    "message": "Version {version} of the Modrinth App is available for installation."
+  },
   "app.update.modal-header": {
     "message": "An update is available!"
   },
+  "app.update.restart": {
+    "message": "Restart Now"
+  },
+  "app.update.skip": {
+    "message": "Skip This Update"
+  },
   "instance.add-server.add-and-play": {
     "message": "Add and play"
   },
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index 9a76fc2cf1..bee0820b19 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -129,6 +129,7 @@ import _RadioButtonCheckedIcon from './icons/radio-button-checked.svg?component'
 import _RadioButtonIcon from './icons/radio-button.svg?component'
 import _ReceiptTextIcon from './icons/receipt-text.svg?component'
 import _RedoIcon from './icons/redo.svg?component'
+import _RefreshCwIcon from './icons/refresh-cw.svg?component'
 import _ReplyIcon from './icons/reply.svg?component'
 import _ReportIcon from './icons/report.svg?component'
 import _RestoreIcon from './icons/restore.svg?component'
@@ -316,6 +317,7 @@ export const RadioButtonCheckedIcon = _RadioButtonCheckedIcon
 export const RadioButtonIcon = _RadioButtonIcon
 export const ReceiptTextIcon = _ReceiptTextIcon
 export const RedoIcon = _RedoIcon
+export const RefreshCwIcon = _RefreshCwIcon
 export const ReplyIcon = _ReplyIcon
 export const ReportIcon = _ReportIcon
 export const RestoreIcon = _RestoreIcon
diff --git a/packages/assets/icons/refresh-cw.svg b/packages/assets/icons/refresh-cw.svg
new file mode 100644
index 0000000000..b0edef949c
--- /dev/null
+++ b/packages/assets/icons/refresh-cw.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-refresh-cw-icon lucide-refresh-cw"><path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8"/><path d="M21 3v5h-5"/><path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16"/><path d="M8 16H3v5"/></svg>
\ No newline at end of file

From 523800ea39bafe31c2904dfccabe9ff742a89e43 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Thu, 3 Jul 2025 15:23:28 -0500
Subject: [PATCH 05/31] Fix lint

---
 apps/app-frontend/src/App.vue                 |  6 ++---
 .../src/components/ui/UpdateModal.vue         | 26 ++++++++-----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index c9ac718723..42b60534f0 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -42,7 +42,7 @@ import ModrinthLoadingIndicator from '@/components/LoadingIndicatorBar.vue'
 import { handleError, useNotifications } from '@/store/notifications.js'
 import { command_listener, warning_listener } from '@/helpers/events.js'
 import { type } from '@tauri-apps/plugin-os'
-import {areUpdatesEnabled, getOS, isDev, restartApp} from '@/helpers/utils.js'
+import { areUpdatesEnabled, getOS, isDev, restartApp } from '@/helpers/utils.js'
 import { debugAnalytics, initAnalytics, optOutAnalytics, trackEvent } from '@/helpers/analytics'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 import { getVersion } from '@tauri-apps/api/app'
@@ -69,7 +69,7 @@ import { hide_ads_window, init_ads_window } from '@/helpers/ads.js'
 import FriendsList from '@/components/ui/friends/FriendsList.vue'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
-import UpdateModal from "@/components/ui/UpdateModal.vue";
+import UpdateModal from '@/components/ui/UpdateModal.vue'
 import { get_available_capes, get_available_skins } from './helpers/skins'
 import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer'
 
@@ -349,7 +349,7 @@ async function handleCommand(e) {
 const updateAvailable = ref(false)
 const updateModal = useTemplateRef('updateModal')
 async function checkUpdates() {
-  if (!await areUpdatesEnabled()) {
+  if (!(await areUpdatesEnabled())) {
     console.log('Skipping update check as updates are disabled in this build')
     return
   }
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index b6bf0539ce..5ae0436094 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -1,8 +1,5 @@
 <template>
-  <ModalWrapper
-    ref="modal"
-    :header="formatMessage(messages.header)"
-  >
+  <ModalWrapper ref="modal" :header="formatMessage(messages.header)">
     <div>{{ formatMessage(messages.body, { version: update!.version }) }}</div>
     <div class="mt-4 flex flex-wrap gap-2">
       <ButtonStyled color="green">
@@ -26,14 +23,14 @@
 </template>
 
 <script setup lang="ts">
-import ModalWrapper from "@/components/ui/modal/ModalWrapper.vue";
-import {defineMessages, useVIntl} from "@vintl/vintl";
-import {useTemplateRef, ref} from 'vue';
-import {Update} from "@tauri-apps/plugin-updater";
-import {ButtonStyled} from "@modrinth/ui";
-import {RefreshCwIcon} from "@modrinth/assets";
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import { defineMessages, useVIntl } from '@vintl/vintl'
+import { useTemplateRef, ref } from 'vue'
+import type { Update } from '@tauri-apps/plugin-updater'
+import { ButtonStyled } from '@modrinth/ui'
+import { RefreshCwIcon } from '@modrinth/assets'
 
-const {formatMessage} = useVIntl();
+const { formatMessage } = useVIntl()
 
 const messages = defineMessages({
   header: {
@@ -58,13 +55,13 @@ const messages = defineMessages({
   },
 })
 
-const update = ref<Update>();
+const update = ref<Update>()
 
 const modal = useTemplateRef('modal')
 const isOpen = ref(false)
 
 function show(newUpdate: Update) {
-  update.value = newUpdate;
+  update.value = newUpdate
   modal.value!.show()
   isOpen.value = true
 }
@@ -77,5 +74,4 @@ function hide() {
 defineExpose({ show, isOpen })
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

From 52d6bf390727c18fc6f2035d0211cb2333efa5ad Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Mon, 7 Jul 2025 12:26:53 -0500
Subject: [PATCH 06/31] Show update size in modal

---
 apps/app-frontend/src/App.vue                 |  2 +-
 .../src/components/ui/UpdateModal.vue         | 41 ++++++++++++---
 apps/app-frontend/src/helpers/utils.js        |  4 ++
 .../app-frontend/src/locales/en-US/index.json | 12 +++--
 apps/app/src/main.rs                          | 13 +++++
 apps/app/src/update_size_checker.rs           | 52 +++++++++++++++++++
 6 files changed, 112 insertions(+), 12 deletions(-)
 create mode 100644 apps/app/src/update_size_checker.rs

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 42b60534f0..7dc975982e 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -360,7 +360,7 @@ async function checkUpdates() {
       return
     }
 
-    const update = await check()
+    const update = await invoke('plugin:updater|check')
     updateAvailable.value = !!update
     if (updateAvailable.value) {
       console.log(`Update ${update.version} is available. Showing update modal.`)
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 5ae0436094..2b8c80c6f0 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -1,6 +1,14 @@
 <template>
   <ModalWrapper ref="modal" :header="formatMessage(messages.header)">
-    <div>{{ formatMessage(messages.body, { version: update!.version }) }}</div>
+    <div>{{ formatMessage(messages.bodyVersion, { version: update!.version }) }}</div>
+    <div v-if="updateSize">
+      {{ formatMessage(messages.bodySize, { size: formatBytes(updateSize) }) }}
+    </div>
+    <div>
+      <a href="https://modrinth.com/news/changelog?filter=app">{{
+        formatMessage(messages.bodyChangelog)
+      }}</a>
+    </div>
     <div class="mt-4 flex flex-wrap gap-2">
       <ButtonStyled color="green">
         <button>
@@ -26,9 +34,11 @@
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import { useTemplateRef, ref } from 'vue'
-import type { Update } from '@tauri-apps/plugin-updater'
 import { ButtonStyled } from '@modrinth/ui'
 import { RefreshCwIcon } from '@modrinth/assets'
+import { getUpdateSize } from '@/helpers/utils'
+import { formatBytes } from '@modrinth/utils'
+import { handleError } from '@/store/notifications'
 
 const { formatMessage } = useVIntl()
 
@@ -37,17 +47,25 @@ const messages = defineMessages({
     id: 'app.update.modal-header',
     defaultMessage: 'An update is available!',
   },
-  body: {
-    id: 'app.update.modal-body',
+  bodyVersion: {
+    id: 'app.update.modal-body-version',
     defaultMessage: 'Version {version} of the Modrinth App is available for installation.',
   },
+  bodySize: {
+    id: 'app.update.modal-body-size',
+    defaultMessage: 'The download is {size} in size.',
+  },
+  bodyChangelog: {
+    id: 'app.update.modal-body-changelog',
+    defaultMessage: 'Click here to view the changelog.',
+  },
   restartNow: {
     id: 'app.update.restart',
-    defaultMessage: 'Restart Now',
+    defaultMessage: 'Update Now',
   },
   later: {
     id: 'app.update.later',
-    defaultMessage: 'Later',
+    defaultMessage: 'Update on Next Restart',
   },
   skip: {
     id: 'app.update.skip',
@@ -55,13 +73,20 @@ const messages = defineMessages({
   },
 })
 
-const update = ref<Update>()
+type UpdateData = {
+  rid: number
+  version: string
+}
+
+const update = ref<UpdateData>()
+const updateSize = ref<number>()
 
 const modal = useTemplateRef('modal')
 const isOpen = ref(false)
 
-function show(newUpdate: Update) {
+async function show(newUpdate: UpdateData) {
   update.value = newUpdate
+  updateSize.value = await getUpdateSize(newUpdate.rid).catch(handleError)
   modal.value!.show()
   isOpen.value = true
 }
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index 554636dda4..e5d1568c5c 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -9,6 +9,10 @@ export async function areUpdatesEnabled() {
   return await invoke('are_updates_enabled')
 }
 
+export async function getUpdateSize(updateRid) {
+  return await invoke('get_update_size', { rid: updateRid })
+}
+
 // One of 'Windows', 'Linux', 'MacOS'
 export async function getOS() {
   return await invoke('plugin:utils|get_os')
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index a4133002e4..8c24a440d6 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -21,16 +21,22 @@
     "message": "Resource management"
   },
   "app.update.later": {
-    "message": "Later"
+    "message": "Update on Next Restart"
   },
-  "app.update.modal-body": {
+  "app.update.modal-body-changelog": {
+    "message": "Click here to view the changelog."
+  },
+  "app.update.modal-body-size": {
+    "message": "The download is {size} in size."
+  },
+  "app.update.modal-body-version": {
     "message": "Version {version} of the Modrinth App is available for installation."
   },
   "app.update.modal-header": {
     "message": "An update is available!"
   },
   "app.update.restart": {
-    "message": "Restart Now"
+    "message": "Update Now"
   },
   "app.update.skip": {
     "message": "Skip This Update"
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index 07e9da0c6a..da83ced08f 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -14,6 +14,9 @@ mod error;
 #[cfg(target_os = "macos")]
 mod macos;
 
+#[cfg(feature = "updater")]
+mod update_size_checker;
+
 // Should be called in launcher initialization
 #[tracing::instrument(skip_all)]
 #[tauri::command]
@@ -64,6 +67,15 @@ fn are_updates_enabled() -> bool {
     cfg!(feature = "updater")
 }
 
+#[cfg(feature = "updater")]
+pub use update_size_checker::get_update_size;
+
+#[cfg(not(feature = "updater"))]
+#[tauri::command]
+fn get_update_size() -> theseus::Result<()> {
+    Err(theseus::ErrorKind::OtherError("Updates are disabled in this build.".to_string()).into())
+}
+
 // Toggles decorations
 #[tauri::command]
 async fn toggle_decorations(b: bool, window: tauri::Window) -> api::Result<()> {
@@ -204,6 +216,7 @@ fn main() {
             initialize_state,
             is_dev,
             are_updates_enabled,
+            get_update_size,
             toggle_decorations,
             show_window,
             restart_app,
diff --git a/apps/app/src/update_size_checker.rs b/apps/app/src/update_size_checker.rs
new file mode 100644
index 0000000000..b62ebec8cb
--- /dev/null
+++ b/apps/app/src/update_size_checker.rs
@@ -0,0 +1,52 @@
+use tauri::{Manager, ResourceId, Runtime, Webview};
+use tauri::http::header::ACCEPT;
+use tauri::http::HeaderValue;
+use tauri_plugin_http::reqwest;
+use tauri_plugin_http::reqwest::ClientBuilder;
+use tauri_plugin_updater::Error;
+use tauri_plugin_updater::Result;
+
+const UPDATER_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
+
+// Reimplementation of Update::download mostly, minus the actual download part
+#[tauri::command]
+pub async fn get_update_size<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<Option<u64>> {
+    use tauri_plugin_updater::Update;
+
+    let update = webview.resources_table().get::<Update>(rid)?;
+
+    let mut headers = update.headers.clone();
+    if !headers.contains_key(ACCEPT) {
+        headers.insert(ACCEPT, HeaderValue::from_static("application/octet-stream"));
+    }
+
+    let mut request = ClientBuilder::new().user_agent(UPDATER_USER_AGENT);
+    if let Some(timeout) = update.timeout {
+        request = request.timeout(timeout);
+    }
+    if let Some(ref proxy) = update.proxy {
+        let proxy = reqwest::Proxy::all(proxy.as_str())?;
+        request = request.proxy(proxy);
+    }
+    let response = request
+        .build()?
+        .get(update.download_url.clone())
+        .headers(headers)
+        .send()
+        .await?;
+
+    if !response.status().is_success() {
+        return Err(Error::Network(format!(
+            "Download request failed with status: {}",
+            response.status()
+        )).into());
+    }
+
+    let content_length = response
+        .headers()
+        .get("Content-Length")
+        .and_then(|value| value.to_str().ok())
+        .and_then(|value| value.parse().ok());
+
+    Ok(content_length)
+}

From 9aab6c3e08cba7d204bb6d6f666ff0ddc69b63bc Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Mon, 7 Jul 2025 15:57:27 -0500
Subject: [PATCH 07/31] Fix update not being rechecked if the update modal was
 directly dismissed

---
 apps/app-frontend/src/components/ui/UpdateModal.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 2b8c80c6f0..aa73a184d4 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <ModalWrapper ref="modal" :header="formatMessage(messages.header)">
+  <ModalWrapper ref="modal" :header="formatMessage(messages.header)" :on-hide="onHide">
     <div>{{ formatMessage(messages.bodyVersion, { version: update!.version }) }}</div>
     <div v-if="updateSize">
       {{ formatMessage(messages.bodySize, { size: formatBytes(updateSize) }) }}
@@ -91,9 +91,13 @@ async function show(newUpdate: UpdateData) {
   isOpen.value = true
 }
 
+function onHide() {
+  isOpen.value = false
+}
+
 function hide() {
   modal.value!.hide()
-  isOpen.value = false
+  onHide()
 }
 
 defineExpose({ show, isOpen })

From 3d4d0afa59881a2caad2549cadeae31cb05bf9fa Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Tue, 8 Jul 2025 17:11:56 -0500
Subject: [PATCH 08/31] Slight UI tweaks

---
 apps/app-frontend/src/App.vue                 | 19 ++++++++++++-------
 .../src/components/ui/UpdateModal.vue         |  5 ++---
 apps/app/tauri.conf.json                      |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 7dc975982e..ca2d1e7d32 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -346,7 +346,7 @@ async function handleCommand(e) {
   }
 }
 
-const updateAvailable = ref(false)
+const availableUpdate = ref(null)
 const updateModal = useTemplateRef('updateModal')
 async function checkUpdates() {
   if (!(await areUpdatesEnabled())) {
@@ -361,10 +361,14 @@ async function checkUpdates() {
     }
 
     const update = await invoke('plugin:updater|check')
-    updateAvailable.value = !!update
-    if (updateAvailable.value) {
-      console.log(`Update ${update.version} is available. Showing update modal.`)
-      updateModal.value.show(update)
+    if (!!update) {
+      console.log(`Update ${update.version} is available.`)
+      if (update.version === availableUpdate.value?.version) {
+        console.log('Skipping update modal because the new version is the same as the dismissed update')
+      } else {
+        availableUpdate.value = update;
+        updateModal.value.show(update)
+      }
     }
   }
 
@@ -471,8 +475,9 @@ function handleAuxClick(e) {
         <PlusIcon />
       </NavButton>
       <div class="flex flex-grow"></div>
-      <NavButton v-if="updateAvailable" v-tooltip.right="'Install update'" :to="() => restartApp()">
-        <DownloadIcon />
+      <NavButton v-if="!!availableUpdate" v-tooltip.right="'Update available'" :to="() => updateModal.show(availableUpdate)">
+        <!-- TODO: Gray if updating on next restart -->
+        <DownloadIcon class="text-brand-green" />
       </NavButton>
       <NavButton v-tooltip.right="'Settings'" :to="() => $refs.settingsModal.show()">
         <SettingsIcon />
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index aa73a184d4..7aa165af58 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -21,7 +21,7 @@
           {{ formatMessage(messages.later) }}
         </button>
       </ButtonStyled>
-      <ButtonStyled>
+      <ButtonStyled color="red">
         <button>
           {{ formatMessage(messages.skip) }}
         </button>
@@ -97,10 +97,9 @@ function onHide() {
 
 function hide() {
   modal.value!.hide()
-  onHide()
 }
 
-defineExpose({ show, isOpen })
+defineExpose({ show, hide, isOpen })
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
index 724e536d85..1c9a71e81b 100644
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -41,7 +41,7 @@
     ]
   },
   "productName": "Modrinth App",
-  "version": "../app-frontend/package.json",
+  "version": "0.9.0",
   "mainBinaryName": "Modrinth App",
   "identifier": "ModrinthApp",
   "plugins": {

From 9a43d49b3b0dc7b74523fb8a1862efcdd77be55e Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Tue, 8 Jul 2025 17:13:55 -0500
Subject: [PATCH 09/31] Fix lint

---
 apps/app-frontend/src/App.vue | 12 +++++++++---
 apps/app/tauri.conf.json      |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index ca2d1e7d32..4f5bd1b2a3 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -364,9 +364,11 @@ async function checkUpdates() {
     if (!!update) {
       console.log(`Update ${update.version} is available.`)
       if (update.version === availableUpdate.value?.version) {
-        console.log('Skipping update modal because the new version is the same as the dismissed update')
+        console.log(
+          'Skipping update modal because the new version is the same as the dismissed update',
+        )
       } else {
-        availableUpdate.value = update;
+        availableUpdate.value = update
         updateModal.value.show(update)
       }
     }
@@ -475,7 +477,11 @@ function handleAuxClick(e) {
         <PlusIcon />
       </NavButton>
       <div class="flex flex-grow"></div>
-      <NavButton v-if="!!availableUpdate" v-tooltip.right="'Update available'" :to="() => updateModal.show(availableUpdate)">
+      <NavButton
+        v-if="!!availableUpdate"
+        v-tooltip.right="'Update available'"
+        :to="() => updateModal.show(availableUpdate)"
+      >
         <!-- TODO: Gray if updating on next restart -->
         <DownloadIcon class="text-brand-green" />
       </NavButton>
diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
index 1c9a71e81b..724e536d85 100644
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -41,7 +41,7 @@
     ]
   },
   "productName": "Modrinth App",
-  "version": "0.9.0",
+  "version": "../app-frontend/package.json",
   "mainBinaryName": "Modrinth App",
   "identifier": "ModrinthApp",
   "plugins": {

From ae75292fd0a973775135451a66d126c8058f2a05 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Tue, 8 Jul 2025 19:08:52 -0500
Subject: [PATCH 10/31] Implement skipping the update

---
 apps/app-frontend/src/App.vue                 | 64 ++++++++++++++-----
 .../src/components/ui/UpdateModal.vue         | 13 +++-
 apps/app-frontend/src/helpers/settings.ts     |  1 +
 apps/app-frontend/src/helpers/utils.js        |  7 --
 ...0d152b0ffb7abf87a729931dc6c54754be6d.json} |  6 +-
 ...cdcf73da199ea6ac05ee3ee798ece80d877cf.json |  2 +-
 ...af425d722bd103cd6164c2b9d6abe5539aef.json} | 12 +++-
 .../20250708222117_add-skipped-updates.sql    |  2 +
 packages/app-lib/src/state/settings.rs        | 11 +++-
 9 files changed, 83 insertions(+), 35 deletions(-)
 rename packages/app-lib/.sqlx/{query-3613473fb4d836ee0fb3c292e6bf5e50912064c29ebf1a1e5ead79c44c37e64c.json => query-6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d.json} (86%)
 rename packages/app-lib/.sqlx/{query-5193f519f021b2e7013cdb67a6e1a31ae4bd7532d02f8b00b43d5645351941ca.json => query-cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef.json} (93%)
 create mode 100644 packages/app-lib/migrations/20250708222117_add-skipped-updates.sql

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 4f5bd1b2a3..3bec571146 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -42,7 +42,7 @@ import ModrinthLoadingIndicator from '@/components/LoadingIndicatorBar.vue'
 import { handleError, useNotifications } from '@/store/notifications.js'
 import { command_listener, warning_listener } from '@/helpers/events.js'
 import { type } from '@tauri-apps/plugin-os'
-import { areUpdatesEnabled, getOS, isDev, restartApp } from '@/helpers/utils.js'
+import { areUpdatesEnabled, getOS, isDev } from '@/helpers/utils.js'
 import { debugAnalytics, initAnalytics, optOutAnalytics, trackEvent } from '@/helpers/analytics'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 import { getVersion } from '@tauri-apps/api/app'
@@ -59,7 +59,6 @@ import { get_opening_command, initialize_state } from '@/helpers/state'
 import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
 import { renderString } from '@modrinth/utils'
 import { useFetch } from '@/helpers/fetch.js'
-import { check } from '@tauri-apps/plugin-updater'
 import NavButton from '@/components/ui/NavButton.vue'
 import { get as getCreds, login, logout } from '@/helpers/mr_auth.js'
 import { get_user } from '@/helpers/cache.js'
@@ -72,6 +71,7 @@ import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 import UpdateModal from '@/components/ui/UpdateModal.vue'
 import { get_available_capes, get_available_skins } from './helpers/skins'
 import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer'
+import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 
 const themeStore = useTheming()
 
@@ -347,6 +347,7 @@ async function handleCommand(e) {
 }
 
 const availableUpdate = ref(null)
+const updateSkipped = ref(false)
 const updateModal = useTemplateRef('updateModal')
 async function checkUpdates() {
   if (!(await areUpdatesEnabled())) {
@@ -361,17 +362,30 @@ async function checkUpdates() {
     }
 
     const update = await invoke('plugin:updater|check')
-    if (!!update) {
-      console.log(`Update ${update.version} is available.`)
-      if (update.version === availableUpdate.value?.version) {
-        console.log(
-          'Skipping update modal because the new version is the same as the dismissed update',
-        )
-      } else {
-        availableUpdate.value = update
-        updateModal.value.show(update)
-      }
+    if (!update) {
+      return
+    }
+
+    console.log(`Update ${update.version} is available.`)
+
+    if (update.version === availableUpdate.value?.version) {
+      console.log(
+        'Skipping update modal because the new version is the same as the dismissed update',
+      )
+      return
+    }
+
+    availableUpdate.value = update
+
+    const settings = await getSettings()
+    if (settings.skipped_update === update.version) {
+      updateSkipped.value = true
+      console.log('Skipping update modal because the user chose to skip this update')
+      return
     }
+
+    updateSkipped.value = false
+    updateModal.value.show(update)
   }
 
   await performCheck()
@@ -384,6 +398,23 @@ async function checkUpdates() {
   )
 }
 
+async function skipUpdate(version) {
+  updateSkipped.value = true
+  let settings = await getSettings()
+  settings.skipped_update = version
+  await setSettings(settings)
+}
+
+async function forceOpenUpdateModal() {
+  if (updateSkipped.value) {
+    updateSkipped.value = false
+    let settings = await getSettings()
+    settings.skipped_update = null
+    await setSettings(settings)
+  }
+  updateModal.value.show(availableUpdate.value)
+}
+
 function handleClick(e) {
   let target = e.target
   while (target != null) {
@@ -425,7 +456,7 @@ function handleAuxClick(e) {
   <div id="teleports"></div>
   <div v-if="stateInitialized" class="app-grid-layout experimental-styles-within relative">
     <Suspense @resolve="checkUpdates">
-      <UpdateModal ref="updateModal" />
+      <UpdateModal ref="updateModal" @update-skipped="skipUpdate" />
     </Suspense>
     <Suspense>
       <AppSettingsModal ref="settingsModal" />
@@ -480,10 +511,11 @@ function handleAuxClick(e) {
       <NavButton
         v-if="!!availableUpdate"
         v-tooltip.right="'Update available'"
-        :to="() => updateModal.show(availableUpdate)"
+        :to="forceOpenUpdateModal"
       >
-        <!-- TODO: Gray if updating on next restart -->
-        <DownloadIcon class="text-brand-green" />
+        <!-- TODO: Also gray if updating on next restart -->
+        <DownloadIcon v-if="updateSkipped" />
+        <DownloadIcon v-else class="text-brand-green" />
       </NavButton>
       <NavButton v-tooltip.right="'Settings'" :to="() => $refs.settingsModal.show()">
         <SettingsIcon />
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 7aa165af58..fc831a777f 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -17,12 +17,12 @@
         </button>
       </ButtonStyled>
       <ButtonStyled>
-        <button @click="hide()">
+        <button @click="hide">
           {{ formatMessage(messages.later) }}
         </button>
       </ButtonStyled>
       <ButtonStyled color="red">
-        <button>
+        <button @click="skipUpdate">
           {{ formatMessage(messages.skip) }}
         </button>
       </ButtonStyled>
@@ -40,6 +40,10 @@ import { getUpdateSize } from '@/helpers/utils'
 import { formatBytes } from '@modrinth/utils'
 import { handleError } from '@/store/notifications'
 
+const emit = defineEmits<{
+  (e: 'updateSkipped', version: string): void
+}>()
+
 const { formatMessage } = useVIntl()
 
 const messages = defineMessages({
@@ -100,6 +104,11 @@ function hide() {
 }
 
 defineExpose({ show, hide, isOpen })
+
+function skipUpdate() {
+  hide()
+  emit('updateSkipped', update.value!.version)
+}
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
index c256575a4e..6b00e9bb84 100644
--- a/apps/app-frontend/src/helpers/settings.ts
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -62,6 +62,7 @@ export type AppSettings = {
 
   developer_mode: boolean
   feature_flags: Record<FeatureFlag, boolean>
+  skipped_update: string | null
 }
 
 // Get full settings object
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index e5d1568c5c..1cda120deb 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -45,13 +45,6 @@ export async function restartApp() {
   return await invoke('restart_app')
 }
 
-/**
- * @deprecated This method is no longer needed, and just returns its parameter
- */
-export function sanitizePotentialFileUrl(url) {
-  return url
-}
-
 export const releaseColor = (releaseType) => {
   switch (releaseType) {
     case 'release':
diff --git a/packages/app-lib/.sqlx/query-3613473fb4d836ee0fb3c292e6bf5e50912064c29ebf1a1e5ead79c44c37e64c.json b/packages/app-lib/.sqlx/query-6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d.json
similarity index 86%
rename from packages/app-lib/.sqlx/query-3613473fb4d836ee0fb3c292e6bf5e50912064c29ebf1a1e5ead79c44c37e64c.json
rename to packages/app-lib/.sqlx/query-6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d.json
index 2fce764bca..63320e4c4b 100644
--- a/packages/app-lib/.sqlx/query-3613473fb4d836ee0fb3c292e6bf5e50912064c29ebf1a1e5ead79c44c37e64c.json
+++ b/packages/app-lib/.sqlx/query-6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d.json
@@ -1,12 +1,12 @@
 {
   "db_name": "SQLite",
-  "query": "\n            UPDATE settings\n            SET\n                max_concurrent_writes = $1,\n                max_concurrent_downloads = $2,\n\n                theme = $3,\n                default_page = $4,\n                collapsed_navigation = $5,\n                advanced_rendering = $6,\n                native_decorations = $7,\n\n                discord_rpc = $8,\n                developer_mode = $9,\n                telemetry = $10,\n                personalized_ads = $11,\n\n                onboarded = $12,\n\n                extra_launch_args = jsonb($13),\n                custom_env_vars = jsonb($14),\n                mc_memory_max = $15,\n                mc_force_fullscreen = $16,\n                mc_game_resolution_x = $17,\n                mc_game_resolution_y = $18,\n                hide_on_process_start = $19,\n\n                hook_pre_launch = $20,\n                hook_wrapper = $21,\n                hook_post_exit = $22,\n\n                custom_dir = $23,\n                prev_custom_dir = $24,\n                migrated = $25,\n\n                toggle_sidebar = $26,\n                feature_flags = $27,\n                hide_nametag_skins_page = $28\n            ",
+  "query": "\n            UPDATE settings\n            SET\n                max_concurrent_writes = $1,\n                max_concurrent_downloads = $2,\n\n                theme = $3,\n                default_page = $4,\n                collapsed_navigation = $5,\n                advanced_rendering = $6,\n                native_decorations = $7,\n\n                discord_rpc = $8,\n                developer_mode = $9,\n                telemetry = $10,\n                personalized_ads = $11,\n\n                onboarded = $12,\n\n                extra_launch_args = jsonb($13),\n                custom_env_vars = jsonb($14),\n                mc_memory_max = $15,\n                mc_force_fullscreen = $16,\n                mc_game_resolution_x = $17,\n                mc_game_resolution_y = $18,\n                hide_on_process_start = $19,\n\n                hook_pre_launch = $20,\n                hook_wrapper = $21,\n                hook_post_exit = $22,\n\n                custom_dir = $23,\n                prev_custom_dir = $24,\n                migrated = $25,\n\n                toggle_sidebar = $26,\n                feature_flags = $27,\n                hide_nametag_skins_page = $28,\n                skipped_update = $29\n            ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 28
+      "Right": 29
     },
     "nullable": []
   },
-  "hash": "3613473fb4d836ee0fb3c292e6bf5e50912064c29ebf1a1e5ead79c44c37e64c"
+  "hash": "6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d"
 }
diff --git a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
index 9742cb7b47..22e39e75b8 100644
--- a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
+++ b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
@@ -41,7 +41,7 @@
       {
         "name": "display_claims!: serde_json::Value",
         "ordinal": 7,
-        "type_info": "Null"
+        "type_info": "Text"
       }
     ],
     "parameters": {
diff --git a/packages/app-lib/.sqlx/query-5193f519f021b2e7013cdb67a6e1a31ae4bd7532d02f8b00b43d5645351941ca.json b/packages/app-lib/.sqlx/query-cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef.json
similarity index 93%
rename from packages/app-lib/.sqlx/query-5193f519f021b2e7013cdb67a6e1a31ae4bd7532d02f8b00b43d5645351941ca.json
rename to packages/app-lib/.sqlx/query-cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef.json
index 5dc714e293..d87a4032c5 100644
--- a/packages/app-lib/.sqlx/query-5193f519f021b2e7013cdb67a6e1a31ae4bd7532d02f8b00b43d5645351941ca.json
+++ b/packages/app-lib/.sqlx/query-cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                max_concurrent_writes, max_concurrent_downloads,\n                theme, default_page, collapsed_navigation, hide_nametag_skins_page, advanced_rendering, native_decorations,\n                discord_rpc, developer_mode, telemetry, personalized_ads,\n                onboarded,\n                json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n                mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n                hook_pre_launch, hook_wrapper, hook_post_exit,\n                custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar\n            FROM settings\n            ",
+  "query": "\n            SELECT\n                max_concurrent_writes, max_concurrent_downloads,\n                theme, default_page, collapsed_navigation, hide_nametag_skins_page, advanced_rendering, native_decorations,\n                discord_rpc, developer_mode, telemetry, personalized_ads,\n                onboarded,\n                json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n                mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n                hook_pre_launch, hook_wrapper, hook_post_exit,\n                custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,\n                skipped_update\n            FROM settings\n            ",
   "describe": {
     "columns": [
       {
@@ -142,6 +142,11 @@
         "name": "toggle_sidebar",
         "ordinal": 27,
         "type_info": "Integer"
+      },
+      {
+        "name": "skipped_update",
+        "ordinal": 28,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -175,8 +180,9 @@
       true,
       false,
       null,
-      false
+      false,
+      true
     ]
   },
-  "hash": "5193f519f021b2e7013cdb67a6e1a31ae4bd7532d02f8b00b43d5645351941ca"
+  "hash": "cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef"
 }
diff --git a/packages/app-lib/migrations/20250708222117_add-skipped-updates.sql b/packages/app-lib/migrations/20250708222117_add-skipped-updates.sql
new file mode 100644
index 0000000000..76003b85cc
--- /dev/null
+++ b/packages/app-lib/migrations/20250708222117_add-skipped-updates.sql
@@ -0,0 +1,2 @@
+ALTER TABLE settings
+ADD COLUMN skipped_update TEXT NULL;
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 2615e150ef..44ac556747 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -38,6 +38,7 @@ pub struct Settings {
 
     pub developer_mode: bool,
     pub feature_flags: HashMap<FeatureFlag, bool>,
+    pub skipped_update: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, Eq, Hash, PartialEq)]
@@ -63,7 +64,8 @@ impl Settings {
                 json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,
                 mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,
                 hook_pre_launch, hook_wrapper, hook_post_exit,
-                custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar
+                custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,
+                skipped_update
             FROM settings
             "
         )
@@ -117,6 +119,7 @@ impl Settings {
                 .as_ref()
                 .and_then(|x| serde_json::from_str(x).ok())
                 .unwrap_or_default(),
+            skipped_update: res.skipped_update
         })
     }
 
@@ -170,7 +173,8 @@ impl Settings {
 
                 toggle_sidebar = $26,
                 feature_flags = $27,
-                hide_nametag_skins_page = $28
+                hide_nametag_skins_page = $28,
+                skipped_update = $29
             ",
             max_concurrent_writes,
             max_concurrent_downloads,
@@ -199,7 +203,8 @@ impl Settings {
             self.migrated,
             self.toggle_sidebar,
             feature_flags,
-            self.hide_nametag_skins_page
+            self.hide_nametag_skins_page,
+            self.skipped_update
         )
         .execute(exec)
         .await?;

From 7b73aa2908f8d2ac04870ce901b982f0da2ea36d Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Tue, 8 Jul 2025 19:44:08 -0500
Subject: [PATCH 11/31] Implement the Update Now button

---
 .../src/components/ui/UpdateModal.vue         | 42 ++++++++++++++++---
 .../src/components/ui/modal/ModalWrapper.vue  |  8 +++-
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index fc831a777f..806be7dbd7 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -1,5 +1,10 @@
 <template>
-  <ModalWrapper ref="modal" :header="formatMessage(messages.header)" :on-hide="onHide">
+  <ModalWrapper
+    ref="modal"
+    :header="formatMessage(messages.header)"
+    :on-hide="onHide"
+    :closable="!updateInProgress"
+  >
     <div>{{ formatMessage(messages.bodyVersion, { version: update!.version }) }}</div>
     <div v-if="updateSize">
       {{ formatMessage(messages.bodySize, { size: formatBytes(updateSize) }) }}
@@ -9,20 +14,23 @@
         formatMessage(messages.bodyChangelog)
       }}</a>
     </div>
+    <ProgressBar class="mt-4" :progress="downloadProgress" />
     <div class="mt-4 flex flex-wrap gap-2">
       <ButtonStyled color="green">
-        <button>
+        <button :disabled="updateInProgress" @click="installUpdateNow">
           <RefreshCwIcon />
           {{ formatMessage(messages.restartNow) }}
         </button>
       </ButtonStyled>
       <ButtonStyled>
-        <button @click="hide">
+        <button :disabled="updateInProgress">
+          <RightArrowIcon />
           {{ formatMessage(messages.later) }}
         </button>
       </ButtonStyled>
       <ButtonStyled color="red">
-        <button @click="skipUpdate">
+        <button :disabled="updateInProgress" @click="skipUpdate">
+          <XIcon />
           {{ formatMessage(messages.skip) }}
         </button>
       </ButtonStyled>
@@ -35,10 +43,12 @@ import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import { useTemplateRef, ref } from 'vue'
 import { ButtonStyled } from '@modrinth/ui'
-import { RefreshCwIcon } from '@modrinth/assets'
+import { RefreshCwIcon, XIcon, RightArrowIcon } from '@modrinth/assets'
 import { getUpdateSize } from '@/helpers/utils'
 import { formatBytes } from '@modrinth/utils'
 import { handleError } from '@/store/notifications'
+import ProgressBar from '@/components/ui/ProgressBar.vue'
+import { Update } from '@tauri-apps/plugin-updater'
 
 const emit = defineEmits<{
   (e: 'updateSkipped', version: string): void
@@ -79,11 +89,17 @@ const messages = defineMessages({
 
 type UpdateData = {
   rid: number
+  currentVersion: string
   version: string
+  date?: string
+  body?: string
+  rawJson: Record<string, unknown>
 }
 
 const update = ref<UpdateData>()
 const updateSize = ref<number>()
+const updateInProgress = ref(false)
+const downloadProgress = ref(0)
 
 const modal = useTemplateRef('modal')
 const isOpen = ref(false)
@@ -105,6 +121,22 @@ function hide() {
 
 defineExpose({ show, hide, isOpen })
 
+function installUpdateNow() {
+  updateInProgress.value = true
+  let totalSize = 0
+  let totalDownloaded = 0
+  new Update(update.value!).downloadAndInstall((event) => {
+    if (event.event === 'Started') {
+      totalSize = event.data.contentLength!
+    } else if (event.event === 'Progress') {
+      totalDownloaded += event.data.chunkLength
+    } else if (event.event === 'Finished') {
+      totalDownloaded = totalSize
+    }
+    downloadProgress.value = (totalDownloaded / totalSize) * 100
+  })
+}
+
 function skipUpdate() {
   hide()
   emit('updateSkipped', update.value!.version)
diff --git a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
index 81f386f624..b48438d7cd 100644
--- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
@@ -48,7 +48,13 @@ function onModalHide() {
 </script>
 
 <template>
-  <Modal ref="modal" :header="header" :noblur="!themeStore.advancedRendering" @hide="onModalHide">
+  <Modal
+    ref="modal"
+    :header="header"
+    :noblur="!themeStore.advancedRendering"
+    @hide="onModalHide"
+    :closable="closable"
+  >
     <template #title>
       <slot name="title" />
     </template>

From 9b103e063a94eed38a3ab4df99a96dc7451ff9f7 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Wed, 9 Jul 2025 19:18:33 -0500
Subject: [PATCH 12/31] Implement updating at next exit

---
 apps/app-frontend/src/App.vue                 |  22 +++-
 .../src/components/ui/UpdateModal.vue         |  97 ++++++++++----
 apps/app-frontend/src/helpers/utils.js        |   8 ++
 apps/app/src/api/mod.rs                       |  11 +-
 apps/app/src/main.rs                          |  38 ++++--
 apps/app/src/update_size_checker.rs           |  52 --------
 apps/app/src/updater_impl.rs                  | 122 ++++++++++++++++++
 apps/app/src/updater_impl_noop.rs             |  26 ++++
 packages/app-lib/src/event/mod.rs             |   1 -
 9 files changed, 287 insertions(+), 90 deletions(-)
 delete mode 100644 apps/app/src/update_size_checker.rs
 create mode 100644 apps/app/src/updater_impl.rs
 create mode 100644 apps/app/src/updater_impl_noop.rs

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 3bec571146..416f1b8790 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -348,6 +348,7 @@ async function handleCommand(e) {
 
 const availableUpdate = ref(null)
 const updateSkipped = ref(false)
+const enqueuedUpdate = ref(null)
 const updateModal = useTemplateRef('updateModal')
 async function checkUpdates() {
   if (!(await areUpdatesEnabled())) {
@@ -399,12 +400,18 @@ async function checkUpdates() {
 }
 
 async function skipUpdate(version) {
+  enqueuedUpdate.value = null
+
   updateSkipped.value = true
   let settings = await getSettings()
   settings.skipped_update = version
   await setSettings(settings)
 }
 
+async function updateEnqueuedForLater(version) {
+  enqueuedUpdate.value = version
+}
+
 async function forceOpenUpdateModal() {
   if (updateSkipped.value) {
     updateSkipped.value = false
@@ -456,7 +463,11 @@ function handleAuxClick(e) {
   <div id="teleports"></div>
   <div v-if="stateInitialized" class="app-grid-layout experimental-styles-within relative">
     <Suspense @resolve="checkUpdates">
-      <UpdateModal ref="updateModal" @update-skipped="skipUpdate" />
+      <UpdateModal
+        ref="updateModal"
+        @update-skipped="skipUpdate"
+        @update-enqueued-for-later="updateEnqueuedForLater"
+      />
     </Suspense>
     <Suspense>
       <AppSettingsModal ref="settingsModal" />
@@ -510,11 +521,14 @@ function handleAuxClick(e) {
       <div class="flex flex-grow"></div>
       <NavButton
         v-if="!!availableUpdate"
-        v-tooltip.right="'Update available'"
+        v-tooltip.right="
+          enqueuedUpdate === availableUpdate?.version
+            ? 'Update installation queued for next restart'
+            : 'Update available'
+        "
         :to="forceOpenUpdateModal"
       >
-        <!-- TODO: Also gray if updating on next restart -->
-        <DownloadIcon v-if="updateSkipped" />
+        <DownloadIcon v-if="updateSkipped || enqueuedUpdate === availableUpdate?.version" />
         <DownloadIcon v-else class="text-brand-green" />
       </NavButton>
       <NavButton v-tooltip.right="'Settings'" :to="() => $refs.settingsModal.show()">
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 806be7dbd7..3a710637c5 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -3,7 +3,7 @@
     ref="modal"
     :header="formatMessage(messages.header)"
     :on-hide="onHide"
-    :closable="!updateInProgress"
+    :closable="!updatingImmediately"
   >
     <div>{{ formatMessage(messages.bodyVersion, { version: update!.version }) }}</div>
     <div v-if="updateSize">
@@ -17,19 +17,22 @@
     <ProgressBar class="mt-4" :progress="downloadProgress" />
     <div class="mt-4 flex flex-wrap gap-2">
       <ButtonStyled color="green">
-        <button :disabled="updateInProgress" @click="installUpdateNow">
+        <button :disabled="updatingImmediately" @click="installUpdateNow">
           <RefreshCwIcon />
           {{ formatMessage(messages.restartNow) }}
         </button>
       </ButtonStyled>
       <ButtonStyled>
-        <button :disabled="updateInProgress">
+        <button
+          :disabled="updatingImmediately || downloadInProgress || update!.version == enqueuedUpdate"
+          @click="updateAtNextExit"
+        >
           <RightArrowIcon />
           {{ formatMessage(messages.later) }}
         </button>
       </ButtonStyled>
       <ButtonStyled color="red">
-        <button :disabled="updateInProgress" @click="skipUpdate">
+        <button :disabled="updatingImmediately || downloadInProgress" @click="skipUpdate">
           <XIcon />
           {{ formatMessage(messages.skip) }}
         </button>
@@ -44,14 +47,16 @@ import { defineMessages, useVIntl } from '@vintl/vintl'
 import { useTemplateRef, ref } from 'vue'
 import { ButtonStyled } from '@modrinth/ui'
 import { RefreshCwIcon, XIcon, RightArrowIcon } from '@modrinth/assets'
-import { getUpdateSize } from '@/helpers/utils'
+import { enqueueUpdateForInstallation, getUpdateSize, removeEnqueuedUpdate } from '@/helpers/utils'
 import { formatBytes } from '@modrinth/utils'
 import { handleError } from '@/store/notifications'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
-import { Update } from '@tauri-apps/plugin-updater'
+import { loading_listener } from '@/helpers/events'
+import { getCurrentWindow } from '@tauri-apps/api/window'
 
 const emit = defineEmits<{
-  (e: 'updateSkipped', version: string): void
+  (e: 'updateSkipped', version: string): Promise<void>
+  (e: 'updateEnqueuedForLater', version: string | null): Promise<void>
 }>()
 
 const { formatMessage } = useVIntl()
@@ -98,15 +103,26 @@ type UpdateData = {
 
 const update = ref<UpdateData>()
 const updateSize = ref<number>()
-const updateInProgress = ref(false)
+
+const updatingImmediately = ref(false)
+const downloadInProgress = ref(false)
 const downloadProgress = ref(0)
 
+const enqueuedUpdate = ref<string | null>(null)
+
 const modal = useTemplateRef('modal')
 const isOpen = ref(false)
 
 async function show(newUpdate: UpdateData) {
+  const oldVersion = update.value?.version
+
   update.value = newUpdate
   updateSize.value = await getUpdateSize(newUpdate.rid).catch(handleError)
+
+  if (oldVersion !== update.value?.version) {
+    downloadProgress.value = 0
+  }
+
   modal.value!.show()
   isOpen.value = true
 }
@@ -121,25 +137,62 @@ function hide() {
 
 defineExpose({ show, hide, isOpen })
 
-function installUpdateNow() {
-  updateInProgress.value = true
-  let totalSize = 0
-  let totalDownloaded = 0
-  new Update(update.value!).downloadAndInstall((event) => {
-    if (event.event === 'Started') {
-      totalSize = event.data.contentLength!
-    } else if (event.event === 'Progress') {
-      totalDownloaded += event.data.chunkLength
-    } else if (event.event === 'Finished') {
-      totalDownloaded = totalSize
+loading_listener((event) => {
+  if (event.event.type === 'launcher_update') {
+    if (event.event.version === update.value!.version) {
+      downloadProgress.value = (event.fraction ?? 1.0) * 100
     }
-    downloadProgress.value = (totalDownloaded / totalSize) * 100
-  })
+  }
+})
+
+function installUpdateNow() {
+  updatingImmediately.value = true
+
+  if (enqueuedUpdate.value !== update.value!.version) {
+    downloadUpdate()
+  } else if (!downloadInProgress.value) {
+    // Update already downloaded. Simply close the app
+    getCurrentWindow().close()
+  }
 }
 
-function skipUpdate() {
+function updateAtNextExit() {
+  enqueuedUpdate.value = update.value!.version
+  emit('updateEnqueuedForLater', update.value!.version)
+
+  downloadUpdate()
   hide()
+}
+
+async function downloadUpdate() {
+  const versionToDownload = update.value!.version
+
+  downloadInProgress.value = true
+  try {
+    await enqueueUpdateForInstallation(update.value!.rid)
+  } catch (e) {
+    downloadInProgress.value = false
+
+    handleError(e)
+
+    enqueuedUpdate.value = null
+    updatingImmediately.value = false
+    await emit('updateEnqueuedForLater', null)
+    return
+  }
+  downloadInProgress.value = false
+
+  if (updatingImmediately.value && update.value!.version === versionToDownload) {
+    await getCurrentWindow().close()
+  }
+}
+
+function skipUpdate() {
+  enqueuedUpdate.value = null
   emit('updateSkipped', update.value!.version)
+
+  removeEnqueuedUpdate()
+  hide()
 }
 </script>
 
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index 1cda120deb..4e46e792fe 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -13,6 +13,14 @@ export async function getUpdateSize(updateRid) {
   return await invoke('get_update_size', { rid: updateRid })
 }
 
+export async function enqueueUpdateForInstallation(updateRid) {
+  return await invoke('enqueue_update_for_installation', { rid: updateRid })
+}
+
+export async function removeEnqueuedUpdate() {
+  return await invoke('remove_enqueued_update')
+}
+
 // One of 'Windows', 'Linux', 'MacOS'
 export async function getOS() {
   return await invoke('plugin:utils|get_os')
diff --git a/apps/app/src/api/mod.rs b/apps/app/src/api/mod.rs
index 294e784f64..55acfe8439 100644
--- a/apps/app/src/api/mod.rs
+++ b/apps/app/src/api/mod.rs
@@ -45,8 +45,12 @@ pub enum TheseusSerializableError {
     Tauri(#[from] tauri::Error),
 
     #[cfg(feature = "updater")]
-    #[error("Tauri updater error: {0}")]
-    TauriUpdater(#[from] tauri_plugin_updater::Error),
+    #[error("Updater error: {0}")]
+    Updater(#[from] tauri_plugin_updater::Error),
+
+    #[cfg(feature = "updater")]
+    #[error("HTTP error: {0}")]
+    Http(#[from] tauri_plugin_http::reqwest::Error),
 }
 
 // Generic implementation of From<T> for ErrorTypeA
@@ -104,5 +108,6 @@ impl_serialize! {
 impl_serialize! {
     IO,
     Tauri,
-    TauriUpdater,
+    Updater,
+    Http,
 }
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index da83ced08f..5d901fe9df 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -15,7 +15,9 @@ mod error;
 mod macos;
 
 #[cfg(feature = "updater")]
-mod update_size_checker;
+mod updater_impl;
+#[cfg(not(feature = "updater"))]
+mod updater_impl_noop;
 
 // Should be called in launcher initialization
 #[tracing::instrument(skip_all)]
@@ -68,13 +70,10 @@ fn are_updates_enabled() -> bool {
 }
 
 #[cfg(feature = "updater")]
-pub use update_size_checker::get_update_size;
+pub use updater_impl::*;
 
 #[cfg(not(feature = "updater"))]
-#[tauri::command]
-fn get_update_size() -> theseus::Result<()> {
-    Err(theseus::ErrorKind::OtherError("Updates are disabled in this build.".to_string()).into())
-}
+pub use updater_impl_noop::*;
 
 // Toggles decorations
 #[tauri::command]
@@ -212,11 +211,14 @@ fn main() {
         .plugin(api::ads::init())
         .plugin(api::friends::init())
         .plugin(api::worlds::init())
+        .manage(PendingUpdateData::default())
         .invoke_handler(tauri::generate_handler![
             initialize_state,
             is_dev,
             are_updates_enabled,
             get_update_size,
+            enqueue_update_for_installation,
+            remove_enqueued_update,
             toggle_decorations,
             show_window,
             restart_app,
@@ -228,8 +230,9 @@ fn main() {
     match app {
         Ok(app) => {
             app.run(|app, event| {
-                #[cfg(not(target_os = "macos"))]
+                #[cfg(not(any(target_os = "macos", feature = "updater")))]
                 drop((app, event));
+
                 #[cfg(target_os = "macos")]
                 if let tauri::RunEvent::Opened { urls } = event {
                     tracing::info!("Handling webview open {urls:?}");
@@ -254,9 +257,29 @@ fn main() {
                         });
                     }
                 }
+
+                #[cfg(feature = "updater")]
+                if matches!(event, tauri::RunEvent::Exit) {
+                    let update_data = app.state::<PendingUpdateData>().inner();
+                    if let Some((update, data)) = &*update_data.0.lock().unwrap() {
+                        if let Err(e) = update.install(data) {
+                            tracing::error!("Error while updating: {e}");
+
+                            DialogBuilder::message()
+                                .set_level(MessageLevel::Error)
+                                .set_title("Update error")
+                                .set_text(format!("Failed to install update due to an error:\n{e}"))
+                                .alert()
+                                .show()
+                                .unwrap();
+                        }
+                    }
+                }
             });
         }
         Err(e) => {
+            tracing::error!("Error while running tauri application: {:?}", e);
+
             #[cfg(target_os = "windows")]
             {
                 // tauri doesn't expose runtime errors, so matching a string representation seems like the only solution
@@ -285,7 +308,6 @@ fn main() {
                 .show()
                 .unwrap();
 
-            tracing::error!("Error while running tauri application: {:?}", e);
             panic!("{1}: {:?}", e, "error while running tauri application")
         }
     }
diff --git a/apps/app/src/update_size_checker.rs b/apps/app/src/update_size_checker.rs
deleted file mode 100644
index b62ebec8cb..0000000000
--- a/apps/app/src/update_size_checker.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use tauri::{Manager, ResourceId, Runtime, Webview};
-use tauri::http::header::ACCEPT;
-use tauri::http::HeaderValue;
-use tauri_plugin_http::reqwest;
-use tauri_plugin_http::reqwest::ClientBuilder;
-use tauri_plugin_updater::Error;
-use tauri_plugin_updater::Result;
-
-const UPDATER_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
-
-// Reimplementation of Update::download mostly, minus the actual download part
-#[tauri::command]
-pub async fn get_update_size<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> Result<Option<u64>> {
-    use tauri_plugin_updater::Update;
-
-    let update = webview.resources_table().get::<Update>(rid)?;
-
-    let mut headers = update.headers.clone();
-    if !headers.contains_key(ACCEPT) {
-        headers.insert(ACCEPT, HeaderValue::from_static("application/octet-stream"));
-    }
-
-    let mut request = ClientBuilder::new().user_agent(UPDATER_USER_AGENT);
-    if let Some(timeout) = update.timeout {
-        request = request.timeout(timeout);
-    }
-    if let Some(ref proxy) = update.proxy {
-        let proxy = reqwest::Proxy::all(proxy.as_str())?;
-        request = request.proxy(proxy);
-    }
-    let response = request
-        .build()?
-        .get(update.download_url.clone())
-        .headers(headers)
-        .send()
-        .await?;
-
-    if !response.status().is_success() {
-        return Err(Error::Network(format!(
-            "Download request failed with status: {}",
-            response.status()
-        )).into());
-    }
-
-    let content_length = response
-        .headers()
-        .get("Content-Length")
-        .and_then(|value| value.to_str().ok())
-        .and_then(|value| value.parse().ok());
-
-    Ok(content_length)
-}
diff --git a/apps/app/src/updater_impl.rs b/apps/app/src/updater_impl.rs
new file mode 100644
index 0000000000..2f38b5e898
--- /dev/null
+++ b/apps/app/src/updater_impl.rs
@@ -0,0 +1,122 @@
+use crate::api::Result;
+use std::sync::{Arc, Mutex};
+use tauri::http::HeaderValue;
+use tauri::http::header::ACCEPT;
+use tauri::{Manager, ResourceId, Runtime, Webview};
+use tauri_plugin_http::reqwest;
+use tauri_plugin_http::reqwest::ClientBuilder;
+use tauri_plugin_updater::Error;
+use tauri_plugin_updater::Update;
+use theseus::{LoadingBarType, emit_loading, init_loading};
+use tokio::time::Instant;
+
+const UPDATER_USER_AGENT: &str =
+    concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
+
+#[derive(Default)]
+pub struct PendingUpdateData(pub Mutex<Option<(Arc<Update>, Vec<u8>)>>);
+
+// Reimplementation of Update::download mostly, minus the actual download part
+#[tauri::command]
+pub async fn get_update_size<R: Runtime>(
+    webview: Webview<R>,
+    rid: ResourceId,
+) -> Result<Option<u64>> {
+    let update = webview.resources_table().get::<Update>(rid)?;
+
+    let mut headers = update.headers.clone();
+    if !headers.contains_key(ACCEPT) {
+        headers.insert(
+            ACCEPT,
+            HeaderValue::from_static("application/octet-stream"),
+        );
+    }
+
+    let mut request = ClientBuilder::new().user_agent(UPDATER_USER_AGENT);
+    if let Some(timeout) = update.timeout {
+        request = request.timeout(timeout);
+    }
+    if let Some(ref proxy) = update.proxy {
+        let proxy = reqwest::Proxy::all(proxy.as_str())?;
+        request = request.proxy(proxy);
+    }
+    let response = request
+        .build()?
+        .get(update.download_url.clone())
+        .headers(headers)
+        .send()
+        .await?;
+
+    if !response.status().is_success() {
+        return Err(Error::Network(format!(
+            "Download request failed with status: {}",
+            response.status()
+        ))
+        .into());
+    }
+
+    let content_length = response
+        .headers()
+        .get("Content-Length")
+        .and_then(|value| value.to_str().ok())
+        .and_then(|value| value.parse().ok());
+
+    Ok(content_length)
+}
+
+#[tauri::command]
+pub async fn enqueue_update_for_installation<R: Runtime>(
+    webview: Webview<R>,
+    rid: ResourceId,
+) -> Result<()> {
+    let pending_data = webview.state::<PendingUpdateData>().inner();
+
+    let update = webview.resources_table().get::<Update>(rid)?;
+
+    let progress = init_loading(
+        LoadingBarType::LauncherUpdate {
+            version: update.version.clone(),
+            current_version: update.current_version.clone(),
+        },
+        1.0,
+        "Downloading update...",
+    )
+    .await?;
+
+    let download_start = Instant::now();
+    let update_data = update
+        .download(
+            |chunk_size, total_size| {
+                let Some(total_size) = total_size else {
+                    return;
+                };
+                if let Err(e) = emit_loading(
+                    &progress,
+                    chunk_size as f64 / total_size as f64,
+                    None,
+                ) {
+                    tracing::error!(
+                        "Failed to update download progress bar: {e}"
+                    );
+                }
+            },
+            || {},
+        )
+        .await?;
+    let download_duration = download_start.elapsed();
+    tracing::info!("Downloaded update in {download_duration:?}");
+
+    pending_data
+        .0
+        .lock()
+        .unwrap()
+        .replace((update, update_data));
+
+    Ok(())
+}
+
+#[tauri::command]
+pub fn remove_enqueued_update<R: Runtime>(webview: Webview<R>) {
+    let pending_data = webview.state::<PendingUpdateData>().inner();
+    pending_data.0.lock().unwrap().take();
+}
diff --git a/apps/app/src/updater_impl_noop.rs b/apps/app/src/updater_impl_noop.rs
new file mode 100644
index 0000000000..b8871f65b9
--- /dev/null
+++ b/apps/app/src/updater_impl_noop.rs
@@ -0,0 +1,26 @@
+use crate::api::Result;
+use theseus::ErrorKind;
+
+#[derive(Default)]
+pub struct PendingUpdateData;
+
+#[tauri::command]
+pub fn get_update_size() -> Result<()> {
+    updates_are_disabled()
+}
+
+#[tauri::command]
+pub fn enqueue_update_for_installation() -> Result<()> {
+    updates_are_disabled()
+}
+
+fn updates_are_disabled() -> Result<()> {
+    let error: theseus::Error = ErrorKind::OtherError(
+        "Updates are disabled in this build.".to_string(),
+    )
+    .into();
+    Err(error.into())
+}
+
+#[tauri::command]
+pub fn remove_enqueued_update() {}
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
index 92b7b53fa6..92e71416a8 100644
--- a/packages/app-lib/src/event/mod.rs
+++ b/packages/app-lib/src/event/mod.rs
@@ -176,7 +176,6 @@ pub enum LoadingBarType {
         import_location: PathBuf,
         profile_name: String,
     },
-    CheckingForUpdates,
     LauncherUpdate {
         version: String,
         current_version: String,

From 5495b01bc57d624ad8c899df5630eb0fbff3ee7a Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Wed, 9 Jul 2025 20:38:35 -0500
Subject: [PATCH 13/31] Turn download progress into an error bar on failure

---
 apps/app-frontend/src/components/ui/ProgressBar.vue | 13 +++++++++++--
 apps/app-frontend/src/components/ui/UpdateModal.vue |  7 ++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/ProgressBar.vue b/apps/app-frontend/src/components/ui/ProgressBar.vue
index 1d2547484f..93ad5b5a4a 100644
--- a/apps/app-frontend/src/components/ui/ProgressBar.vue
+++ b/apps/app-frontend/src/components/ui/ProgressBar.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="progress-bar">
-    <div class="progress-bar__fill" :style="{ width: `${progress}%` }"></div>
+    <div
+      class="progress-bar__fill"
+      :style="{
+        width: `${progress}%`,
+        'background-color': error ? 'var(--color-red)' : 'var(--color-brand)',
+      }"
+    ></div>
   </div>
 </template>
 
@@ -13,6 +19,10 @@ defineProps({
       return value >= 0 && value <= 100
     },
   },
+  error: {
+    type: Boolean,
+    default: false,
+  },
 })
 </script>
 
@@ -27,7 +37,6 @@ defineProps({
 
 .progress-bar__fill {
   height: 100%;
-  background-color: var(--color-brand);
   transition: width 0.3s;
 }
 </style>
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 3a710637c5..dc9108768a 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -14,7 +14,7 @@
         formatMessage(messages.bodyChangelog)
       }}</a>
     </div>
-    <ProgressBar class="mt-4" :progress="downloadProgress" />
+    <ProgressBar class="mt-4" :progress="downloadProgress" :error="downloadError" />
     <div class="mt-4 flex flex-wrap gap-2">
       <ButtonStyled color="green">
         <button :disabled="updatingImmediately" @click="installUpdateNow">
@@ -107,6 +107,7 @@ const updateSize = ref<number>()
 const updatingImmediately = ref(false)
 const downloadInProgress = ref(false)
 const downloadProgress = ref(0)
+const downloadError = ref(false)
 
 const enqueuedUpdate = ref<string | null>(null)
 
@@ -165,6 +166,9 @@ function updateAtNextExit() {
 }
 
 async function downloadUpdate() {
+  downloadError.value = false
+  downloadProgress.value = 0
+
   const versionToDownload = update.value!.version
 
   downloadInProgress.value = true
@@ -172,6 +176,7 @@ async function downloadUpdate() {
     await enqueueUpdateForInstallation(update.value!.rid)
   } catch (e) {
     downloadInProgress.value = false
+    downloadError.value = true
 
     handleError(e)
 

From 8922c7ab0386ddeec094a866887cc93008e47ea6 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Wed, 9 Jul 2025 20:42:23 -0500
Subject: [PATCH 14/31] Restore 5 minute update check instead of 30 seconds

---
 apps/app-frontend/src/App.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 416f1b8790..5c32aaa039 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -394,8 +394,7 @@ async function checkUpdates() {
     () => {
       checkUpdates()
     },
-    // 5 * 60 * 1000,
-    30 * 1000,
+    5 * 60 * 1000,
   )
 }
 

From 3b74e021b5ab5833dc0f08447821d8f4a436f509 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Wed, 9 Jul 2025 23:07:07 -0500
Subject: [PATCH 15/31] Fix PendingUpdateData being seen as a unit struct

---
 apps/app/src/updater_impl_noop.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/src/updater_impl_noop.rs b/apps/app/src/updater_impl_noop.rs
index b8871f65b9..801a09e547 100644
--- a/apps/app/src/updater_impl_noop.rs
+++ b/apps/app/src/updater_impl_noop.rs
@@ -2,7 +2,7 @@ use crate::api::Result;
 use theseus::ErrorKind;
 
 #[derive(Default)]
-pub struct PendingUpdateData;
+pub struct PendingUpdateData(());
 
 #[tauri::command]
 pub fn get_update_size() -> Result<()> {

From f9a4042f13ab4cb125adc937a68afe619cc8d02d Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Thu, 10 Jul 2025 08:28:15 -0500
Subject: [PATCH 16/31] Fix lint

---
 apps/app-frontend/src/App.vue                            | 9 ++++-----
 .../src/components/ui/modal/ModalWrapper.vue             | 2 +-
 packages/app-lib/src/state/settings.rs                   | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 5c32aaa039..7a90c9f494 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -33,7 +33,7 @@ import { useLoading, useTheming } from '@/store/state'
 import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
-import { get } from '@/helpers/settings.ts'
+import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
 import RunningAppBar from '@/components/ui/RunningAppBar.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
@@ -71,7 +71,6 @@ import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 import UpdateModal from '@/components/ui/UpdateModal.vue'
 import { get_available_capes, get_available_skins } from './helpers/skins'
 import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer'
-import { get as getSettings, set as setSettings } from '@/helpers/settings.ts'
 
 const themeStore = useTheming()
 
@@ -123,7 +122,7 @@ async function setupApp() {
     toggle_sidebar,
     developer_mode,
     feature_flags,
-  } = await get()
+  } = await getSettings()
 
   if (default_page === 'Library') {
     await router.push('/library')
@@ -402,7 +401,7 @@ async function skipUpdate(version) {
   enqueuedUpdate.value = null
 
   updateSkipped.value = true
-  let settings = await getSettings()
+  const settings = await getSettings()
   settings.skipped_update = version
   await setSettings(settings)
 }
@@ -414,7 +413,7 @@ async function updateEnqueuedForLater(version) {
 async function forceOpenUpdateModal() {
   if (updateSkipped.value) {
     updateSkipped.value = false
-    let settings = await getSettings()
+    const settings = await getSettings()
     settings.skipped_update = null
     await setSettings(settings)
   }
diff --git a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
index b48438d7cd..8720796ad7 100644
--- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
@@ -52,8 +52,8 @@ function onModalHide() {
     ref="modal"
     :header="header"
     :noblur="!themeStore.advancedRendering"
-    @hide="onModalHide"
     :closable="closable"
+    @hide="onModalHide"
   >
     <template #title>
       <slot name="title" />
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 44ac556747..0248f907d5 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -119,7 +119,7 @@ impl Settings {
                 .as_ref()
                 .and_then(|x| serde_json::from_str(x).ok())
                 .unwrap_or_default(),
-            skipped_update: res.skipped_update
+            skipped_update: res.skipped_update,
         })
     }
 

From 286ab6d4a07be06c618c920866bae95e0fca248c Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Thu, 10 Jul 2025 08:35:41 -0500
Subject: [PATCH 17/31] Make CI also lint updater code

---
 apps/app/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/app/package.json b/apps/app/package.json
index 43f0172032..e79a0e1607 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -5,8 +5,8 @@
     "build": "tauri build",
     "dev": "tauri dev",
     "test": "cargo nextest run --all-targets --no-fail-fast",
-    "lint": "cargo fmt --check && cargo clippy --all-targets",
-    "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt"
+    "lint": "cargo fmt --check && cargo clippy --all-targets && cargo clippy --all-targets --features updater",
+    "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo clippy --all-targets --features updater --fix --allow-dirty && cargo fmt"
   },
   "devDependencies": {
     "@tauri-apps/cli": "2.5.0"

From 59ab09a2753fd2700a593e5de92049fb7afd8945 Mon Sep 17 00:00:00 2001
From: Calum <calum@modrinth.com>
Date: Thu, 10 Jul 2025 17:50:24 +0100
Subject: [PATCH 18/31] feat: create AppearingProgressBar component

---
 .../ui/servers/PlatformMrpackModal.vue        | 111 +-------------
 .../components/base/AppearingProgressBar.vue  | 142 ++++++++++++++++++
 packages/ui/src/components/index.ts           |   1 +
 3 files changed, 146 insertions(+), 108 deletions(-)
 create mode 100644 packages/ui/src/components/base/AppearingProgressBar.vue

diff --git a/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue b/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
index a9810f4f11..42fb474869 100644
--- a/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
@@ -1,36 +1,7 @@
 <template>
   <NewModal ref="mrpackModal" header="Uploading mrpack" :closable="!isLoading" @show="onShow">
     <div class="flex flex-col gap-4 md:w-[600px]">
-      <Transition
-        enter-active-class="transition-all duration-300 ease-out"
-        enter-from-class="opacity-0 max-h-0"
-        enter-to-class="opacity-100 max-h-20"
-        leave-active-class="transition-all duration-200 ease-in"
-        leave-from-class="opacity-100 max-h-20"
-        leave-to-class="opacity-0 max-h-0"
-      >
-        <div v-if="isLoading" class="w-full">
-          <div class="mb-2 flex justify-between text-sm">
-            <Transition name="phrase-fade" mode="out-in">
-              <span :key="currentPhrase" class="text-lg font-medium text-contrast">{{
-                currentPhrase
-              }}</span>
-            </Transition>
-            <div class="flex flex-col items-end">
-              <span class="text-secondary">{{ Math.round(uploadProgress) }}%</span>
-              <span class="text-xs text-secondary"
-                >{{ formatBytes(uploadedBytes) }} / {{ formatBytes(totalBytes) }}</span
-              >
-            </div>
-          </div>
-          <div class="h-2 w-full rounded-full bg-divider">
-            <div
-              class="h-2 animate-pulse rounded-full bg-brand transition-all duration-300 ease-out"
-              :style="{ width: `${uploadProgress}%` }"
-            ></div>
-          </div>
-        </div>
-      </Transition>
+      <AppearingProgressBar :max-value="totalBytes" :current-value="uploadedBytes" />
 
       <Transition
         enter-active-class="transition-all duration-300 ease-out"
@@ -144,7 +115,7 @@
 </template>
 
 <script setup lang="ts">
-import { BackupWarning, ButtonStyled, NewModal } from "@modrinth/ui";
+import { BackupWarning, ButtonStyled, NewModal, AppearingProgressBar } from "@modrinth/ui";
 import {
   UploadIcon,
   RightArrowIcon,
@@ -187,50 +158,9 @@ const hardReset = ref(false);
 const isLoading = ref(false);
 const loadingServerCheck = ref(false);
 const mrpackFile = ref<File | null>(null);
-const uploadProgress = ref(0);
 const uploadedBytes = ref(0);
 const totalBytes = ref(0);
 
-const uploadPhrases = [
-  "Removing Herobrine...",
-  "Feeding parrots...",
-  "Teaching villagers new trades...",
-  "Convincing creepers to be friendly...",
-  "Polishing diamonds...",
-  "Training wolves to fetch...",
-  "Building pixel art...",
-  "Explaining redstone to beginners...",
-  "Collecting all the cats...",
-  "Negotiating with endermen...",
-  "Planting suspicious stew ingredients...",
-  "Calibrating TNT blast radius...",
-  "Teaching chickens to fly...",
-  "Sorting inventory alphabetically...",
-  "Convincing iron golems to smile...",
-];
-
-const currentPhrase = ref("Uploading...");
-let phraseInterval: NodeJS.Timeout | null = null;
-const usedPhrases = ref(new Set<number>());
-
-const getNextPhrase = () => {
-  if (usedPhrases.value.size >= uploadPhrases.length) {
-    const currentPhraseIndex = uploadPhrases.indexOf(currentPhrase.value);
-    usedPhrases.value.clear();
-    if (currentPhraseIndex !== -1) {
-      usedPhrases.value.add(currentPhraseIndex);
-    }
-  }
-  const availableIndices = uploadPhrases
-    .map((_, index) => index)
-    .filter((index) => !usedPhrases.value.has(index));
-
-  const randomIndex = availableIndices[Math.floor(Math.random() * availableIndices.length)];
-  usedPhrases.value.add(randomIndex);
-
-  return uploadPhrases[randomIndex];
-};
-
 const isDangerous = computed(() => hardReset.value);
 const canInstall = computed(() => !mrpackFile.value || isLoading.value || loadingServerCheck.value);
 
@@ -259,31 +189,17 @@ const handleReinstall = async () => {
   }
 
   isLoading.value = true;
-  uploadProgress.value = 0;
-  uploadProgress.value = 0;
   uploadedBytes.value = 0;
   totalBytes.value = mrpackFile.value.size;
 
-  currentPhrase.value = getNextPhrase();
-  phraseInterval = setInterval(() => {
-    currentPhrase.value = getNextPhrase();
-  }, 4500);
-
   const { onProgress, promise } = props.server.general.reinstallFromMrpack(
     mrpackFile.value,
     hardReset.value,
   );
 
-  onProgress(({ loaded, total, progress }) => {
-    uploadProgress.value = progress;
+  onProgress(({ loaded, total }) => {
     uploadedBytes.value = loaded;
     totalBytes.value = total;
-
-    if (phraseInterval && progress >= 100) {
-      clearInterval(phraseInterval);
-      phraseInterval = null;
-      currentPhrase.value = "Installing modpack...";
-    }
   });
 
   try {
@@ -316,10 +232,6 @@ const handleReinstall = async () => {
     }
   } finally {
     isLoading.value = false;
-    if (phraseInterval) {
-      clearInterval(phraseInterval);
-      phraseInterval = null;
-    }
   }
 };
 const onShow = () => {
@@ -328,15 +240,8 @@ const onShow = () => {
   loadingServerCheck.value = false;
   isLoading.value = false;
   mrpackFile.value = null;
-  uploadProgress.value = 0;
   uploadedBytes.value = 0;
   totalBytes.value = 0;
-  currentPhrase.value = "Uploading...";
-  usedPhrases.value.clear();
-  if (phraseInterval) {
-    clearInterval(phraseInterval);
-    phraseInterval = null;
-  }
 };
 
 const show = () => mrpackModal.value?.show();
@@ -349,14 +254,4 @@ defineExpose({ show, hide });
 .stylized-toggle:checked::after {
   background: var(--color-accent-contrast) !important;
 }
-
-.phrase-fade-enter-active,
-.phrase-fade-leave-active {
-  transition: opacity 0.3s ease;
-}
-
-.phrase-fade-enter-from,
-.phrase-fade-leave-to {
-  opacity: 0;
-}
 </style>
diff --git a/packages/ui/src/components/base/AppearingProgressBar.vue b/packages/ui/src/components/base/AppearingProgressBar.vue
new file mode 100644
index 0000000000..5c9f10fe3e
--- /dev/null
+++ b/packages/ui/src/components/base/AppearingProgressBar.vue
@@ -0,0 +1,142 @@
+<template>
+  <Transition
+    enter-active-class="transition-all duration-300 ease-out"
+    enter-from-class="opacity-0 max-h-0"
+    enter-to-class="opacity-100 max-h-20"
+    leave-active-class="transition-all duration-200 ease-in"
+    leave-from-class="opacity-100 max-h-20"
+    leave-to-class="opacity-0 max-h-0"
+  >
+    <div v-if="isVisible" class="w-full">
+      <div class="mb-2 flex justify-between text-sm">
+        <Transition name="phrase-fade" mode="out-in">
+          <span :key="currentPhrase" class="text-lg font-medium text-contrast">{{
+            currentPhrase
+          }}</span>
+        </Transition>
+        <div class="flex flex-col items-end">
+          <span class="text-secondary">{{ Math.round(progress) }}%</span>
+          <span class="text-xs text-secondary"
+            >{{ formatBytes(currentValue) }} / {{ formatBytes(maxValue) }}</span
+          >
+        </div>
+      </div>
+      <div class="h-2 w-full rounded-full bg-divider">
+        <div
+          class="h-2 animate-pulse bg-brand rounded-full transition-all duration-300 ease-out"
+          :style="{ width: `${progress}%` }"
+        ></div>
+      </div>
+    </div>
+  </Transition>
+</template>
+
+<script setup lang="ts">
+import { formatBytes } from '@modrinth/utils'
+import { computed, onUnmounted, ref, watch } from 'vue'
+
+interface Props {
+  maxValue: number
+  currentValue: number
+  tips?: string[]
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  tips: () => [
+    'Removing Herobrine...',
+    'Feeding parrots...',
+    'Teaching villagers new trades...',
+    'Convincing creepers to be friendly...',
+    'Polishing diamonds...',
+    'Training wolves to fetch...',
+    'Building pixel art...',
+    'Explaining redstone to beginners...',
+    'Collecting all the cats...',
+    'Negotiating with endermen...',
+    'Planting suspicious stew ingredients...',
+    'Calibrating TNT blast radius...',
+    'Teaching chickens to fly...',
+    'Sorting inventory alphabetically...',
+    'Convincing iron golems to smile...',
+  ],
+})
+
+const currentPhrase = ref('')
+const usedPhrases = ref(new Set<number>())
+let phraseInterval: NodeJS.Timeout | null = null
+
+const progress = computed(() => {
+  if (props.maxValue === 0) return 0
+  return Math.min((props.currentValue / props.maxValue) * 100, 100)
+})
+
+const isVisible = computed(() => props.maxValue > 0 && props.currentValue >= 0)
+
+function getNextPhrase() {
+  if (usedPhrases.value.size >= props.tips.length) {
+    const currentPhraseIndex = props.tips.indexOf(currentPhrase.value)
+    usedPhrases.value.clear()
+    if (currentPhraseIndex !== -1) {
+      usedPhrases.value.add(currentPhraseIndex)
+    }
+  }
+  const availableIndices = props.tips
+    .map((_, index) => index)
+    .filter((index) => !usedPhrases.value.has(index))
+
+  const randomIndex = availableIndices[Math.floor(Math.random() * availableIndices.length)]
+  usedPhrases.value.add(randomIndex)
+
+  return props.tips[randomIndex]
+}
+
+function startPhraseRotation() {
+  if (phraseInterval) {
+    clearInterval(phraseInterval)
+  }
+
+  currentPhrase.value = getNextPhrase()
+  phraseInterval = setInterval(() => {
+    currentPhrase.value = getNextPhrase()
+  }, 4500)
+}
+
+function stopPhraseRotation() {
+  if (phraseInterval) {
+    clearInterval(phraseInterval)
+    phraseInterval = null
+  }
+}
+
+watch(isVisible, (newVisible) => {
+  if (newVisible) {
+    startPhraseRotation()
+  } else {
+    stopPhraseRotation()
+    usedPhrases.value.clear()
+  }
+})
+
+watch(progress, (newProgress) => {
+  if (newProgress >= 100) {
+    stopPhraseRotation()
+    currentPhrase.value = 'Installing modpack...'
+  }
+})
+
+onUnmounted(() => {
+  stopPhraseRotation()
+})
+</script>
+
+<style scoped>
+.phrase-fade-enter-active,
+.phrase-fade-leave-active {
+  transition: opacity 0.3s ease;
+}
+
+.phrase-fade-enter-from,
+.phrase-fade-leave-to {
+  opacity: 0;
+}
+</style>
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index 3057f43de3..5a7c62e23f 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -1,6 +1,7 @@
 // Base content
 export { default as Accordion } from './base/Accordion.vue'
 export { default as Admonition } from './base/Admonition.vue'
+export { default as AppearingProgressBar } from './base/AppearingProgressBar.vue'
 export { default as AutoLink } from './base/AutoLink.vue'
 export { default as Avatar } from './base/Avatar.vue'
 export { default as Badge } from './base/Badge.vue'

From 35baa1af5e92f913adcd1f459030e00b77b2d9af Mon Sep 17 00:00:00 2001
From: Calum <calum@modrinth.com>
Date: Thu, 10 Jul 2025 20:00:39 +0100
Subject: [PATCH 19/31] feat: polish update available modal

---
 .../src/components/ui/UpdateModal.vue         | 156 ++++++++++++------
 .../ui/src/components/base/JoinedButtons.vue  | 120 ++++++++++++++
 packages/ui/src/components/index.ts           |   2 +
 3 files changed, 228 insertions(+), 50 deletions(-)
 create mode 100644 packages/ui/src/components/base/JoinedButtons.vue

diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index dc9108768a..0372d351ca 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -3,40 +3,49 @@
     ref="modal"
     :header="formatMessage(messages.header)"
     :on-hide="onHide"
-    :closable="!updatingImmediately"
+    :closable="!updatingImmediately && !downloadInProgress"
   >
-    <div>{{ formatMessage(messages.bodyVersion, { version: update!.version }) }}</div>
-    <div v-if="updateSize">
-      {{ formatMessage(messages.bodySize, { size: formatBytes(updateSize) }) }}
-    </div>
-    <div>
-      <a href="https://modrinth.com/news/changelog?filter=app">{{
-        formatMessage(messages.bodyChangelog)
-      }}</a>
-    </div>
-    <ProgressBar class="mt-4" :progress="downloadProgress" :error="downloadError" />
-    <div class="mt-4 flex flex-wrap gap-2">
-      <ButtonStyled color="green">
-        <button :disabled="updatingImmediately" @click="installUpdateNow">
-          <RefreshCwIcon />
-          {{ formatMessage(messages.restartNow) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled>
-        <button
-          :disabled="updatingImmediately || downloadInProgress || update!.version == enqueuedUpdate"
-          @click="updateAtNextExit"
-        >
-          <RightArrowIcon />
-          {{ formatMessage(messages.later) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled color="red">
-        <button :disabled="updatingImmediately || downloadInProgress" @click="skipUpdate">
-          <XIcon />
-          {{ formatMessage(messages.skip) }}
-        </button>
-      </ButtonStyled>
+    <div class="flex flex-col gap-4">
+      <AppearingProgressBar
+        :max-value="shouldShowProgress ? updateSize || 0 : 0"
+        :current-value="shouldShowProgress ? downloadedBytes : 0"
+        color="green"
+        class="w-full"
+      />
+
+      <div class="flex flex-col gap-4 max-w-[500px]">
+        <div class="flex items-center gap-2 mx-auto">
+          <span
+            class="inline-flex items-center px-2 py-0.5 rounded text-lg font-semibold bg-red text-bg-raised border border-red"
+          >
+            v{{ update!.currentVersion }}
+          </span>
+          <RightArrowIcon class="size-6 text-secondary" />
+          <span
+            class="inline-flex items-center px-2 py-0.5 rounded text-lg font-semibold bg-brand text-bg-raised border border-green"
+          >
+            v{{ update!.version }}
+          </span>
+        </div>
+        <div>{{ formatMessage(messages.bodyVersion) }}</div>
+        <div>
+          {{ formatMessage(messages.downloadSize, { size: formatBytes(updateSize) }) }}
+        </div>
+        <div class="flex flex-wrap gap-2 w-full">
+          <JoinedButtons
+            :actions="installActions"
+            :disabled="updatingImmediately || downloadInProgress"
+            color="green"
+          />
+          <div>
+            <ButtonStyled>
+              <a href="https://modrinth.com/news/changelog?filter=app" target="_blank">
+                <ExternalIcon /> {{ formatMessage(messages.changelog) }}
+              </a>
+            </ButtonStyled>
+          </div>
+        </div>
+      </div>
     </div>
   </ModalWrapper>
 </template>
@@ -44,13 +53,19 @@
 <script setup lang="ts">
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { defineMessages, useVIntl } from '@vintl/vintl'
-import { useTemplateRef, ref } from 'vue'
-import { ButtonStyled } from '@modrinth/ui'
-import { RefreshCwIcon, XIcon, RightArrowIcon } from '@modrinth/assets'
+import { useTemplateRef, ref, computed } from 'vue'
+import { AppearingProgressBar, ButtonStyled, JoinedButtons } from '@modrinth/ui'
+import type { JoinedButtonAction } from '@modrinth/ui'
+import {
+  ExternalIcon,
+  RefreshCwIcon,
+  RightArrowIcon,
+  TimerIcon,
+  XCircleIcon,
+} from '@modrinth/assets'
 import { enqueueUpdateForInstallation, getUpdateSize, removeEnqueuedUpdate } from '@/helpers/utils'
 import { formatBytes } from '@modrinth/utils'
 import { handleError } from '@/store/notifications'
-import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { loading_listener } from '@/helpers/events'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 
@@ -64,31 +79,32 @@ const { formatMessage } = useVIntl()
 const messages = defineMessages({
   header: {
     id: 'app.update.modal-header',
-    defaultMessage: 'An update is available!',
+    defaultMessage: 'A new app update is available!',
   },
   bodyVersion: {
     id: 'app.update.modal-body-version',
-    defaultMessage: 'Version {version} of the Modrinth App is available for installation.',
+    defaultMessage:
+      'We recommend updating as soon as possible so you can enjoy the latest features and improvements.',
   },
-  bodySize: {
-    id: 'app.update.modal-body-size',
-    defaultMessage: 'The download is {size} in size.',
+  downloadSize: {
+    id: 'app.update.download-size',
+    defaultMessage: 'The download size of the update is {size}.',
   },
-  bodyChangelog: {
-    id: 'app.update.modal-body-changelog',
-    defaultMessage: 'Click here to view the changelog.',
+  changelog: {
+    id: 'app.update.changelog',
+    defaultMessage: 'Changelog',
   },
   restartNow: {
     id: 'app.update.restart',
-    defaultMessage: 'Update Now',
+    defaultMessage: 'Update now',
   },
   later: {
     id: 'app.update.later',
-    defaultMessage: 'Update on Next Restart',
+    defaultMessage: 'Update on next restart',
   },
   skip: {
     id: 'app.update.skip',
-    defaultMessage: 'Skip This Update',
+    defaultMessage: 'Skip this update',
   },
 })
 
@@ -111,6 +127,37 @@ const downloadError = ref(false)
 
 const enqueuedUpdate = ref<string | null>(null)
 
+const installActions = computed<JoinedButtonAction[]>(() => [
+  {
+    id: 'install-now',
+    label: formatMessage(messages.restartNow),
+    icon: RefreshCwIcon,
+    action: installUpdateNow,
+    color: 'green',
+  },
+  {
+    id: 'install-later',
+    label: formatMessage(messages.later),
+    icon: TimerIcon,
+    action: updateAtNextExit,
+  },
+  {
+    id: 'skip',
+    label: formatMessage(messages.skip),
+    action: skipUpdate,
+    icon: XCircleIcon,
+    color: 'red',
+  },
+])
+
+const downloadedBytes = computed(() => {
+  return updateSize.value ? Math.round((downloadProgress.value / 100) * updateSize.value) : 0
+})
+
+const shouldShowProgress = computed(() => {
+  return downloadInProgress.value || updatingImmediately.value
+})
+
 const modal = useTemplateRef('modal')
 const isOpen = ref(false)
 
@@ -124,7 +171,7 @@ async function show(newUpdate: UpdateData) {
     downloadProgress.value = 0
   }
 
-  modal.value!.show()
+  modal.value!.show(new MouseEvent('click'))
   isOpen.value = true
 }
 
@@ -138,7 +185,16 @@ function hide() {
 
 defineExpose({ show, hide, isOpen })
 
-loading_listener((event) => {
+// TODO: Migrate to common events.ts helper when events/listeners are refactored
+interface LoadingListenerEvent {
+  event: {
+    type: 'launcher_update'
+    version: string
+  }
+  fraction?: number
+}
+
+loading_listener((event: LoadingListenerEvent) => {
   if (event.event.type === 'launcher_update') {
     if (event.event.version === update.value!.version) {
       downloadProgress.value = (event.fraction ?? 1.0) * 100
diff --git a/packages/ui/src/components/base/JoinedButtons.vue b/packages/ui/src/components/base/JoinedButtons.vue
new file mode 100644
index 0000000000..4fb4040a6b
--- /dev/null
+++ b/packages/ui/src/components/base/JoinedButtons.vue
@@ -0,0 +1,120 @@
+<template>
+  <div class="joined-buttons">
+    <ButtonStyled :color="color">
+      <button :disabled="disabled" @click="handlePrimaryAction">
+        <component :is="primaryAction.icon" v-if="primaryAction.icon" aria-hidden="true" />
+        {{ primaryAction.label }}
+      </button>
+    </ButtonStyled>
+    <ButtonStyled v-if="dropdownActions.length > 0" :color="color">
+      <OverflowMenu class="btn-dropdown-animation" :options="dropdownOptions" :disabled="disabled">
+        <DropdownIcon />
+        <template v-for="action in dropdownActions" :key="action.id" #[action.id]>
+          <component :is="action.icon" v-if="action.icon" aria-hidden="true" />
+          {{ action.label }}
+        </template>
+      </OverflowMenu>
+    </ButtonStyled>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { ButtonStyled, OverflowMenu } from '../index'
+import { DropdownIcon } from '@modrinth/assets'
+import type { Component } from 'vue'
+
+// TODO: This should be moved to a shared types file.
+type Colors = 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple'
+
+export interface JoinedButtonAction {
+  id: string
+  label: string
+  icon?: Component
+  action: () => void
+  color?: Colors
+  hoverFilled?: boolean
+}
+
+interface Props {
+  actions: JoinedButtonAction[]
+  color?: Colors
+  disabled?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  color: 'standard',
+  disabled: false,
+})
+
+const primaryAction = computed(() => props.actions[0])
+
+const dropdownActions = computed(() => props.actions.slice(1))
+
+const colorMap: Record<
+  Colors,
+  | 'red'
+  | 'orange'
+  | 'green'
+  | 'blue'
+  | 'purple'
+  | 'highlight'
+  | 'primary'
+  | 'danger'
+  | 'secondary'
+  | undefined
+> = {
+  standard: 'secondary',
+  brand: 'primary',
+  red: 'red',
+  orange: 'orange',
+  green: 'green',
+  blue: 'blue',
+  purple: 'purple',
+}
+
+const dropdownOptions = computed(() =>
+  dropdownActions.value.map((action) => ({
+    id: action.id,
+    color: action.color ? colorMap[action.color] : undefined,
+    action: action.action,
+    hoverFilled: action.hoverFilled ?? true,
+  })),
+)
+
+function handlePrimaryAction() {
+  if (primaryAction.value && !props.disabled) {
+    primaryAction.value.action()
+  }
+}
+</script>
+
+<style scoped>
+.joined-buttons {
+  display: flex;
+  align-items: center;
+}
+
+.joined-buttons > :deep(.btn) {
+  border-radius: 0;
+}
+
+.joined-buttons > :deep(.btn:first-child) {
+  border-top-left-radius: var(--radius-md);
+  border-bottom-left-radius: var(--radius-md);
+}
+
+.joined-buttons > :deep(.btn:last-child) {
+  border-top-right-radius: var(--radius-md);
+  border-bottom-right-radius: var(--radius-md);
+  margin-left: -1px;
+}
+
+.joined-buttons > :deep(.btn:not(:last-child)) {
+  border-right: none;
+}
+
+.btn-dropdown-animation {
+  padding: 0.5rem !important;
+}
+</style>
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index 5a7c62e23f..6f99e23a34 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -22,6 +22,8 @@ export { default as FileInput } from './base/FileInput.vue'
 export { default as FilterBar } from './base/FilterBar.vue'
 export type { FilterBarOption } from './base/FilterBar.vue'
 export { default as HeadingLink } from './base/HeadingLink.vue'
+export { default as JoinedButtons } from './base/JoinedButtons.vue'
+export type { JoinedButtonAction } from './base/JoinedButtons.vue'
 export { default as LoadingIndicator } from './base/LoadingIndicator.vue'
 export { default as ManySelect } from './base/ManySelect.vue'
 export { default as MarkdownEditor } from './base/MarkdownEditor.vue'

From 69a461dffcee7a4cf6277c56709b0754f30e8e57 Mon Sep 17 00:00:00 2001
From: Calum <calum@modrinth.com>
Date: Fri, 11 Jul 2025 14:06:44 +0100
Subject: [PATCH 20/31] feat: add error handling

---
 .../src/components/ui/UpdateModal.vue         | 60 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 0372d351ca..6eb7787bf8 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -7,6 +7,7 @@
   >
     <div class="flex flex-col gap-4">
       <AppearingProgressBar
+        v-if="!downloadError"
         :max-value="shouldShowProgress ? updateSize || 0 : 0"
         :current-value="shouldShowProgress ? downloadedBytes : 0"
         color="green"
@@ -31,6 +32,21 @@
         <div>
           {{ formatMessage(messages.downloadSize, { size: formatBytes(updateSize) }) }}
         </div>
+        <div v-if="downloadError" class="flex flex-col gap-2">
+          <div class="text-red font-medium">
+            {{ formatMessage(messages.downloadError) }}
+          </div>
+          <ButtonStyled color="red">
+            <button @click="copyError">
+              <ClipboardCopyIcon />
+              {{
+                copiedError
+                  ? formatMessage(messages.copiedError)
+                  : formatMessage(messages.copyError)
+              }}
+            </button>
+          </ButtonStyled>
+        </div>
         <div class="flex flex-wrap gap-2 w-full">
           <JoinedButtons
             :actions="installActions"
@@ -62,6 +78,7 @@ import {
   RightArrowIcon,
   TimerIcon,
   XCircleIcon,
+  ClipboardCopyIcon,
 } from '@modrinth/assets'
 import { enqueueUpdateForInstallation, getUpdateSize, removeEnqueuedUpdate } from '@/helpers/utils'
 import { formatBytes } from '@modrinth/utils'
@@ -81,6 +98,10 @@ const messages = defineMessages({
     id: 'app.update.modal-header',
     defaultMessage: 'A new app update is available!',
   },
+  copiedError: {
+    id: 'app.update.copied-error',
+    defaultMessage: 'Copied to clipboard!',
+  },
   bodyVersion: {
     id: 'app.update.modal-body-version',
     defaultMessage:
@@ -106,6 +127,15 @@ const messages = defineMessages({
     id: 'app.update.skip',
     defaultMessage: 'Skip this update',
   },
+  downloadError: {
+    id: 'app.update.download-error',
+    defaultMessage:
+      'An error occurred while downloading the update. Please try again later. Contact support if the issue persists.',
+  },
+  copyError: {
+    id: 'app.update.copy-error',
+    defaultMessage: 'Copy error',
+  },
 })
 
 type UpdateData = {
@@ -123,7 +153,8 @@ const updateSize = ref<number>()
 const updatingImmediately = ref(false)
 const downloadInProgress = ref(false)
 const downloadProgress = ref(0)
-const downloadError = ref(false)
+const copiedError = ref(false)
+const downloadError = ref<Error | null>(null)
 
 const enqueuedUpdate = ref<string | null>(null)
 
@@ -185,6 +216,29 @@ function hide() {
 
 defineExpose({ show, hide, isOpen })
 
+async function copyError() {
+  if (downloadError.value) {
+    copiedError.value = true
+    const errorData = {
+      message: downloadError.value.message,
+      stack: downloadError.value.stack,
+      name: downloadError.value.name,
+      timestamp: new Date().toISOString(),
+      updateVersion: update.value?.version,
+    }
+
+    setTimeout(() => {
+      copiedError.value = false
+    }, 3000)
+
+    try {
+      await navigator.clipboard.writeText(JSON.stringify(errorData, null, 2))
+    } catch (e) {
+      console.error('Failed to copy error to clipboard:', e)
+    }
+  }
+}
+
 // TODO: Migrate to common events.ts helper when events/listeners are refactored
 interface LoadingListenerEvent {
   event: {
@@ -222,7 +276,7 @@ function updateAtNextExit() {
 }
 
 async function downloadUpdate() {
-  downloadError.value = false
+  downloadError.value = null
   downloadProgress.value = 0
 
   const versionToDownload = update.value!.version
@@ -232,7 +286,7 @@ async function downloadUpdate() {
     await enqueueUpdateForInstallation(update.value!.rid)
   } catch (e) {
     downloadInProgress.value = false
-    downloadError.value = true
+    downloadError.value = e instanceof Error ? e : new Error(String(e))
 
     handleError(e)
 

From 62e2e5ea6fc2299b90e6a1df29202111642bb83d Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Fri, 11 Jul 2025 09:29:38 -0500
Subject: [PATCH 21/31] Open changelog with tauri-plugin-opener

---
 apps/app-frontend/src/components/ui/UpdateModal.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 6eb7787bf8..1f7b899d90 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -55,9 +55,9 @@
           />
           <div>
             <ButtonStyled>
-              <a href="https://modrinth.com/news/changelog?filter=app" target="_blank">
+              <button @click="() => openUrl('https://modrinth.com/news/changelog?filter=app')">
                 <ExternalIcon /> {{ formatMessage(messages.changelog) }}
-              </a>
+              </button>
             </ButtonStyled>
           </div>
         </div>
@@ -85,6 +85,7 @@ import { formatBytes } from '@modrinth/utils'
 import { handleError } from '@/store/notifications'
 import { loading_listener } from '@/helpers/events'
 import { getCurrentWindow } from '@tauri-apps/api/window'
+import { openUrl } from '@tauri-apps/plugin-opener'
 
 const emit = defineEmits<{
   (e: 'updateSkipped', version: string): Promise<void>

From 6fa0ee487dce44bf43eeff59472a03c24a5cd58c Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Fri, 11 Jul 2025 16:22:20 -0500
Subject: [PATCH 22/31] Run intl:extract

---
 .../app-frontend/src/locales/en-US/index.json | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 8c24a440d6..558480cfad 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -20,26 +20,35 @@
   "app.settings.tabs.resource-management": {
     "message": "Resource management"
   },
-  "app.update.later": {
-    "message": "Update on Next Restart"
+  "app.update.changelog": {
+    "message": "Changelog"
+  },
+  "app.update.copied-error": {
+    "message": "Copied to clipboard!"
+  },
+  "app.update.copy-error": {
+    "message": "Copy error"
   },
-  "app.update.modal-body-changelog": {
-    "message": "Click here to view the changelog."
+  "app.update.download-error": {
+    "message": "An error occurred while downloading the update. Please try again later. Contact support if the issue persists."
   },
-  "app.update.modal-body-size": {
-    "message": "The download is {size} in size."
+  "app.update.download-size": {
+    "message": "The download size of the update is {size}."
+  },
+  "app.update.later": {
+    "message": "Update on next restart"
   },
   "app.update.modal-body-version": {
-    "message": "Version {version} of the Modrinth App is available for installation."
+    "message": "We recommend updating as soon as possible so you can enjoy the latest features and improvements."
   },
   "app.update.modal-header": {
-    "message": "An update is available!"
+    "message": "A new app update is available!"
   },
   "app.update.restart": {
-    "message": "Update Now"
+    "message": "Update now"
   },
   "app.update.skip": {
-    "message": "Skip This Update"
+    "message": "Skip this update"
   },
   "instance.add-server.add-and-play": {
     "message": "Add and play"

From 1e934312a40dde3db54a765e1c6651c2d73cd894 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Sat, 12 Jul 2025 15:05:17 -0500
Subject: [PATCH 23/31] Update completion toasts (#3978)

---
 apps/app-frontend/package.json                |  2 +-
 apps/app-frontend/src/App.vue                 | 30 +++++++++++++++++++
 .../src/components/ui/UpdateModal.vue         |  1 -
 apps/app-frontend/src/helpers/settings.ts     |  2 ++
 .../app-frontend/src/locales/en-US/index.json |  6 ++++
 apps/app/src/main.rs                          | 14 +++++++++
 ...8e7c4e7f15ea99527e7974619ef8ed946abe.json} | 10 +++++--
 ...82ac2570aaa096cd2ebb4de990f4d42cc5c9.json} |  6 ++--
 ...0250711195037_add-pending-update-toast.sql |  2 ++
 packages/app-lib/src/state/settings.rs        | 13 ++++++--
 .../ui/src/components/base/Notifications.vue  | 11 +++++--
 11 files changed, 85 insertions(+), 12 deletions(-)
 rename packages/app-lib/.sqlx/{query-cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef.json => query-30fecc13c6ea4da1e99e35d307aa8e7c4e7f15ea99527e7974619ef8ed946abe.json} (92%)
 rename packages/app-lib/.sqlx/{query-6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d.json => query-cd7c9f394e4f0ec8fd0043352f7382ac2570aaa096cd2ebb4de990f4d42cc5c9.json} (82%)
 create mode 100644 packages/app-lib/migrations/20250711195037_add-pending-update-toast.sql

diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json
index 77a697c216..d760df6d30 100644
--- a/apps/app-frontend/package.json
+++ b/apps/app-frontend/package.json
@@ -9,7 +9,7 @@
     "tsc:check": "vue-tsc --noEmit",
     "lint": "eslint . && prettier --check .",
     "fix": "eslint . --fix && prettier --write .",
-    "intl:extract": "formatjs extract \"{,src/components,src/composables,src/helpers,src/pages,src/store}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore \"**/*.d.ts\" --ignore node_modules --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace",
+    "intl:extract": "formatjs extract \"src/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore \"**/*.d.ts\" --ignore node_modules --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace",
     "test": "vue-tsc --noEmit"
   },
   "dependencies": {
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 7a90c9f494..78262624c2 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -71,6 +71,7 @@ import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
 import UpdateModal from '@/components/ui/UpdateModal.vue'
 import { get_available_capes, get_available_skins } from './helpers/skins'
 import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer'
+import { defineMessages, useVIntl } from '@vintl/vintl'
 
 const themeStore = useTheming()
 
@@ -109,6 +110,18 @@ onUnmounted(() => {
   document.querySelector('body').removeEventListener('auxclick', handleAuxClick)
 })
 
+const { formatMessage } = useVIntl()
+const messages = defineMessages({
+  updateInstalledToastTitle: {
+    id: 'app.update.complete-toast.title',
+    defaultMessage: 'Version {version} was successfully installed!',
+  },
+  updateInstalledToastText: {
+    id: 'app.update.complete-toast.text',
+    defaultMessage: 'Click here to view the changelog.',
+  },
+})
+
 async function setupApp() {
   stateInitialized.value = true
   const {
@@ -122,6 +135,7 @@ async function setupApp() {
     toggle_sidebar,
     developer_mode,
     feature_flags,
+    pending_update_toast_for_version,
   } = await getSettings()
 
   if (default_page === 'Library') {
@@ -218,6 +232,22 @@ async function setupApp() {
   } catch (error) {
     console.warn('Failed to generate skin previews in app setup.', error)
   }
+
+  if (pending_update_toast_for_version !== null) {
+    const settings = await getSettings()
+    settings.pending_update_toast_for_version = null
+    await setSettings(settings)
+
+    const version = await getVersion()
+    if (pending_update_toast_for_version === version) {
+      notifications.addNotification({
+        type: 'success',
+        title: formatMessage(messages.updateInstalledToastTitle, { version }),
+        text: formatMessage(messages.updateInstalledToastText),
+        clickAction: () => openUrl('https://modrinth.com/news/changelog?filter=app'),
+      })
+    }
+  }
 }
 
 const stateFailed = ref(false)
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index 1f7b899d90..bfd9771916 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -93,7 +93,6 @@ const emit = defineEmits<{
 }>()
 
 const { formatMessage } = useVIntl()
-
 const messages = defineMessages({
   header: {
     id: 'app.update.modal-header',
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
index 6b00e9bb84..fcc0a81446 100644
--- a/apps/app-frontend/src/helpers/settings.ts
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -62,7 +62,9 @@ export type AppSettings = {
 
   developer_mode: boolean
   feature_flags: Record<FeatureFlag, boolean>
+
   skipped_update: string | null
+  pending_update_toast_for_version: string | null
 }
 
 // Get full settings object
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 558480cfad..0952c26e77 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -23,6 +23,12 @@
   "app.update.changelog": {
     "message": "Changelog"
   },
+  "app.update.complete-toast.text": {
+    "message": "Click here to view the changelog."
+  },
+  "app.update.complete-toast.title": {
+    "message": "Version {version} was successfully installed!"
+  },
   "app.update.copied-error": {
     "message": "Copied to clipboard!"
   },
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index 5d901fe9df..f3a177d2d3 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -262,8 +262,22 @@ fn main() {
                 if matches!(event, tauri::RunEvent::Exit) {
                     let update_data = app.state::<PendingUpdateData>().inner();
                     if let Some((update, data)) = &*update_data.0.lock().unwrap() {
+                        fn set_changelog_toast(version: Option<String>) {
+                            let toast_result: theseus::Result<()> = tauri::async_runtime::block_on(async move {
+                                let mut settings = settings::get().await?;
+                                settings.pending_update_toast_for_version = version;
+                                settings::set(settings).await?;
+                                Ok(())
+                            });
+                            if let Err(e) = toast_result {
+                                tracing::warn!("Failed to set pending_update_toast: {e}")
+                            }
+                        }
+
+                        set_changelog_toast(Some(update.version.clone()));
                         if let Err(e) = update.install(data) {
                             tracing::error!("Error while updating: {e}");
+                            set_changelog_toast(None);
 
                             DialogBuilder::message()
                                 .set_level(MessageLevel::Error)
diff --git a/packages/app-lib/.sqlx/query-cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef.json b/packages/app-lib/.sqlx/query-30fecc13c6ea4da1e99e35d307aa8e7c4e7f15ea99527e7974619ef8ed946abe.json
similarity index 92%
rename from packages/app-lib/.sqlx/query-cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef.json
rename to packages/app-lib/.sqlx/query-30fecc13c6ea4da1e99e35d307aa8e7c4e7f15ea99527e7974619ef8ed946abe.json
index d87a4032c5..ce2fdf1c46 100644
--- a/packages/app-lib/.sqlx/query-cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef.json
+++ b/packages/app-lib/.sqlx/query-30fecc13c6ea4da1e99e35d307aa8e7c4e7f15ea99527e7974619ef8ed946abe.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                max_concurrent_writes, max_concurrent_downloads,\n                theme, default_page, collapsed_navigation, hide_nametag_skins_page, advanced_rendering, native_decorations,\n                discord_rpc, developer_mode, telemetry, personalized_ads,\n                onboarded,\n                json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n                mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n                hook_pre_launch, hook_wrapper, hook_post_exit,\n                custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,\n                skipped_update\n            FROM settings\n            ",
+  "query": "\n            SELECT\n                max_concurrent_writes, max_concurrent_downloads,\n                theme, default_page, collapsed_navigation, hide_nametag_skins_page, advanced_rendering, native_decorations,\n                discord_rpc, developer_mode, telemetry, personalized_ads,\n                onboarded,\n                json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n                mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n                hook_pre_launch, hook_wrapper, hook_post_exit,\n                custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,\n                skipped_update, pending_update_toast_for_version\n            FROM settings\n            ",
   "describe": {
     "columns": [
       {
@@ -147,6 +147,11 @@
         "name": "skipped_update",
         "ordinal": 28,
         "type_info": "Text"
+      },
+      {
+        "name": "pending_update_toast_for_version",
+        "ordinal": 29,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -181,8 +186,9 @@
       false,
       null,
       false,
+      true,
       true
     ]
   },
-  "hash": "cb20c8117eeec23ea1ebc2ef293caf425d722bd103cd6164c2b9d6abe5539aef"
+  "hash": "30fecc13c6ea4da1e99e35d307aa8e7c4e7f15ea99527e7974619ef8ed946abe"
 }
diff --git a/packages/app-lib/.sqlx/query-6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d.json b/packages/app-lib/.sqlx/query-cd7c9f394e4f0ec8fd0043352f7382ac2570aaa096cd2ebb4de990f4d42cc5c9.json
similarity index 82%
rename from packages/app-lib/.sqlx/query-6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d.json
rename to packages/app-lib/.sqlx/query-cd7c9f394e4f0ec8fd0043352f7382ac2570aaa096cd2ebb4de990f4d42cc5c9.json
index 63320e4c4b..1565c4acb5 100644
--- a/packages/app-lib/.sqlx/query-6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d.json
+++ b/packages/app-lib/.sqlx/query-cd7c9f394e4f0ec8fd0043352f7382ac2570aaa096cd2ebb4de990f4d42cc5c9.json
@@ -1,12 +1,12 @@
 {
   "db_name": "SQLite",
-  "query": "\n            UPDATE settings\n            SET\n                max_concurrent_writes = $1,\n                max_concurrent_downloads = $2,\n\n                theme = $3,\n                default_page = $4,\n                collapsed_navigation = $5,\n                advanced_rendering = $6,\n                native_decorations = $7,\n\n                discord_rpc = $8,\n                developer_mode = $9,\n                telemetry = $10,\n                personalized_ads = $11,\n\n                onboarded = $12,\n\n                extra_launch_args = jsonb($13),\n                custom_env_vars = jsonb($14),\n                mc_memory_max = $15,\n                mc_force_fullscreen = $16,\n                mc_game_resolution_x = $17,\n                mc_game_resolution_y = $18,\n                hide_on_process_start = $19,\n\n                hook_pre_launch = $20,\n                hook_wrapper = $21,\n                hook_post_exit = $22,\n\n                custom_dir = $23,\n                prev_custom_dir = $24,\n                migrated = $25,\n\n                toggle_sidebar = $26,\n                feature_flags = $27,\n                hide_nametag_skins_page = $28,\n                skipped_update = $29\n            ",
+  "query": "\n            UPDATE settings\n            SET\n                max_concurrent_writes = $1,\n                max_concurrent_downloads = $2,\n\n                theme = $3,\n                default_page = $4,\n                collapsed_navigation = $5,\n                advanced_rendering = $6,\n                native_decorations = $7,\n\n                discord_rpc = $8,\n                developer_mode = $9,\n                telemetry = $10,\n                personalized_ads = $11,\n\n                onboarded = $12,\n\n                extra_launch_args = jsonb($13),\n                custom_env_vars = jsonb($14),\n                mc_memory_max = $15,\n                mc_force_fullscreen = $16,\n                mc_game_resolution_x = $17,\n                mc_game_resolution_y = $18,\n                hide_on_process_start = $19,\n\n                hook_pre_launch = $20,\n                hook_wrapper = $21,\n                hook_post_exit = $22,\n\n                custom_dir = $23,\n                prev_custom_dir = $24,\n                migrated = $25,\n\n                toggle_sidebar = $26,\n                feature_flags = $27,\n                hide_nametag_skins_page = $28,\n\n                skipped_update = $29,\n                pending_update_toast_for_version = $30\n            ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 29
+      "Right": 30
     },
     "nullable": []
   },
-  "hash": "6dd3b14f3736735ee9a734062c990d152b0ffb7abf87a729931dc6c54754be6d"
+  "hash": "cd7c9f394e4f0ec8fd0043352f7382ac2570aaa096cd2ebb4de990f4d42cc5c9"
 }
diff --git a/packages/app-lib/migrations/20250711195037_add-pending-update-toast.sql b/packages/app-lib/migrations/20250711195037_add-pending-update-toast.sql
new file mode 100644
index 0000000000..c9dfe65f27
--- /dev/null
+++ b/packages/app-lib/migrations/20250711195037_add-pending-update-toast.sql
@@ -0,0 +1,2 @@
+ALTER TABLE settings
+ADD COLUMN pending_update_toast_for_version TEXT NULL;
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 0248f907d5..5aa9cc327b 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -38,7 +38,9 @@ pub struct Settings {
 
     pub developer_mode: bool,
     pub feature_flags: HashMap<FeatureFlag, bool>,
+
     pub skipped_update: Option<String>,
+    pub pending_update_toast_for_version: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, Eq, Hash, PartialEq)]
@@ -65,7 +67,7 @@ impl Settings {
                 mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,
                 hook_pre_launch, hook_wrapper, hook_post_exit,
                 custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,
-                skipped_update
+                skipped_update, pending_update_toast_for_version
             FROM settings
             "
         )
@@ -120,6 +122,8 @@ impl Settings {
                 .and_then(|x| serde_json::from_str(x).ok())
                 .unwrap_or_default(),
             skipped_update: res.skipped_update,
+            pending_update_toast_for_version: res
+                .pending_update_toast_for_version,
         })
     }
 
@@ -174,7 +178,9 @@ impl Settings {
                 toggle_sidebar = $26,
                 feature_flags = $27,
                 hide_nametag_skins_page = $28,
-                skipped_update = $29
+
+                skipped_update = $29,
+                pending_update_toast_for_version = $30
             ",
             max_concurrent_writes,
             max_concurrent_downloads,
@@ -204,7 +210,8 @@ impl Settings {
             self.toggle_sidebar,
             feature_flags,
             self.hide_nametag_skins_page,
-            self.skipped_update
+            self.skipped_update,
+            self.pending_update_toast_for_version,
         )
         .execute(exec)
         .await?;
diff --git a/packages/ui/src/components/base/Notifications.vue b/packages/ui/src/components/base/Notifications.vue
index dd174a0f4f..04f208ed27 100644
--- a/packages/ui/src/components/base/Notifications.vue
+++ b/packages/ui/src/components/base/Notifications.vue
@@ -9,7 +9,11 @@
         @mouseenter="stopTimer(item)"
         @mouseleave="setNotificationTimer(item)"
       >
-        <div class="vue-notification-template vue-notification" :class="{ [item.type]: true }">
+        <div
+          class="vue-notification-template vue-notification"
+          :class="{ [item.type]: true }"
+          @click="item.clickAction"
+        >
           <div class="notification-title" v-html="item.title"></div>
           <div class="notification-content" v-html="item.text"></div>
         </div>
@@ -31,11 +35,14 @@ const notifications = ref([])
 
 defineExpose({
   addNotification: (notification) => {
+    notification.clickAction = notification.clickAction ?? (() => {})
+
     const existingNotif = notifications.value.find(
       (x) =>
         x.text === notification.text &&
         x.title === notification.title &&
-        x.type === notification.type,
+        x.type === notification.type &&
+        x.clickAction === notification.clickAction,
     )
     if (existingNotif) {
       setNotificationTimer(existingNotif)

From 80e0f84b6234a478eacffe2cbbbe00b6b8fb705f Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Tue, 15 Jul 2025 20:10:24 -0500
Subject: [PATCH 24/31] Use single LAUNCHER_USER_AGENT constant for all user
 agents

---
 apps/app/src/main.rs                  | 12 +++++++++++-
 apps/app/src/updater_impl.rs          |  9 ++++-----
 packages/app-lib/src/lib.rs           |  6 ++++++
 packages/app-lib/src/state/friends.rs |  7 ++-----
 packages/app-lib/src/util/fetch.rs    |  8 +++-----
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index f3a177d2d3..8c4ce69bab 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -116,7 +116,17 @@ fn main() {
 
     #[cfg(feature = "updater")]
     {
-        builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
+        use tauri_plugin_http::reqwest::header::{HeaderValue, USER_AGENT};
+        use theseus::LAUNCHER_USER_AGENT;
+        builder = builder.plugin(
+            tauri_plugin_updater::Builder::new()
+                .header(
+                    USER_AGENT,
+                    HeaderValue::from_str(LAUNCHER_USER_AGENT).unwrap(),
+                )
+                .unwrap()
+                .build(),
+        );
     }
 
     builder = builder
diff --git a/apps/app/src/updater_impl.rs b/apps/app/src/updater_impl.rs
index 2f38b5e898..0a515b2c12 100644
--- a/apps/app/src/updater_impl.rs
+++ b/apps/app/src/updater_impl.rs
@@ -7,12 +7,11 @@ use tauri_plugin_http::reqwest;
 use tauri_plugin_http::reqwest::ClientBuilder;
 use tauri_plugin_updater::Error;
 use tauri_plugin_updater::Update;
-use theseus::{LoadingBarType, emit_loading, init_loading};
+use theseus::{
+    LAUNCHER_USER_AGENT, LoadingBarType, emit_loading, init_loading,
+};
 use tokio::time::Instant;
 
-const UPDATER_USER_AGENT: &str =
-    concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"));
-
 #[derive(Default)]
 pub struct PendingUpdateData(pub Mutex<Option<(Arc<Update>, Vec<u8>)>>);
 
@@ -32,7 +31,7 @@ pub async fn get_update_size<R: Runtime>(
         );
     }
 
-    let mut request = ClientBuilder::new().user_agent(UPDATER_USER_AGENT);
+    let mut request = ClientBuilder::new().user_agent(LAUNCHER_USER_AGENT);
     if let Some(timeout) = update.timeout {
         request = request.timeout(timeout);
     }
diff --git a/packages/app-lib/src/lib.rs b/packages/app-lib/src/lib.rs
index 55f4459acd..c6c2806358 100644
--- a/packages/app-lib/src/lib.rs
+++ b/packages/app-lib/src/lib.rs
@@ -26,3 +26,9 @@ pub use event::{
 };
 pub use logger::start_logger;
 pub use state::State;
+
+pub const LAUNCHER_USER_AGENT: &str = concat!(
+    "modrinth/theseus/",
+    env!("CARGO_PKG_VERSION"),
+    " (support@modrinth.com)"
+);
diff --git a/packages/app-lib/src/state/friends.rs b/packages/app-lib/src/state/friends.rs
index 008660d9fc..410f200760 100644
--- a/packages/app-lib/src/state/friends.rs
+++ b/packages/app-lib/src/state/friends.rs
@@ -1,3 +1,4 @@
+use crate::LAUNCHER_USER_AGENT;
 use crate::config::{MODRINTH_API_URL_V3, MODRINTH_SOCKET_URL};
 use crate::data::ModrinthCredentials;
 use crate::event::FriendPayload;
@@ -82,13 +83,9 @@ impl FriendsSocket {
             )
             .into_client_request()?;
 
-            let user_agent = format!(
-                "modrinth/theseus/{} (support@modrinth.com)",
-                env!("CARGO_PKG_VERSION")
-            );
             request.headers_mut().insert(
                 "User-Agent",
-                HeaderValue::from_str(&user_agent).unwrap(),
+                HeaderValue::from_str(LAUNCHER_USER_AGENT).unwrap(),
             );
 
             let res = connect_async(request).await;
diff --git a/packages/app-lib/src/util/fetch.rs b/packages/app-lib/src/util/fetch.rs
index fb62386aac..c4469e33c9 100644
--- a/packages/app-lib/src/util/fetch.rs
+++ b/packages/app-lib/src/util/fetch.rs
@@ -1,5 +1,6 @@
 //! Functions for fetching information from the Internet
 use super::io::{self, IOError};
+use crate::LAUNCHER_USER_AGENT;
 use crate::config::{MODRINTH_API_URL, MODRINTH_API_URL_V3};
 use crate::event::LoadingBarId;
 use crate::event::emit::emit_loading;
@@ -20,11 +21,8 @@ pub struct FetchSemaphore(pub Semaphore);
 
 pub static REQWEST_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
     let mut headers = reqwest::header::HeaderMap::new();
-    let header = reqwest::header::HeaderValue::from_str(&format!(
-        "modrinth/theseus/{} (support@modrinth.com)",
-        env!("CARGO_PKG_VERSION")
-    ))
-    .unwrap();
+    let header =
+        reqwest::header::HeaderValue::from_str(LAUNCHER_USER_AGENT).unwrap();
     headers.insert(reqwest::header::USER_AGENT, header);
     reqwest::Client::builder()
         .tcp_keepalive(Some(time::Duration::from_secs(10)))

From 7cc39cb54d921d538c2804f86a11b815e852b538 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Tue, 15 Jul 2025 20:28:34 -0500
Subject: [PATCH 25/31] Fix build on Mac

---
 apps/app/src/main.rs | 52 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index 8c4ce69bab..e51bb36a8e 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -240,34 +240,9 @@ fn main() {
     match app {
         Ok(app) => {
             app.run(|app, event| {
-                #[cfg(not(any(target_os = "macos", feature = "updater")))]
+                #[cfg(not(any(feature = "updater", target_os = "macos")))]
                 drop((app, event));
 
-                #[cfg(target_os = "macos")]
-                if let tauri::RunEvent::Opened { urls } = event {
-                    tracing::info!("Handling webview open {urls:?}");
-
-                    let file = urls
-                        .into_iter()
-                        .find_map(|url| url.to_file_path().ok());
-
-                    if let Some(file) = file {
-                        let payload =
-                            macos::deep_link::get_or_init_payload(app);
-
-                        let mtx_copy = payload.payload;
-                        let request = file.to_string_lossy().to_string();
-                        tauri::async_runtime::spawn(async move {
-                            let mut payload = mtx_copy.lock().await;
-                            if payload.is_none() {
-                                *payload = Some(request.clone());
-                            }
-
-                            let _ = api::utils::handle_command(request).await;
-                        });
-                    }
-                }
-
                 #[cfg(feature = "updater")]
                 if matches!(event, tauri::RunEvent::Exit) {
                     let update_data = app.state::<PendingUpdateData>().inner();
@@ -299,6 +274,31 @@ fn main() {
                         }
                     }
                 }
+
+                #[cfg(target_os = "macos")]
+                if let tauri::RunEvent::Opened { urls } = event {
+                    tracing::info!("Handling webview open {urls:?}");
+
+                    let file = urls
+                        .into_iter()
+                        .find_map(|url| url.to_file_path().ok());
+
+                    if let Some(file) = file {
+                        let payload =
+                            macos::deep_link::get_or_init_payload(app);
+
+                        let mtx_copy = payload.payload;
+                        let request = file.to_string_lossy().to_string();
+                        tauri::async_runtime::spawn(async move {
+                            let mut payload = mtx_copy.lock().await;
+                            if payload.is_none() {
+                                *payload = Some(request.clone());
+                            }
+
+                            let _ = api::utils::handle_command(request).await;
+                        });
+                    }
+                }
             });
         }
         Err(e) => {

From 83bd4dde450a9f58001fde897dc965b479d22256 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Tue, 15 Jul 2025 20:36:21 -0500
Subject: [PATCH 26/31] Request the update size with HEAD instead of GET

---
 apps/app/src/updater_impl.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/src/updater_impl.rs b/apps/app/src/updater_impl.rs
index 0a515b2c12..7981f72801 100644
--- a/apps/app/src/updater_impl.rs
+++ b/apps/app/src/updater_impl.rs
@@ -41,7 +41,7 @@ pub async fn get_update_size<R: Runtime>(
     }
     let response = request
         .build()?
-        .get(update.download_url.clone())
+        .head(update.download_url.clone())
         .headers(headers)
         .send()
         .await?;

From 2c90f1c142af7a2ae3dca2bda451f4630fd9deae Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Wed, 16 Jul 2025 15:08:21 -0700
Subject: [PATCH 27/31] UI tweaks

---
 .../src/components/ui/UpdateModal.vue         | 130 ++++++++----------
 .../app-frontend/src/locales/en-US/index.json |  14 +-
 .../components/base/AppearingProgressBar.vue  |   2 +-
 3 files changed, 66 insertions(+), 80 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index bfd9771916..fd16cab3ce 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -6,52 +6,54 @@
     :closable="!updatingImmediately && !downloadInProgress"
   >
     <div class="flex flex-col gap-4">
-      <AppearingProgressBar
-        v-if="!downloadError"
-        :max-value="shouldShowProgress ? updateSize || 0 : 0"
-        :current-value="shouldShowProgress ? downloadedBytes : 0"
-        color="green"
-        class="w-full"
-      />
-
-      <div class="flex flex-col gap-4 max-w-[500px]">
-        <div class="flex items-center gap-2 mx-auto">
-          <span
-            class="inline-flex items-center px-2 py-0.5 rounded text-lg font-semibold bg-red text-bg-raised border border-red"
-          >
-            v{{ update!.currentVersion }}
-          </span>
-          <RightArrowIcon class="size-6 text-secondary" />
-          <span
-            class="inline-flex items-center px-2 py-0.5 rounded text-lg font-semibold bg-brand text-bg-raised border border-green"
-          >
-            v{{ update!.version }}
-          </span>
-        </div>
-        <div>{{ formatMessage(messages.bodyVersion) }}</div>
-        <div>
-          {{ formatMessage(messages.downloadSize, { size: formatBytes(updateSize) }) }}
-        </div>
-        <div v-if="downloadError" class="flex flex-col gap-2">
-          <div class="text-red font-medium">
+      <div class="max-w-[500px]">
+        <div class="font-extrabold text-contrast text-xl mb-1">Modrinth App v{{ update!.version }}</div>
+        <template v-if="!downloadInProgress && !downloadError">
+          <div  class="mb-4 leading-tight">{{ formatMessage(messages.bodyVersion) }}</div>
+          <div  class="text-sm text-secondary mb-3">
+            {{ formatMessage(messages.downloadSize, { size: formatBytes(updateSize) }) }}
+          </div>
+        </template>
+        <AppearingProgressBar
+          v-if="!downloadError"
+          :max-value="shouldShowProgress ? updateSize || 0 : 0"
+          :current-value="shouldShowProgress ? downloadedBytes : 0"
+          color="green"
+          class="w-full mb-4 mt-2"
+        />
+        <div v-if="downloadError" class="leading-tight">
+          <div class="text-red font-medium mb-4">
             {{ formatMessage(messages.downloadError) }}
           </div>
-          <ButtonStyled color="red">
-            <button @click="copyError">
-              <ClipboardCopyIcon />
-              {{
-                copiedError
-                  ? formatMessage(messages.copiedError)
-                  : formatMessage(messages.copyError)
-              }}
-            </button>
-          </ButtonStyled>
+          <div class="flex flex-wrap gap-2">
+            <ButtonStyled color="brand">
+              <button @click="installUpdateNow">
+                <DownloadIcon />
+                {{
+                  formatMessage(messages.tryAgain)
+                }}
+              </button>
+            </ButtonStyled>
+            <ButtonStyled>
+              <button @click="copyError">
+                <ClipboardCopyIcon />
+                {{
+                  copiedError
+                    ? formatMessage(messages.copiedError)
+                    : formatMessage(messages.copyError)
+                }}
+              </button>
+            </ButtonStyled>
+            <ButtonStyled>
+              <a href="https://support.modrinth.com"><ChatIcon /> Get support</a>
+            </ButtonStyled>
+          </div>
         </div>
-        <div class="flex flex-wrap gap-2 w-full">
+        <div v-if="!downloadError" class="flex flex-wrap gap-2 w-full mb-2">
           <JoinedButtons
             :actions="installActions"
             :disabled="updatingImmediately || downloadInProgress"
-            color="green"
+            color="brand"
           />
           <div>
             <ButtonStyled>
@@ -74,21 +76,20 @@ import { AppearingProgressBar, ButtonStyled, JoinedButtons } from '@modrinth/ui'
 import type { JoinedButtonAction } from '@modrinth/ui'
 import {
   ExternalIcon,
-  RefreshCwIcon,
+  DownloadIcon,
   RightArrowIcon,
-  TimerIcon,
-  XCircleIcon,
+  RedoIcon,
   ClipboardCopyIcon,
 } from '@modrinth/assets'
-import { enqueueUpdateForInstallation, getUpdateSize, removeEnqueuedUpdate } from '@/helpers/utils'
+import { enqueueUpdateForInstallation, getUpdateSize } from '@/helpers/utils'
 import { formatBytes } from '@modrinth/utils'
 import { handleError } from '@/store/notifications'
 import { loading_listener } from '@/helpers/events'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 import { openUrl } from '@tauri-apps/plugin-opener'
+import { ChatIcon } from '@/assets/icons'
 
 const emit = defineEmits<{
-  (e: 'updateSkipped', version: string): Promise<void>
   (e: 'updateEnqueuedForLater', version: string | null): Promise<void>
 }>()
 
@@ -96,7 +97,7 @@ const { formatMessage } = useVIntl()
 const messages = defineMessages({
   header: {
     id: 'app.update.modal-header',
-    defaultMessage: 'A new app update is available!',
+    defaultMessage: 'An update is available!',
   },
   copiedError: {
     id: 'app.update.copied-error',
@@ -105,15 +106,15 @@ const messages = defineMessages({
   bodyVersion: {
     id: 'app.update.modal-body-version',
     defaultMessage:
-      'We recommend updating as soon as possible so you can enjoy the latest features and improvements.',
+      'We recommend updating as soon as possible so you can enjoy the latest features, fixes, and improvements.',
   },
   downloadSize: {
     id: 'app.update.download-size',
-    defaultMessage: 'The download size of the update is {size}.',
+    defaultMessage: 'The update is {size}.',
   },
   changelog: {
     id: 'app.update.changelog',
-    defaultMessage: 'Changelog',
+    defaultMessage: 'View changelog',
   },
   restartNow: {
     id: 'app.update.restart',
@@ -121,11 +122,7 @@ const messages = defineMessages({
   },
   later: {
     id: 'app.update.later',
-    defaultMessage: 'Update on next restart',
-  },
-  skip: {
-    id: 'app.update.skip',
-    defaultMessage: 'Skip this update',
+    defaultMessage: 'Update on exit',
   },
   downloadError: {
     id: 'app.update.download-error',
@@ -136,6 +133,10 @@ const messages = defineMessages({
     id: 'app.update.copy-error',
     defaultMessage: 'Copy error',
   },
+  tryAgain: {
+    id: 'app.update.try-again',
+    defaultMessage: 'Try again',
+  },
 })
 
 type UpdateData = {
@@ -151,7 +152,7 @@ const update = ref<UpdateData>()
 const updateSize = ref<number>()
 
 const updatingImmediately = ref(false)
-const downloadInProgress = ref(false)
+const downloadInProgress = ref(true)
 const downloadProgress = ref(0)
 const copiedError = ref(false)
 const downloadError = ref<Error | null>(null)
@@ -162,23 +163,16 @@ const installActions = computed<JoinedButtonAction[]>(() => [
   {
     id: 'install-now',
     label: formatMessage(messages.restartNow),
-    icon: RefreshCwIcon,
+    icon: DownloadIcon,
     action: installUpdateNow,
     color: 'green',
   },
   {
     id: 'install-later',
     label: formatMessage(messages.later),
-    icon: TimerIcon,
+    icon: RedoIcon,
     action: updateAtNextExit,
   },
-  {
-    id: 'skip',
-    label: formatMessage(messages.skip),
-    action: skipUpdate,
-    icon: XCircleIcon,
-    color: 'red',
-  },
 ])
 
 const downloadedBytes = computed(() => {
@@ -301,14 +295,6 @@ async function downloadUpdate() {
     await getCurrentWindow().close()
   }
 }
-
-function skipUpdate() {
-  enqueuedUpdate.value = null
-  emit('updateSkipped', update.value!.version)
-
-  removeEnqueuedUpdate()
-  hide()
-}
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 72f24aa1da..3c04efdc4a 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -21,7 +21,7 @@
     "message": "Resource management"
   },
   "app.update.changelog": {
-    "message": "Changelog"
+    "message": "View changelog"
   },
   "app.update.complete-toast.text": {
     "message": "Click here to view the changelog."
@@ -39,22 +39,22 @@
     "message": "An error occurred while downloading the update. Please try again later. Contact support if the issue persists."
   },
   "app.update.download-size": {
-    "message": "The download size of the update is {size}."
+    "message": "The update is {size}."
   },
   "app.update.later": {
-    "message": "Update on next restart"
+    "message": "Update on exit"
   },
   "app.update.modal-body-version": {
-    "message": "We recommend updating as soon as possible so you can enjoy the latest features and improvements."
+    "message": "We recommend updating as soon as possible so you can enjoy the latest features, fixes, and improvements."
   },
   "app.update.modal-header": {
-    "message": "A new app update is available!"
+    "message": "An update is available!"
   },
   "app.update.restart": {
     "message": "Update now"
   },
-  "app.update.skip": {
-    "message": "Skip this update"
+  "app.update.try-again": {
+    "message": "Try again"
   },
   "instance.add-server.add-and-play": {
     "message": "Add and play"
diff --git a/packages/ui/src/components/base/AppearingProgressBar.vue b/packages/ui/src/components/base/AppearingProgressBar.vue
index 5c9f10fe3e..1bb3d335f0 100644
--- a/packages/ui/src/components/base/AppearingProgressBar.vue
+++ b/packages/ui/src/components/base/AppearingProgressBar.vue
@@ -10,7 +10,7 @@
     <div v-if="isVisible" class="w-full">
       <div class="mb-2 flex justify-between text-sm">
         <Transition name="phrase-fade" mode="out-in">
-          <span :key="currentPhrase" class="text-lg font-medium text-contrast">{{
+          <span :key="currentPhrase" class="text-md font-semibold">{{
             currentPhrase
           }}</span>
         </Transition>

From 30e93e0880a1c8da117dbae460b0b835d5b86284 Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Wed, 16 Jul 2025 15:25:38 -0700
Subject: [PATCH 28/31] lint

---
 packages/ui/src/components/base/AppearingProgressBar.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/ui/src/components/base/AppearingProgressBar.vue b/packages/ui/src/components/base/AppearingProgressBar.vue
index 1bb3d335f0..e067de8e17 100644
--- a/packages/ui/src/components/base/AppearingProgressBar.vue
+++ b/packages/ui/src/components/base/AppearingProgressBar.vue
@@ -10,9 +10,7 @@
     <div v-if="isVisible" class="w-full">
       <div class="mb-2 flex justify-between text-sm">
         <Transition name="phrase-fade" mode="out-in">
-          <span :key="currentPhrase" class="text-md font-semibold">{{
-            currentPhrase
-          }}</span>
+          <span :key="currentPhrase" class="text-md font-semibold">{{ currentPhrase }}</span>
         </Transition>
         <div class="flex flex-col items-end">
           <span class="text-secondary">{{ Math.round(progress) }}%</span>

From 071e2b58b31888e4207b19f1adc70c6acda7c02d Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Wed, 16 Jul 2025 19:04:24 -0500
Subject: [PATCH 29/31] Fix lint

---
 .../src/components/ui/UpdateModal.vue         | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index fd16cab3ce..b8080deefc 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -7,10 +7,12 @@
   >
     <div class="flex flex-col gap-4">
       <div class="max-w-[500px]">
-        <div class="font-extrabold text-contrast text-xl mb-1">Modrinth App v{{ update!.version }}</div>
+        <div class="font-extrabold text-contrast text-xl mb-1">
+          Modrinth App v{{ update!.version }}
+        </div>
         <template v-if="!downloadInProgress && !downloadError">
-          <div  class="mb-4 leading-tight">{{ formatMessage(messages.bodyVersion) }}</div>
-          <div  class="text-sm text-secondary mb-3">
+          <div class="mb-4 leading-tight">{{ formatMessage(messages.bodyVersion) }}</div>
+          <div class="text-sm text-secondary mb-3">
             {{ formatMessage(messages.downloadSize, { size: formatBytes(updateSize) }) }}
           </div>
         </template>
@@ -29,9 +31,7 @@
             <ButtonStyled color="brand">
               <button @click="installUpdateNow">
                 <DownloadIcon />
-                {{
-                  formatMessage(messages.tryAgain)
-                }}
+                {{ formatMessage(messages.tryAgain) }}
               </button>
             </ButtonStyled>
             <ButtonStyled>
@@ -74,13 +74,7 @@ import { defineMessages, useVIntl } from '@vintl/vintl'
 import { useTemplateRef, ref, computed } from 'vue'
 import { AppearingProgressBar, ButtonStyled, JoinedButtons } from '@modrinth/ui'
 import type { JoinedButtonAction } from '@modrinth/ui'
-import {
-  ExternalIcon,
-  DownloadIcon,
-  RightArrowIcon,
-  RedoIcon,
-  ClipboardCopyIcon,
-} from '@modrinth/assets'
+import { ExternalIcon, DownloadIcon, RedoIcon, ClipboardCopyIcon } from '@modrinth/assets'
 import { enqueueUpdateForInstallation, getUpdateSize } from '@/helpers/utils'
 import { formatBytes } from '@modrinth/utils'
 import { handleError } from '@/store/notifications'

From 0310cc52d046a97bc514ee9a974dcae67a8c20d6 Mon Sep 17 00:00:00 2001
From: IMB11 <calum@modrinth.com>
Date: Thu, 17 Jul 2025 11:37:17 +0100
Subject: [PATCH 30/31] fix: hide modal header & add "Hide update reminder"
 button w/ tooltip

---
 apps/app-frontend/src/App.vue                 | 28 ++++++++++++-
 .../src/components/ui/UpdateModal.vue         | 39 ++++++++++++-------
 .../src/components/ui/modal/ModalWrapper.vue  |  5 +++
 packages/ui/src/components/modal/NewModal.vue |  5 ++-
 4 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 78262624c2..ca9817f29f 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -1,5 +1,14 @@
 <script setup>
-import { computed, onMounted, onUnmounted, ref, watch, useTemplateRef, provide } from 'vue'
+import {
+  computed,
+  onMounted,
+  onUnmounted,
+  ref,
+  watch,
+  useTemplateRef,
+  provide,
+  nextTick,
+} from 'vue'
 import { RouterView, useRoute, useRouter } from 'vue-router'
 import {
   ArrowBigUpDashIcon,
@@ -72,6 +81,7 @@ import UpdateModal from '@/components/ui/UpdateModal.vue'
 import { get_available_capes, get_available_skins } from './helpers/skins'
 import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer'
 import { defineMessages, useVIntl } from '@vintl/vintl'
+import { createTooltip, destroyTooltip } from 'floating-vue'
 
 const themeStore = useTheming()
 
@@ -450,6 +460,20 @@ async function forceOpenUpdateModal() {
   updateModal.value.show(availableUpdate.value)
 }
 
+const updateButton = useTemplateRef('updateButton')
+async function showUpdateButtonTooltip() {
+  await nextTick()
+  const tooltip = createTooltip(updateButton.value.$el, {
+    placement: 'right',
+    content: 'Click here to view the update again.',
+  })
+  tooltip.show()
+  setTimeout(() => {
+    tooltip.hide()
+    destroyTooltip(updateButton.value.$el)
+  }, 3500)
+}
+
 function handleClick(e) {
   let target = e.target
   while (target != null) {
@@ -495,6 +519,7 @@ function handleAuxClick(e) {
         ref="updateModal"
         @update-skipped="skipUpdate"
         @update-enqueued-for-later="updateEnqueuedForLater"
+        @modal-hidden="showUpdateButtonTooltip"
       />
     </Suspense>
     <Suspense>
@@ -549,6 +574,7 @@ function handleAuxClick(e) {
       <div class="flex flex-grow"></div>
       <NavButton
         v-if="!!availableUpdate"
+        ref="updateButton"
         v-tooltip.right="
           enqueuedUpdate === availableUpdate?.version
             ? 'Update installation queued for next restart'
diff --git a/apps/app-frontend/src/components/ui/UpdateModal.vue b/apps/app-frontend/src/components/ui/UpdateModal.vue
index b8080deefc..38fd86cc6a 100644
--- a/apps/app-frontend/src/components/ui/UpdateModal.vue
+++ b/apps/app-frontend/src/components/ui/UpdateModal.vue
@@ -1,18 +1,13 @@
 <template>
-  <ModalWrapper
-    ref="modal"
-    :header="formatMessage(messages.header)"
-    :on-hide="onHide"
-    :closable="!updatingImmediately && !downloadInProgress"
-  >
+  <ModalWrapper ref="modal" hide-header :closable="false" :on-hide="onHide">
     <div class="flex flex-col gap-4">
-      <div class="max-w-[500px]">
-        <div class="font-extrabold text-contrast text-xl mb-1">
-          Modrinth App v{{ update!.version }}
+      <div class="w-[500px]">
+        <div class="font-extrabold text-contrast text-xl">
+          {{ formatMessage(messages.header) }} Modrinth App v{{ update!.version }}
         </div>
         <template v-if="!downloadInProgress && !downloadError">
-          <div class="mb-4 leading-tight">{{ formatMessage(messages.bodyVersion) }}</div>
-          <div class="text-sm text-secondary mb-3">
+          <div class="mb-1 leading-tight">{{ formatMessage(messages.bodyVersion) }}</div>
+          <div class="text-sm text-secondary mb-2">
             {{ formatMessage(messages.downloadSize, { size: formatBytes(updateSize) }) }}
           </div>
         </template>
@@ -49,7 +44,7 @@
             </ButtonStyled>
           </div>
         </div>
-        <div v-if="!downloadError" class="flex flex-wrap gap-2 w-full mb-2">
+        <div v-if="!downloadError" class="flex flex-wrap gap-2 w-full">
           <JoinedButtons
             :actions="installActions"
             :disabled="updatingImmediately || downloadInProgress"
@@ -74,7 +69,7 @@ import { defineMessages, useVIntl } from '@vintl/vintl'
 import { useTemplateRef, ref, computed } from 'vue'
 import { AppearingProgressBar, ButtonStyled, JoinedButtons } from '@modrinth/ui'
 import type { JoinedButtonAction } from '@modrinth/ui'
-import { ExternalIcon, DownloadIcon, RedoIcon, ClipboardCopyIcon } from '@modrinth/assets'
+import { ExternalIcon, DownloadIcon, RedoIcon, ClipboardCopyIcon, XIcon } from '@modrinth/assets'
 import { enqueueUpdateForInstallation, getUpdateSize } from '@/helpers/utils'
 import { formatBytes } from '@modrinth/utils'
 import { handleError } from '@/store/notifications'
@@ -85,13 +80,14 @@ import { ChatIcon } from '@/assets/icons'
 
 const emit = defineEmits<{
   (e: 'updateEnqueuedForLater', version: string | null): Promise<void>
+  (e: 'modalHidden'): void
 }>()
 
 const { formatMessage } = useVIntl()
 const messages = defineMessages({
   header: {
     id: 'app.update.modal-header',
-    defaultMessage: 'An update is available!',
+    defaultMessage: 'Update available - ',
   },
   copiedError: {
     id: 'app.update.copied-error',
@@ -131,6 +127,10 @@ const messages = defineMessages({
     id: 'app.update.try-again',
     defaultMessage: 'Try again',
   },
+  hide: {
+    id: 'app.update.hide',
+    defaultMessage: 'Hide update reminder',
+  },
 })
 
 type UpdateData = {
@@ -146,7 +146,7 @@ const update = ref<UpdateData>()
 const updateSize = ref<number>()
 
 const updatingImmediately = ref(false)
-const downloadInProgress = ref(true)
+const downloadInProgress = ref(false)
 const downloadProgress = ref(0)
 const copiedError = ref(false)
 const downloadError = ref<Error | null>(null)
@@ -167,6 +167,15 @@ const installActions = computed<JoinedButtonAction[]>(() => [
     icon: RedoIcon,
     action: updateAtNextExit,
   },
+  {
+    id: 'hide',
+    label: formatMessage(messages.hide),
+    action: () => {
+      hide()
+      emit('modalHidden')
+    },
+    icon: XIcon,
+  },
 ])
 
 const downloadedBytes = computed(() => {
diff --git a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
index 8720796ad7..b81002ecc9 100644
--- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
@@ -11,6 +11,10 @@ const props = defineProps({
     type: String,
     default: null,
   },
+  hideHeader: {
+    type: Boolean,
+    default: false,
+  },
   closable: {
     type: Boolean,
     default: true,
@@ -53,6 +57,7 @@ function onModalHide() {
     :header="header"
     :noblur="!themeStore.advancedRendering"
     :closable="closable"
+    :hide-header="hideHeader"
     @hide="onModalHide"
   >
     <template #title>
diff --git a/packages/ui/src/components/modal/NewModal.vue b/packages/ui/src/components/modal/NewModal.vue
index 38e3429f8d..fca1ec0cd9 100644
--- a/packages/ui/src/components/modal/NewModal.vue
+++ b/packages/ui/src/components/modal/NewModal.vue
@@ -22,6 +22,7 @@
       <div class="modal-body flex flex-col bg-bg-raised rounded-2xl">
         <div
           data-tauri-drag-region
+          v-if="!hideHeader"
           class="grid grid-cols-[auto_min-content] items-center gap-12 p-6 border-solid border-0 border-b-[1px] border-divider max-w-full"
         >
           <div class="flex text-wrap break-words items-center gap-3 min-w-0">
@@ -60,6 +61,7 @@ const props = withDefaults(
     closeOnClickOutside?: boolean
     warnOnClose?: boolean
     header?: string
+    hideHeader?: boolean
     onHide?: () => void
     onShow?: () => void
   }>(),
@@ -71,6 +73,7 @@ const props = withDefaults(
     closeOnEsc: true,
     warnOnClose: false,
     header: undefined,
+    hideHeader: false,
     onHide: () => {},
     onShow: () => {},
   },
@@ -134,7 +137,7 @@ function updateMousePosition(event: { clientX: number; clientY: number }) {
 }
 
 function handleKeyDown(event: KeyboardEvent) {
-  if (props.closeOnEsc && event.key === 'Escape') {
+  if (props.closeOnEsc && event.key === 'Escape' && props.closable) {
     hide()
     mouseX.value = window.innerWidth / 2
     mouseY.value = window.innerHeight / 2

From 3b6a9dde0f2de00c4a069f9cd76ce801c0e5e45a Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Mon, 21 Jul 2025 10:56:08 -0500
Subject: [PATCH 31/31] Run intl:extract

---
 apps/app-frontend/src/locales/en-US/index.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 3c04efdc4a..d64d07cc9d 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -41,6 +41,9 @@
   "app.update.download-size": {
     "message": "The update is {size}."
   },
+  "app.update.hide": {
+    "message": "Hide update reminder"
+  },
   "app.update.later": {
     "message": "Update on exit"
   },
@@ -48,7 +51,7 @@
     "message": "We recommend updating as soon as possible so you can enjoy the latest features, fixes, and improvements."
   },
   "app.update.modal-header": {
-    "message": "An update is available!"
+    "message": "Update available - "
   },
   "app.update.restart": {
     "message": "Update now"