Fixes loading states for mod installations

Author: blarfoon

apps/desktop/packages/mainWindow/src/components/ModDownloadButton/components/InstanceDropdown.tsx

@@ -53,6 +53,12 @@ export const InstanceDropdown = (props: InstanceDropdownProps) => {
   // This prevents the gap between "Installing" and "Installed"
   createEffect(() => {
     if (isDropdownOpen() && props.addon) {
+      // Skip installation detection for worlds since they don't appear in mods list
+      // and would cause infinite refetching
+      if (props.addon.type === "world") {
+        return
+      }
+
       props.filteredInstances().forEach((instance) => {
         const instanceQuery = getInstanceModsQuery(instance.id)
         const isLoading = props.instanceLoadingStates().get(instance.id)

apps/desktop/packages/mainWindow/src/components/ModDownloadButton/hooks/useTaskProgress.ts

@@ -1,9 +1,11 @@
 import { rspc } from "@/utils/rspcClient"
 import { createSignal, createEffect, Accessor } from "solid-js"
+import { toast } from "@gd/ui"
 
 export const useTaskProgress = (
   instanceTaskIds: Accessor<Map<number, number>>,
-  _clearInstanceLoadingState: (instanceId: number) => void
+  clearInstanceLoadingState: (instanceId: number) => void,
+  addon?: { title?: string; type?: string }
 ) => {
   const [loading, setLoading] = createSignal(false)
   const [progress, setProgress] = createSignal<number | null>(null)
@@ -18,11 +20,19 @@ export const useTaskProgress = (
     const allTasks = allTasksQuery.data || []
     const activeTaskIds = new Set(allTasks.map((task) => task.id))
 
-    taskIds.forEach((taskId, _instanceId) => {
+    taskIds.forEach((taskId, instanceId) => {
       if (!activeTaskIds.has(taskId)) {
-        // Don't clear loading state immediately - let the InstanceDropdown handle it
-        // when it detects the mod is actually installed via the reactive effect
-        // This prevents the gap between "Installing" and "Installed"
+        // Clear loading state when task completes
+        // For regular mods, InstanceDropdown will also handle this via installation detection
+        // For worlds, this is the only way to clear loading state since they don't appear in mods list
+        clearInstanceLoadingState(instanceId)
+
+        // Show success toast for dropdown installations
+        if (addon) {
+          toast.success(`${addon.title || "Addon"} installed successfully`, {
+            duration: 2000
+          })
+        }
       }
     })
   })

apps/desktop/packages/mainWindow/src/components/ModDownloadButton/index.tsx

@@ -42,7 +42,8 @@ const ModDownloadButton = (props: ModDownloadButtonProps) => {
 
   const { loading, setLoading, progress, setProgress } = useTaskProgress(
     instanceTaskIds,
-    clearInstanceLoadingState
+    clearInstanceLoadingState,
+    props.addon
   )
 
   createEffect(() => {
@@ -179,7 +180,7 @@ const ModDownloadButton = (props: ModDownloadButtonProps) => {
     // Track loading state changes
     setWasLoading(isCurrentlyLoading)
 
-    if (installed) {
+    if (installed || (isWorld && taskId() === null)) {
       setLoading(false)
       setTaskId(null)
       setProgress(null)

packages/core_module/bindings.d.ts

@@ -140,6 +140,8 @@ export type FERequestNewVerificationTokenStatus = { status: "success" } | { stat
 
 export type InstanceFolder = "Root" | "Data" | "Mods" | "Configs" | "Screenshots" | "Saves" | "Logs" | "CrashReports" | "ResourcePacks" | "TexturePacks" | "ShaderPacks"
 
+export type FEUnifiedSearchResultWithDescription = ({ title: string; slug: string; description: string; imageUrl: string | null; highResImageUrl: string | null; downloadsCount: number; id: string; releaseDate: string; lastUpdated: string; platform: FEUnifiedPlatform; type: FEUnifiedSearchType; authors: FEUnifiedAuthor[]; websiteUrl: string | null; categories: FEUnifiedCategoryId[]; screenshotUrls: string[]; minecraftVersions: string[]; versions: string[] | null; mainFileId: string | null }) & { fullDescriptionBody: string }
+
 export type CFFEModSearchParameters = { query: CFFEModSearchParametersQuery }
 
 export type FEMetricsEvent = { event_name: "page_view"; data: string } | { event_name: "featured_modpack_installed"; data: { campaign_id: string; item_id: string } } | { event_name: "changelog_viewed" }
@@ -349,6 +351,8 @@ export type EnrollmentStatus = "refreshingMSAuth" | "requestingCode" | { polling
 
 export type FESubtask = { name: Translation; progress: FESubtaskProgress }
 
+export type FEUnifiedProjectID = { type: "curseforge"; value: number } | { type: "modrinth"; value: string }
+
 export type FELauncherActionOnGameLaunch = "quitApp" | "closeWindow" | "minimizeWindow" | "hideWindow" | "none"
 
 export type CFFEFileHash = { value: string; algo: CFFEHashAlgo }
@@ -401,8 +405,6 @@ export type MRFEVersionID = string
 
 export type And<T> = T[]
 
-export type FEUnifiedProjectID = { type: "curseforge"; value: number } | { type: "modrinth"; value: string }
-
 export type LatestModSource = { Curseforge: number } | { Modrinth: string }
 
 export type FEModdedManifestLoaderVersion = { id: string }
@@ -451,8 +453,6 @@ export type ExportEntry = { entries: { [key: string]: ExportEntry | null } }
 
 export type ModrinthMod = { project_id: string; version_id: string }
 
-export type FEUnifiedSearchResultWithDescription = ({ title: string; slug: string; description: string; imageUrl: string | null; highResImageUrl: string | null; downloadsCount: number; id: string; releaseDate: string; lastUpdated: string; platform: FEUnifiedPlatform; type: FEUnifiedSearchType; authors: FEUnifiedAuthor[]; websiteUrl: string | null; categories: FEUnifiedCategoryId[]; screenshotUrls: string[]; minecraftVersions: string[]; versions: string[] | null; mainFileId: string | null }) & { fullDescriptionBody: string }
-
 export type AccountType = { type: "microsoft"; value: { email: string | null } } | { type: "offline" }
 
 export type FEUnifiedCategory = { platform: FEUnifiedPlatform; id: FEUnifiedCategoryId; name: string | null; icon: FEUnifiedCategoryIcon | null; projectType: FEUnifiedSearchType; parentId: string | null }