From b9298259d5553c8b3208078cf0c42ce4a2ad1aa1 Mon Sep 17 00:00:00 2001
From: meganoahj <noahjaksch@gmail.com>
Date: Sat, 3 Aug 2024 01:19:32 +0200
Subject: [PATCH 1/6] Fixes Icon preview of latest WebXDC displayed when
 summary is reaction event

https://github.com/deltachat/deltachat-core-rust/issues/5782
---
 src/renderer/components/chat/ChatListItem.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/chat/ChatListItem.tsx b/src/renderer/components/chat/ChatListItem.tsx
index c7865344ef..965560ca6b 100644
--- a/src/renderer/components/chat/ChatListItem.tsx
+++ b/src/renderer/components/chat/ChatListItem.tsx
@@ -87,7 +87,7 @@ function Message({
 
   const status = wasReceived ? '' : mapCoreMsgStatus2String(summaryStatus)
 
-  const iswebxdc = lastMessageType === 'Webxdc'
+  const iswebxdc = summaryPreviewImage === "webxdc-icon://last-msg-id"
 
   return (
     <div className='chat-list-item-message'>
@@ -101,7 +101,7 @@ function Message({
             {summaryText1 + ': '}
           </div>
         )}
-        {summaryPreviewImage && (
+        {summaryPreviewImage && !iswebxdc &&(
           <img className='summary_thumbnail' src={summaryPreviewImage} />
         )}
         {iswebxdc && lastMessageId && (

From 9e1845bdbcb74b10d2ba29a31d1346650a560e4f Mon Sep 17 00:00:00 2001
From: meganoahj <noahjaksch@gmail.com>
Date: Sat, 3 Aug 2024 01:21:57 +0200
Subject: [PATCH 2/6] added changelog message

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67ca668e10..f20317b70b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## [Unreleased][unreleased]
+- Fixed Icon preview of latest WebXDC displayed when summary is reaction event #4062
 
 ### Added
 - New keyboard shortcuts (experimental setting): Telegram-style Ctrl+Up/Down to select the message to reply to #3965

From dad1f995dfd68976c81b9e74a5f2e6d1485a32c7 Mon Sep 17 00:00:00 2001
From: meganoahj <noahjaksch@gmail.com>
Date: Sat, 3 Aug 2024 01:42:01 +0200
Subject: [PATCH 3/6] fixed formatting

---
 src/renderer/components/chat/ChatListItem.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/chat/ChatListItem.tsx b/src/renderer/components/chat/ChatListItem.tsx
index 965560ca6b..2c21cdab27 100644
--- a/src/renderer/components/chat/ChatListItem.tsx
+++ b/src/renderer/components/chat/ChatListItem.tsx
@@ -87,7 +87,7 @@ function Message({
 
   const status = wasReceived ? '' : mapCoreMsgStatus2String(summaryStatus)
 
-  const iswebxdc = summaryPreviewImage === "webxdc-icon://last-msg-id"
+  const iswebxdc = summaryPreviewImage === 'webxdc-icon://last-msg-id'
 
   return (
     <div className='chat-list-item-message'>
@@ -101,7 +101,7 @@ function Message({
             {summaryText1 + ': '}
           </div>
         )}
-        {summaryPreviewImage && !iswebxdc &&(
+        {summaryPreviewImage && !iswebxdc && (
           <img className='summary_thumbnail' src={summaryPreviewImage} />
         )}
         {iswebxdc && lastMessageId && (

From 3ec74e70c68a87e8519de0a6744d19cebf6ff8e0 Mon Sep 17 00:00:00 2001
From: meganoahj <noahjaksch@gmail.com>
Date: Sat, 3 Aug 2024 01:54:34 +0200
Subject: [PATCH 4/6] fix lint

---
 src/renderer/components/chat/ChatListItem.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/renderer/components/chat/ChatListItem.tsx b/src/renderer/components/chat/ChatListItem.tsx
index 2c21cdab27..e5e3b89597 100644
--- a/src/renderer/components/chat/ChatListItem.tsx
+++ b/src/renderer/components/chat/ChatListItem.tsx
@@ -66,7 +66,6 @@ function Message({
   isArchived,
   isContactRequest,
   summaryPreviewImage,
-  lastMessageType,
   lastMessageId,
 }: Pick<
   ChatListItemType,
@@ -77,7 +76,6 @@ function Message({
   | 'isArchived'
   | 'isContactRequest'
   | 'summaryPreviewImage'
-  | 'lastMessageType'
   | `lastMessageId`
 >) {
   const wasReceived =

From 3e6ae8cad8d8d9a9ad0b838553b7f420dd0e6fb4 Mon Sep 17 00:00:00 2001
From: meganoahj <noahjaksch@gmail.com>
Date: Sat, 3 Aug 2024 02:20:05 +0200
Subject: [PATCH 5/6] fixed code

---
 src/renderer/components/chat/ChatListItem.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/renderer/components/chat/ChatListItem.tsx b/src/renderer/components/chat/ChatListItem.tsx
index e5e3b89597..cbb703dc66 100644
--- a/src/renderer/components/chat/ChatListItem.tsx
+++ b/src/renderer/components/chat/ChatListItem.tsx
@@ -279,7 +279,6 @@ function ChatListItemNormal({
           freshMessageCounter={chatListItem.freshMessageCounter}
           isArchived={chatListItem.isArchived}
           isContactRequest={chatListItem.isContactRequest}
-          lastMessageType={chatListItem.lastMessageType}
           lastMessageId={chatListItem.lastMessageId}
         />
       </div>

From 27e644763c7c668808878da5a0facbe309791cce Mon Sep 17 00:00:00 2001
From: meganoahj <noahjaksch@gmail.com>
Date: Sat, 3 Aug 2024 23:32:19 +0200
Subject: [PATCH 6/6] put changelog entry to the right place

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f20317b70b..c9ee13d659 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 # Changelog
 
 ## [Unreleased][unreleased]
-- Fixed Icon preview of latest WebXDC displayed when summary is reaction event #4062
 
 ### Added
 - New keyboard shortcuts (experimental setting): Telegram-style Ctrl+Up/Down to select the message to reply to #3965
@@ -55,6 +54,7 @@
 - fix missing remove button in AddMemberChip #393
 - fix composite emoji in text avatar #4038
 - fix "Password and Account" dialog not indicating invalid credentials, making it seem that you can change password like this #4032
+- fix Icon preview of latest WebXDC displayed when summary is reaction event #4062
 
 <a id="1_46_1"></a>