fix: inverted unread indicator due to applied inverted styles (#2889)

* fix: inverted unread indicator due to applied inverted styles * fix: tests snapshots * fix: unread indicator inverted issue on android * fix: tests
GetStream · Jan 15, 2025 · ba07bf9 · ba07bf9
1 parent 34ddec9
commit ba07bf9
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/package/src/components/MessageList/MessageList.tsx b/package/src/components/MessageList/MessageList.tsx
@@ -670,33 +670,36 @@ const MessageListWithContext = <
         threadList={threadList}
       />
     );
+
     return wrapMessageInTheme ? (
       <>
         <ThemeProvider mergedStyle={modifiedTheme}>
           <View
             style={[shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined]}
             testID={`message-list-item-${index}`}
           >
+            {shouldApplyAndroidWorkaround && insertInlineUnreadIndicator && (
+              <InlineUnreadIndicator />
+            )}
             {shouldApplyAndroidWorkaround && renderDateSeperator}
             {renderMessage}
           </View>
         </ThemeProvider>
         {!shouldApplyAndroidWorkaround && renderDateSeperator}
-        {/* Adding indicator below the messages, since the list is inverted */}
-        {insertInlineUnreadIndicator && <InlineUnreadIndicator />}
+        {!shouldApplyAndroidWorkaround && insertInlineUnreadIndicator && <InlineUnreadIndicator />}
       </>
     ) : (
       <>
         <View
           style={[shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined]}
           testID={`message-list-item-${index}`}
         >
+          {shouldApplyAndroidWorkaround && insertInlineUnreadIndicator && <InlineUnreadIndicator />}
           {shouldApplyAndroidWorkaround && renderDateSeperator}
           {renderMessage}
         </View>
         {!shouldApplyAndroidWorkaround && renderDateSeperator}
-        {/* Adding indicator below the messages, since the list is inverted */}
-        {insertInlineUnreadIndicator && <InlineUnreadIndicator />}
+        {!shouldApplyAndroidWorkaround && insertInlineUnreadIndicator && <InlineUnreadIndicator />}
       </>
     );
   };