stream-chat-react-native-core 8.3.3 → 8.4.0-beta.1

package/lib/typescript/components/MessageInput/MessageInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageInput.d.ts","sourceRoot":"","sources":["../../../../src/components/MessageInput/MessageInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAuBzE,OAAO,EAAE,gBAAgB,EAA6C,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EACL,4BAA4B,EAE7B,MAAM,gEAAgE,CAAC;AACxE,OAAO,EACL,mBAAmB,EAEpB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EACL,8BAA8B,EAE/B,MAAM,iEAAiE,CAAC;AAIzE,OAAO,EACL,wBAAwB,EAEzB,MAAM,wDAAwD,CAAC;AAChE,OAAO,EACL,oBAAoB,EAErB,MAAM,gDAAgD,CAAC;AAGxD,OAAO,EACL,uBAAuB,EAExB,MAAM,sDAAsD,CAAC;AAkD9D,KAAK,4BAA4B,GAAG,IAAI,CACtC,4BAA4B,EAC5B,aAAa,GAAG,gBAAgB,CACjC,GACC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAClC,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,UAAU,CAAC,GAC5E,IAAI,CACF,wBAAwB,EACtB,0BAA0B,GAC1B,uBAAuB,GACvB,2BAA2B,GAC3B,mCAAmC,GACnC,oCAAoC,GACpC,+BAA+B,GAC/B,mCAAmC,GACnC,8BAA8B,GAC9B,8BAA8B,GAC9B,6BAA6B,GAC7B,eAAe,GACf,0BAA0B,GAC1B,6BAA6B,GAC7B,uBAAuB,GACvB,4BAA4B,GAC5B,gBAAgB,GAChB,eAAe,GACf,uBAAuB,GACvB,sBAAsB,GACtB,OAAO,GACP,aAAa,GACb,cAAc,GACd,yBAAyB,GACzB,oBAAoB,GACpB,gBAAgB,GAChB,kBAAkB,GAClB,mBAAmB,GACnB,2BAA2B,GAC3B,cAAc,GACd,uBAAuB,GACvB,YAAY,GACZ,kCAAkC,GAClC,2BAA2B,GAC3B,eAAe,GACf,wBAAwB,GACxB,yBAAyB,GACzB,wBAAwB,GACxB,aAAa,GACb,mBAAmB,GACnB,4BAA4B,CAC/B,GACD,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,GACnC,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,GAClC,IAAI,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAuiBnF,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEtE;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY;YAAW,iBAAiB;;CAoIpD,CAAC"}
+{"version":3,"file":"MessageInput.d.ts","sourceRoot":"","sources":["../../../../src/components/MessageInput/MessageInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AACzE,OAAO,EAAmC,SAAS,EAAE,cAAc,EAAQ,MAAM,cAAc,CAAC;AAsBhG,OAAO,EAAE,gBAAgB,EAA6C,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EACL,4BAA4B,EAE7B,MAAM,gEAAgE,CAAC;AACxE,OAAO,EACL,mBAAmB,EAEpB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EACL,8BAA8B,EAE/B,MAAM,iEAAiE,CAAC;AAIzE,OAAO,EACL,wBAAwB,EAEzB,MAAM,wDAAwD,CAAC;AAChE,OAAO,EACL,oBAAoB,EAErB,MAAM,gDAAgD,CAAC;AAGxD,OAAO,EACL,uBAAuB,EAExB,MAAM,sDAAsD,CAAC;AAkD9D,KAAK,4BAA4B,GAAG,IAAI,CACtC,4BAA4B,EAC5B,aAAa,GAAG,gBAAgB,CACjC,GACC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAClC,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,UAAU,CAAC,GAC5E,IAAI,CACF,wBAAwB,EACtB,0BAA0B,GAC1B,uBAAuB,GACvB,2BAA2B,GAC3B,mCAAmC,GACnC,oCAAoC,GACpC,+BAA+B,GAC/B,mCAAmC,GACnC,8BAA8B,GAC9B,8BAA8B,GAC9B,6BAA6B,GAC7B,eAAe,GACf,0BAA0B,GAC1B,6BAA6B,GAC7B,uBAAuB,GACvB,4BAA4B,GAC5B,gBAAgB,GAChB,eAAe,GACf,uBAAuB,GACvB,sBAAsB,GACtB,OAAO,GACP,aAAa,GACb,cAAc,GACd,yBAAyB,GACzB,oBAAoB,GACpB,gBAAgB,GAChB,kBAAkB,GAClB,mBAAmB,GACnB,2BAA2B,GAC3B,cAAc,GACd,uBAAuB,GACvB,YAAY,GACZ,kCAAkC,GAClC,2BAA2B,GAC3B,eAAe,GACf,wBAAwB,GACxB,yBAAyB,GACzB,wBAAwB,GACxB,aAAa,GACb,mBAAmB,GACnB,4BAA4B,CAC/B,GACD,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,GACnC,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,GAClC,IAAI,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,GAAG;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,KAAK,CAAC,aAAa,CACtC,cAAc,GAAG;QACf,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;KACvC,CACF,CAAC;CACH,CAAC;AAyiBJ,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEtE;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY;YAAW,iBAAiB;;CAoIpD,CAAC"}

package/lib/typescript/components/MessageList/MessageList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../../../src/components/MessageList/MessageList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AACjF,OAAO,EACL,aAAa,EACb,QAAQ,IAAI,YAAY,EAExB,eAAe,EAKhB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAkB,YAAY,EAAmB,MAAM,aAAa,CAAC;AAUjF,OAAO,EACL,4BAA4B,EAE7B,MAAM,gEAAgE,CAAC;AACxE,OAAO,EACL,mBAAmB,EAEpB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAkB,MAAM,wCAAwC,CAAC;AAE1F,OAAO,EACL,wBAAwB,EAEzB,MAAM,wDAAwD,CAAC;AAChE,OAAO,EACL,oBAAoB,EAErB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,gCAAgC,EAEjC,MAAM,wEAAwE,CAAC;AAEhF,OAAO,EAAE,kBAAkB,EAAoB,MAAM,4CAA4C,CAAC;AA0ElG,KAAK,2BAA2B,GAAG,IAAI,CACrC,4BAA4B,EAC5B,aAAa,GAAG,gBAAgB,GAAG,mBAAmB,CACvD,GACC,IAAI,CACF,mBAAmB,EACjB,SAAS,GACT,oBAAoB,GACpB,UAAU,GACV,qBAAqB,GACrB,sBAAsB,GACtB,sBAAsB,GACtB,0BAA0B,GAC1B,SAAS,GACT,kBAAkB,GAClB,UAAU,GACV,sBAAsB,GACtB,eAAe,GACf,8BAA8B,GAC9B,uBAAuB,GACvB,oBAAoB,GACpB,cAAc,GACd,iBAAiB,GACjB,YAAY,CACf,GACD,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,GAChC,IAAI,CAAC,wBAAwB,EAAE,aAAa,CAAC,GAC7C,IAAI,CAAC,gCAAgC,EAAE,UAAU,GAAG,gBAAgB,CAAC,GACrE,IAAI,CACF,oBAAoB,EAClB,YAAY,GACZ,wBAAwB,GACxB,UAAU,GACV,qBAAqB,GACrB,uBAAuB,GACvB,iCAAiC,GACjC,SAAS,GACT,sBAAsB,GACtB,eAAe,GACf,gBAAgB,GAChB,0BAA0B,GAC1B,iBAAiB,GACjB,0BAA0B,GAC1B,4BAA4B,CAC/B,GACD,IAAI,CACF,kBAAkB,EAClB,sBAAsB,GAAG,gBAAgB,GAAG,QAAQ,GAAG,gBAAgB,CACxE,GAAG;IACF;;;;;;;;;;;;;OAaG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACtC;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACtC,gEAAgE;IAChE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;IACjE;;;;;;;;;;OAUG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;CACnE,CAAC;AA+iCJ,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AAEpE,eAAO,MAAM,WAAW,GAAI,OAAO,gBAAgB,sBAoGlD,CAAC"}
+{"version":3,"file":"MessageList.d.ts","sourceRoot":"","sources":["../../../../src/components/MessageList/MessageList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AACjF,OAAO,EACL,aAAa,EACb,QAAQ,IAAI,YAAY,EACxB,eAAe,EAKhB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAkB,YAAY,EAAmB,MAAM,aAAa,CAAC;AAUjF,OAAO,EACL,4BAA4B,EAE7B,MAAM,gEAAgE,CAAC;AACxE,OAAO,EACL,mBAAmB,EAEpB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAkB,MAAM,wCAAwC,CAAC;AAE1F,OAAO,EACL,wBAAwB,EAEzB,MAAM,wDAAwD,CAAC;AAChE,OAAO,EACL,oBAAoB,EAErB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,gCAAgC,EAEjC,MAAM,wEAAwE,CAAC;AAEhF,OAAO,EAAE,kBAAkB,EAAoB,MAAM,4CAA4C,CAAC;AA0ElG,KAAK,2BAA2B,GAAG,IAAI,CACrC,4BAA4B,EAC5B,aAAa,GAAG,gBAAgB,GAAG,mBAAmB,CACvD,GACC,IAAI,CACF,mBAAmB,EACjB,SAAS,GACT,oBAAoB,GACpB,UAAU,GACV,qBAAqB,GACrB,sBAAsB,GACtB,sBAAsB,GACtB,0BAA0B,GAC1B,SAAS,GACT,kBAAkB,GAClB,UAAU,GACV,sBAAsB,GACtB,eAAe,GACf,8BAA8B,GAC9B,uBAAuB,GACvB,oBAAoB,GACpB,cAAc,GACd,iBAAiB,GACjB,YAAY,CACf,GACD,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,GAChC,IAAI,CAAC,wBAAwB,EAAE,aAAa,CAAC,GAC7C,IAAI,CAAC,gCAAgC,EAAE,UAAU,GAAG,gBAAgB,CAAC,GACrE,IAAI,CACF,oBAAoB,EAClB,YAAY,GACZ,wBAAwB,GACxB,UAAU,GACV,qBAAqB,GACrB,uBAAuB,GACvB,iCAAiC,GACjC,SAAS,GACT,sBAAsB,GACtB,eAAe,GACf,gBAAgB,GAChB,0BAA0B,GAC1B,iBAAiB,GACjB,0BAA0B,GAC1B,4BAA4B,CAC/B,GACD,IAAI,CACF,kBAAkB,EAClB,sBAAsB,GAAG,gBAAgB,GAAG,QAAQ,GAAG,gBAAgB,CACxE,GAAG;IACF;;;;;;;;;;;;;OAaG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACtC;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACtC,gEAAgE;IAChE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;IACjE;;;;;;;;;;OAUG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;CACnE,CAAC;AAghCJ,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AAEpE,eAAO,MAAM,WAAW,GAAI,OAAO,gBAAgB,sBAoGlD,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "8.3.3",
+  "version": "8.4.0-beta.1",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -118,13 +118,13 @@
     "@types/linkify-it": "5.0.0",
     "@types/lodash": "4.17.16",
     "@types/mime-types": "2.1.4",
-    "@types/react": "^19.0.0",
-    "@types/react-test-renderer": "19.0.0",
+    "@types/react": "^19.1.0",
+    "@types/react-test-renderer": "19.1.0",
     "@types/ungap__structured-clone": "^1.2.0",
     "@types/use-sync-external-store": "^1.5.0",
     "@types/uuid": "^10.0.0",
     "babel-eslint": "10.1.0",
-    "babel-jest": "29.7.0",
+    "babel-jest": "30.0.0",
     "babel-loader": "10.0.0",
     "babel-plugin-module-resolver": "5.0.2",
     "better-sqlite3": "11.10.0",
@@ -142,19 +142,19 @@
     "jest": "^30.0.0",
     "moment-timezone": "^0.6.0",
     "prettier": "^3.5.3",
-    "react": "19.0.0",
-    "react-native": "0.79.3",
+    "react": "19.1.0",
+    "react-native": "0.80.2",
     "react-native-builder-bob": "0.40.11",
-    "react-native-gesture-handler": "^2.25.0",
+    "react-native-gesture-handler": "^2.26.0",
     "react-native-reanimated": "3.18.0",
     "react-native-svg": "15.12.0",
-    "react-test-renderer": "19.0.0",
+    "react-test-renderer": "19.1.0",
     "rimraf": "^6.0.1",
     "typescript": "5.8.3",
     "typescript-eslint": "^8.34.0",
     "uuid": "^11.1.0"
   },
   "resolutions": {
-    "@types/react": "^19.0.0"
+    "@types/react": "^19.1.0"
   }
 }

package/src/components/AutoCompleteInput/AutoCompleteInput.tsx

@@ -1,12 +1,11 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   I18nManager,
-  NativeSyntheticEvent,
+  TextInput as RNTextInput,
   StyleSheet,
-  TextInput,
-  TextInputContentSizeChangeEventData,
+  TextInputContentSizeChangeEvent,
   TextInputProps,
-  TextInputSelectionChangeEventData,
+  TextInputSelectionChangeEvent,
 } from 'react-native';
 
 import { MessageComposerConfig, TextComposerState } from 'stream-chat';
@@ -37,6 +36,11 @@ type AutoCompleteInputPropsWithContext = TextInputProps &
      * that would happen if we put this in the MessageInputContext
      */
     cooldownActive?: boolean;
+    TextInputComponent?: React.ComponentType<
+      TextInputProps & {
+        ref: React.Ref<RNTextInput> | undefined;
+      }
+    >;
   };
 
 type AutoCompleteInputProps = Partial<AutoCompleteInputPropsWithContext>;
@@ -53,7 +57,14 @@ const configStateSelector = (state: MessageComposerConfig) => ({
 const MAX_NUMBER_OF_LINES = 5;
 
 const AutoCompleteInputWithContext = (props: AutoCompleteInputPropsWithContext) => {
-  const { channel, cooldownActive = false, setInputBoxRef, t, ...rest } = props;
+  const {
+    channel,
+    cooldownActive = false,
+    setInputBoxRef,
+    t,
+    TextInputComponent = RNTextInput,
+    ...rest
+  } = props;
   const [localText, setLocalText] = useState('');
   const [textHeight, setTextHeight] = useState(0);
   const messageComposer = useMessageComposer();
@@ -74,7 +85,7 @@ const AutoCompleteInputWithContext = (props: AutoCompleteInputPropsWithContext)
   }, [text]);
 
   const handleSelectionChange = useCallback(
-    (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
+    (e: TextInputSelectionChangeEvent) => {
       const { selection } = e.nativeEvent;
       textComposer.setSelection(selection);
     },
@@ -108,16 +119,14 @@ const AutoCompleteInputWithContext = (props: AutoCompleteInputPropsWithContext)
   }, [command, cooldownActive, t]);
 
   const handleContentSizeChange = useCallback(
-    ({
-      nativeEvent: { contentSize },
-    }: NativeSyntheticEvent<TextInputContentSizeChangeEventData>) => {
+    ({ nativeEvent: { contentSize } }: TextInputContentSizeChangeEvent) => {
       setTextHeight(contentSize.height);
     },
     [],
   );
 
   return (
-    <TextInput
+    <TextInputComponent
       autoFocus={!!command}
       editable={enabled}
       maxLength={maxMessageLength}

package/src/components/MessageInput/MessageInput.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Modal, SafeAreaView, StyleSheet, View } from 'react-native';
+import { Modal, SafeAreaView, StyleSheet, TextInput, TextInputProps, View } from 'react-native';
 
 import {
   Gesture,
@@ -151,7 +151,14 @@ type MessageInputPropsWithContext = Pick<
   > &
   Pick<MessagesContextValue, 'Reply'> &
   Pick<TranslationContextValue, 't'> &
-  Pick<MessageComposerAPIContextValue, 'clearEditingState'> & { editing: boolean };
+  Pick<MessageComposerAPIContextValue, 'clearEditingState'> & {
+    editing: boolean;
+    TextInputComponent?: React.ComponentType<
+      TextInputProps & {
+        ref: React.Ref<TextInput> | undefined;
+      }
+    >;
+  };
 
 const textComposerStateSelector = (state: TextComposerState) => ({
   command: state.command,
@@ -207,6 +214,7 @@ const MessageInputWithContext = (props: MessageInputPropsWithContext) => {
     ShowThreadMessageInChannelButton,
     StartAudioRecordingButton,
     StopMessageStreamingButton,
+    TextInputComponent,
     watchers,
   } = props;
 
@@ -504,6 +512,7 @@ const MessageInputWithContext = (props: MessageInputPropsWithContext) => {
                       <View style={[styles.autoCompleteInputContainer, autoCompleteInputContainer]}>
                         <AutoCompleteInput
                           cooldownActive={!!cooldownRemainingSeconds}
+                          TextInputComponent={TextInputComponent}
                           {...additionalTextInputProps}
                         />
                       </View>

package/src/components/MessageList/MessageList.tsx

@@ -2,7 +2,6 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import {
   FlatListProps,
   FlatList as FlatListType,
-  Platform,
   ScrollViewProps,
   StyleSheet,
   View,
@@ -739,9 +738,6 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [targetedMessage]);
 
-  // TODO: do not apply on RN 0.73 and above
-  const shouldApplyAndroidWorkaround = inverted && Platform.OS === 'android';
-
   const renderItem = useCallback(
     ({ index, item: message }: { index: number; item: LocalMessage }) => {
       if (!channel || channel.disconnected || (!channel.initialized && !channel.offlineMode)) {
@@ -785,10 +781,7 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
       );
 
       return (
-        <View
-          style={[shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined]}
-          testID={`message-list-item-${index}`}
-        >
+        <View testID={`message-list-item-${index}`}>
           {message.type === 'system' ? (
             <MessageSystem
               message={message}
@@ -832,7 +825,6 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
       myMessageTheme,
       onThreadSelect,
       screenPadding,
-      shouldApplyAndroidWorkaround,
       shouldShowUnreadUnderlay,
       threadList,
     ],
@@ -1151,33 +1143,14 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
     }
   }
 
-  const ListFooterComponent = useCallback(
-    () => (
-      <View style={shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined}>
-        <FooterComponent />
-      </View>
-    ),
-    [shouldApplyAndroidWorkaround, FooterComponent],
-  );
+  const ListFooterComponent = useCallback(() => <FooterComponent />, [FooterComponent]);
 
-  const ListHeaderComponent = useCallback(
-    () => (
-      <View style={shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined}>
-        <HeaderComponent />
-      </View>
-    ),
-    [shouldApplyAndroidWorkaround, HeaderComponent],
-  );
+  const ListHeaderComponent = useCallback(() => <HeaderComponent />, [HeaderComponent]);
 
   const ItemSeparatorComponent = additionalFlatListProps?.ItemSeparatorComponent;
-  const WrappedItemSeparatorComponent = useCallback(
-    () => (
-      <View style={[shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined]}>
-        {ItemSeparatorComponent ? <ItemSeparatorComponent /> : null}
-      </View>
-    ),
-    [ItemSeparatorComponent, shouldApplyAndroidWorkaround],
-  );
+  const WrappedItemSeparatorComponent = useCallback(() => {
+    return ItemSeparatorComponent ? <ItemSeparatorComponent /> : null;
+  }, [ItemSeparatorComponent]);
 
   // We need to omit the style related props from the additionalFlatListProps and add them directly instead of spreading
   let additionalFlatListPropsExcludingStyle:
@@ -1195,13 +1168,8 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
   }
 
   const flatListStyle = useMemo(
-    () => [
-      styles.listContainer,
-      listContainer,
-      additionalFlatListProps?.style,
-      shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined,
-    ],
-    [additionalFlatListProps?.style, listContainer, shouldApplyAndroidWorkaround],
+    () => [styles.listContainer, listContainer, additionalFlatListProps?.style],
+    [additionalFlatListProps?.style, listContainer],
   );
 
   const flatListContentContainerStyle = useMemo(
@@ -1241,7 +1209,7 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
           /** Disables the MessageList UI. Which means, message actions, reactions won't work. */
           data={processedMessageList}
           extraData={disabled}
-          inverted={shouldApplyAndroidWorkaround ? false : inverted}
+          inverted={inverted}
           ItemSeparatorComponent={WrappedItemSeparatorComponent}
           keyboardShouldPersistTaps='handled'
           keyExtractor={keyExtractor}
@@ -1264,7 +1232,7 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
           onViewableItemsChanged={stableOnViewableItemsChanged}
           ref={refCallback}
           renderItem={renderItem}
-          showsVerticalScrollIndicator={!shouldApplyAndroidWorkaround}
+          showsVerticalScrollIndicator={false}
           style={flatListStyle}
           testID='message-flat-list'
           viewabilityConfig={flatListViewabilityConfig}