From c3239b29294ef01176a1996f53f6eb59b4ac632a Mon Sep 17 00:00:00 2001
From: bwees <brandonwees@gmail.com>
Date: Fri, 9 Jan 2026 18:02:49 -0500
Subject: [PATCH 1/5] feat: enable image editing

---
 web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte | 1 -
 web/src/lib/components/asset-viewer/asset-viewer.svelte         | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
index b0396f939faea..af6a78d822827 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
@@ -127,7 +127,6 @@
   } = $derived(getAssetActions($t, asset));
   const sharedLink = getSharedLink();
 
-  // TODO: Enable when edits are ready for release
   let showEditorButton = $derived(
     isOwner &&
       asset.type === AssetTypeEnum.Image &&
diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte
index 334c7c1032252..1ce4c6870d81e 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte
@@ -465,6 +465,7 @@
         onCopyImage={copyImage}
         preAction={handlePreAction}
         onAction={handleAction}
+        onEdit={showEditor}
         {onUndoDelete}
         onEdit={showEditor}
         onRunJob={handleRunJob}

From 839c9e10d4e0e10ee4490c10fd0bf1fe76c7744e Mon Sep 17 00:00:00 2001
From: bwees <brandonwees@gmail.com>
Date: Mon, 12 Jan 2026 10:46:22 -0600
Subject: [PATCH 2/5] chore: cleanup logic for editing button enabling

---
 .../asset-viewer/asset-viewer-nav-bar.svelte  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
index af6a78d822827..c8d19ddd88ab8 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
@@ -127,16 +127,14 @@
   } = $derived(getAssetActions($t, asset));
   const sharedLink = getSharedLink();
 
-  let showEditorButton = $derived(
-    isOwner &&
-      asset.type === AssetTypeEnum.Image &&
-      !(
-        asset.exifInfo?.projectionType === ProjectionType.EQUIRECTANGULAR ||
-        (asset.originalPath && asset.originalPath.toLowerCase().endsWith('.insp'))
-      ) &&
-      !(asset.originalPath && asset.originalPath.toLowerCase().endsWith('.gif')) &&
-      !(asset.originalPath && asset.originalPath.toLowerCase().endsWith('.svg')) &&
-      !asset.livePhotoVideoId,
+  const editorDisabled = $derived(
+    isOwner ||
+      asset.type !== AssetTypeEnum.Image ||
+      asset.livePhotoVideoId ||
+      (asset.exifInfo?.projectionType === ProjectionType.EQUIRECTANGULAR &&
+        asset.originalPath.toLowerCase().endsWith('.insp')) ||
+      asset.originalPath.toLowerCase().endsWith('.gif') ||
+      asset.originalPath.toLowerCase().endsWith('.svg'),
   );
 </script>
 
@@ -190,7 +188,7 @@
       <RatingAction {asset} {onAction} />
     {/if}
 
-    {#if showEditorButton}
+    {#if !editorDisabled}
       <EditAction onAction={onEdit} />
     {/if}
 

From 21479b1bd55d082b4c1b2291b5a489ff99b676d2 Mon Sep 17 00:00:00 2001
From: bwees <brandonwees@gmail.com>
Date: Wed, 14 Jan 2026 14:29:49 -0600
Subject: [PATCH 3/5] fix: save button loading when applying edits

---
 web/src/lib/components/asset-viewer/editor/editor-panel.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
index 2622bcece745f..c52b63793bccf 100644
--- a/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
+++ b/web/src/lib/components/asset-viewer/editor/editor-panel.svelte
@@ -62,7 +62,7 @@
       />
       <p class="text-lg text-immich-fg dark:text-immich-dark-fg capitalize">{$t('editor')}</p>
     </HStack>
-    <Button shape="round" size="small" onclick={applyEdits}>{$t('save')}</Button>
+    <Button shape="round" size="small" onclick={applyEdits} loading={editManager.isApplyingEdits}>{$t('save')}</Button>
   </HStack>
 
   <section>

From 6fcdd7ff755cb2b8c55ecf0c860c77c04d2f3390 Mon Sep 17 00:00:00 2001
From: bwees <brandonwees@gmail.com>
Date: Wed, 14 Jan 2026 14:33:57 -0600
Subject: [PATCH 4/5] fix: logic error on button

---
 web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
index c8d19ddd88ab8..cf8301d755f5f 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
@@ -128,7 +128,7 @@
   const sharedLink = getSharedLink();
 
   const editorDisabled = $derived(
-    isOwner ||
+    !isOwner ||
       asset.type !== AssetTypeEnum.Image ||
       asset.livePhotoVideoId ||
       (asset.exifInfo?.projectionType === ProjectionType.EQUIRECTANGULAR &&

From 14cfd824f214fc4c902bd44f0f1ff3d239dc95a0 Mon Sep 17 00:00:00 2001
From: bwees <brandonwees@gmail.com>
Date: Mon, 19 Jan 2026 12:30:48 -0600
Subject: [PATCH 5/5] fix: duplicate onEdit

---
 web/src/lib/components/asset-viewer/asset-viewer.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte
index 1ce4c6870d81e..334c7c1032252 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte
@@ -465,7 +465,6 @@
         onCopyImage={copyImage}
         preAction={handlePreAction}
         onAction={handleAction}
-        onEdit={showEditor}
         {onUndoDelete}
         onEdit={showEditor}
         onRunJob={handleRunJob}