From 34b10fae7da72dc46bdd6ad1dde4e25f8b4521fe Mon Sep 17 00:00:00 2001
From: Mattias Granlund <mtsgrd@gmail.com>
Date: Sun, 4 Feb 2024 21:19:07 +0100
Subject: [PATCH] Show disabled "merged" button when PR merged

---
 .../src/lib/components/BranchHeader.svelte       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/gitbutler-ui/src/lib/components/BranchHeader.svelte b/gitbutler-ui/src/lib/components/BranchHeader.svelte
index 8789d518a..b9b0b19ef 100644
--- a/gitbutler-ui/src/lib/components/BranchHeader.svelte
+++ b/gitbutler-ui/src/lib/components/BranchHeader.svelte
@@ -233,22 +233,28 @@
 				{#if prStatus?.success}
 					<Button
 						help="Merge pull request and refresh"
-						disabled={isUnapplied}
+						disabled={isUnapplied || !$pr$}
 						loading={isMerging}
 						on:click={async () => {
 							isMerging = true;
 							try {
-								if ($pr$) await githubService.merge($pr$.number);
-								branchService.reloadVirtualBranches();
-								fetchPrStatus();
+								if ($pr$) {
+									await githubService.merge($pr$.number);
+								}
 							} catch {
 								toasts.error('Failed to merge pull request');
 							} finally {
 								isMerging = false;
+								await fetchPrStatus();
+								await branchService.reloadVirtualBranches();
 							}
 						}}
 					>
-						Merge
+						{#if $pr$}
+							Merge
+						{:else}
+							Merged
+						{/if}
 					</Button>
 				{/if}
 			</div>