From 70a6a25eb2a3837276e0b3d08532c00ed27a5229 Mon Sep 17 00:00:00 2001
From: Christopher Makarem <23037854+x24git@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:40:39 +0000
Subject: [PATCH] Fixes to address review comments

---
 .../asset-viewer/asset-viewer-nav-bar.svelte   |  2 +-
 .../asset-viewer/detail-panel.svelte           |  2 +-
 .../assets/thumbnail/thumbnail.svelte          | 18 ++++++++----------
 web/src/lib/i18n/en.json                       |  4 ++--
 4 files changed, 12 insertions(+), 14 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 7df89ad0a46da..7bed7b2b0ab7c 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
@@ -84,7 +84,7 @@
     class="flex w-[calc(100%-3rem)] justify-end gap-2 overflow-hidden text-white"
     data-testid="asset-viewer-navbar-actions"
   >
-    {#if asset.owner && asset.owner.id != $user.id}
+    {#if asset.owner && asset.owner.id !== $user.id}
       <div class="p-3 margin:auto">
         <UserAvatar user={asset.owner} size="xs"></UserAvatar>
       </div>
diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte
index fd677657af961..b22fca45358aa 100644
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -462,7 +462,7 @@
   </div>
 {/if}
 
-{#if (asset.ownerId != $user?.id && asset.owner) || ($user === undefined && asset.owner)}
+{#if asset.owner && (asset.ownerId != $user?.id || $user === undefined)}
   <section class="px-6 dark:text-immich-dark-fg mt-4">
     {#if currentAlbum}
       <p class="text-sm">{$t('shared_by').toUpperCase()}</p>
diff --git a/web/src/lib/components/assets/thumbnail/thumbnail.svelte b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
index 673d1d4e400ef..0c72a37e78a3b 100644
--- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
@@ -80,7 +80,6 @@
   let intersecting = false;
   let lastRetrievedElement: HTMLElement | undefined;
   let loaded = false;
-  let shareUser: UserResponseDto | undefined;
 
   $: if (!retrieveElement) {
     lastRetrievedElement = undefined;
@@ -89,9 +88,6 @@
     lastRetrievedElement = element;
     onRetrieveElement?.(element);
   }
-  $: if ($showUserThumbnails && showUserThumbnailsinViewer && (isSharedLink() || asset.ownerId != $user.id)) {
-    handlePromiseError(getShareUser());
-  }
 
   $: width = thumbnailSize || thumbnailWidth || 235;
   $: height = thumbnailSize || thumbnailHeight || 235;
@@ -171,9 +167,9 @@
 
   const getShareUser = async () => {
     try {
-      shareUser = await getUserAndCacheResult(asset.ownerId);
+      return await getUserAndCacheResult(asset.ownerId);
     } catch (error) {
-      handleError(error, $t('errors.unable_to_load_liked_status'));
+      handleError(error, $t('errors.unable_to_load_items'));
     }
   };
 
@@ -286,10 +282,12 @@
           </div>
         {/if}
 
-        {#if shareUser && showUserThumbnailsinViewer}
-          <div class="absolute bottom-2 left-2 z-10">
-            <UserAvatar user={shareUser} size="sm" />
-          </div>
+        {#if showUserThumbnailsinViewer && $showUserThumbnails && (isSharedLink() || asset.ownerId != $user.id)}
+          {#await getShareUser() then shareUser}
+            <div class="absolute bottom-2 left-2 z-10">
+              <UserAvatar user={shareUser} size="sm" />
+            </div>
+          {/await}
         {/if}
 
         {#if !isSharedLink() && showArchiveIcon && asset.isArchived}
diff --git a/web/src/lib/i18n/en.json b/web/src/lib/i18n/en.json
index 99f6a1db805db..5ff1f3452ef8a 100644
--- a/web/src/lib/i18n/en.json
+++ b/web/src/lib/i18n/en.json
@@ -1156,7 +1156,7 @@
   "show_supporter_badge": "Supporter badge",
   "show_supporter_badge_description": "Show a supporter badge",
   "show_user_thumbnails": "Show user thumbnails",
-  "show_user_thumbnails_description": "Show user avatars on timelinle for shared albums and partners",
+  "show_user_thumbnails_description": "Show user avatars on timeline for shared albums and partners",
   "shuffle": "Shuffle",
   "sidebar": "Sidebar",
   "sidebar_display_description": "Display a link to the view in the sidebar",
@@ -1309,4 +1309,4 @@
   "yes": "Yes",
   "you_dont_have_any_shared_links": "You don't have any shared links",
   "zoom_image": "Zoom Image"
-}
+}
\ No newline at end of file