Use the exposed state of the integrate upstream modal

Export the state of whether the modal is open or not.
Use it in the base branch page and the update base button.

apps/desktop/src/lib/components/BaseBranch.svelte

@@ -30,7 +30,6 @@
 
 	let updateTargetModal: Modal;
 	let integrateUpstreamModal: IntegrateUpstreamModal | undefined;
-	let integrateUpstreamModalOpen = false;
 	let mergeUpstreamWarningDismissedCheckbox = false;
 
 	$: multiple = base ? base.upstreamCommits.length > 1 || base.upstreamCommits.length === 0 : false;
@@ -42,13 +41,8 @@
 		}
 	}
 
-	function closeIntegrateUpstreamModal() {
-		integrateUpstreamModalOpen = false;
-	}
-
 	function mergeUpstream() {
 		if (project.succeedingRebases) {
-			integrateUpstreamModalOpen = true;
 			integrateUpstreamModal?.show();
 		} else {
 			if (mergeUpstreamWarningDismissedCheckbox) {
@@ -68,16 +62,13 @@
 	</div>
 
 	{#if base.upstreamCommits?.length > 0}
-		<IntegrateUpstreamModal
-			bind:this={integrateUpstreamModal}
-			onClose={closeIntegrateUpstreamModal}
-		/>
+		<IntegrateUpstreamModal bind:this={integrateUpstreamModal} />
 		<Button
 			style="pop"
 			kind="solid"
 			tooltip={`Merges the commits from ${base.branchName} into the base of all applied virtual branches`}
-			disabled={$mode?.type !== 'OpenWorkspace' || integrateUpstreamModalOpen}
-			loading={integrateUpstreamModalOpen}
+			disabled={$mode?.type !== 'OpenWorkspace' || integrateUpstreamModal.imports.open}
+			loading={integrateUpstreamModal.imports.open}
 			onclick={mergeUpstream}
 		>
 			Merge into common base

apps/desktop/src/lib/components/IntegrateUpstreamModal.svelte

@@ -85,6 +85,12 @@
 		await tick();
 		modal?.show();
 	}
+
+	export const imports = {
+		get open() {
+			return modal?.imports.open;
+		}
+	};
 </script>
 
 <Modal bind:this={modal} title="Integrate upstream changes" {onClose} width="small" noPadding>

apps/desktop/src/lib/components/UpdateBaseButton.svelte

@@ -20,16 +20,11 @@
 
 	let modal = $state<IntegrateUpstreamModal>();
 
-	let modalOpen = $state<boolean>(false);
-
 	function openModal() {
-		modalOpen = true;
 		modal?.show();
 	}
 
-	function onClose() {
-		modalOpen = false;
-	}
+	function onClose() {}
 
 	async function updateBaseBranch() {
 		let infoText = await branchController.updateBaseBranch();
@@ -54,7 +49,7 @@
 				updateBaseBranch();
 			}
 		}}
-		loading={modalOpen}
+		loading={modal?.imports.open}
 	>
 		Update
 	</Button>