From 4e02c84f90f36c2e73a6728c4d93274807a1f40c Mon Sep 17 00:00:00 2001
From: saltrafael <a657ee92-7eb9-46eb-97d2-6735799df838@aleeas.com>
Date: Thu, 29 Jul 2021 09:39:29 -0300
Subject: [PATCH] Fix broken avatars

---
 ui/component/notification/view.jsx | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/ui/component/notification/view.jsx b/ui/component/notification/view.jsx
index 083e033ed..7226aea5f 100644
--- a/ui/component/notification/view.jsx
+++ b/ui/component/notification/view.jsx
@@ -94,26 +94,34 @@ export default function Notification(props: Props) {
   };
 
   let icon;
-  const creatorIcon =
-  <UriIndicator uri={notification_parameters.dynamic.comment_author} link>
-    <ChannelThumbnail small uri={notification_parameters.dynamic.comment_author} />
-  </UriIndicator>;
   switch (notification_rule) {
     case RULE.CREATOR_SUBSCRIBER:
       icon = <Icon icon={ICONS.SUBSCRIBE} sectionIcon />;
       break;
     case RULE.COMMENT:
     case RULE.CREATOR_COMMENT:
-      icon = creatorIcon;
+      icon =
+      <UriIndicator uri={notification_parameters.dynamic.comment_author} link>
+        <ChannelThumbnail small uri={notification_parameters.dynamic.comment_author} />
+      </UriIndicator>;
       break;
     case RULE.COMMENT_REPLY:
-      icon = creatorIcon;
+      icon =
+      <UriIndicator uri={notification_parameters.dynamic.reply_author} link>
+        <ChannelThumbnail small uri={notification_parameters.dynamic.reply_author} />
+      </UriIndicator>;
       break;
     case RULE.NEW_CONTENT:
-      icon = creatorIcon;
+      icon =
+      <UriIndicator uri={notification_parameters.dynamic.channel_url} link>
+        <ChannelThumbnail small uri={notification_parameters.dynamic.channel_url} />
+      </UriIndicator>;
       break;
     case RULE.NEW_LIVESTREAM:
-      icon = creatorIcon;
+      icon =
+      <UriIndicator uri={notification_parameters.dynamic.channel_url} link>
+        <ChannelThumbnail small uri={notification_parameters.dynamic.channel_url} />
+      </UriIndicator>;
       break;
     case RULE.DAILY_WATCH_AVAILABLE:
     case RULE.DAILY_WATCH_REMIND: