diff --git a/package/src/components/AttachmentPicker/AttachmentPicker.tsx b/package/src/components/AttachmentPicker/AttachmentPicker.tsx
index 18ff1f11ad..c23af98dc6 100644
--- a/package/src/components/AttachmentPicker/AttachmentPicker.tsx
+++ b/package/src/components/AttachmentPicker/AttachmentPicker.tsx
@@ -278,12 +278,11 @@ export const AttachmentPicker = React.forwardRef(
         >
           {iOSLimited && <AttachmentPickerIOSSelectMorePhotos />}
           <BottomSheetFlatList
-            contentContainerStyle={[
+            contentContainerStyle={StyleSheet.flatten([
               styles.container,
-              { backgroundColor: white },
+              { backgroundColor: white, opacity: photoError ? 0 : 1 },
               bottomSheetContentContainer,
-              { opacity: photoError ? 0 : 1 },
-            ]}
+            ])}
             data={selectedPhotos}
             keyExtractor={(item) => item.asset.uri}
             numColumns={numberOfAttachmentPickerImageColumns ?? 3}
diff --git a/package/src/components/Channel/Channel.tsx b/package/src/components/Channel/Channel.tsx
index a731acd6a4..8a6ae48c77 100644
--- a/package/src/components/Channel/Channel.tsx
+++ b/package/src/components/Channel/Channel.tsx
@@ -445,7 +445,7 @@ export type ChannelPropsWithContext = Pick<ChannelContextValue, 'channel'> &
       localMessage: LocalMessage;
       message: StreamMessage;
       options?: SendMessageOptions;
-    }) => Promise<SendMessageAPIResponse>;
+    }) => Promise<void>;
     /**
      * Overrides the Stream default update message request (Advanced usage only)
      * @param channelId
diff --git a/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageStatus.test.js.snap b/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageStatus.test.js.snap
index 605e11641c..f771d43d78 100644
--- a/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageStatus.test.js.snap
+++ b/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageStatus.test.js.snap
@@ -137,18 +137,11 @@ exports[`MessageStatus should render message status with read by container 1`] =
   >
     <RCTScrollView
       contentContainerStyle={
-        [
-          {
-            "flexGrow": 1,
-          },
-          {
-            "backgroundColor": "#FFFFFF",
-          },
-          {},
-          {
-            "opacity": 1,
-          },
-        ]
+        {
+          "backgroundColor": "#FFFFFF",
+          "flexGrow": 1,
+          "opacity": 1,
+        }
       }
       data={[]}
       getItem={[Function]}
diff --git a/package/src/components/MessageInput/__tests__/__snapshots__/AttachButton.test.js.snap b/package/src/components/MessageInput/__tests__/__snapshots__/AttachButton.test.js.snap
index 01394e1138..c88aacebce 100644
--- a/package/src/components/MessageInput/__tests__/__snapshots__/AttachButton.test.js.snap
+++ b/package/src/components/MessageInput/__tests__/__snapshots__/AttachButton.test.js.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`AttachButton should call handleAttachButtonPress when the button is clicked if passed 1`] = `
 <View
@@ -172,18 +172,11 @@ exports[`AttachButton should call handleAttachButtonPress when the button is cli
   >
     <RCTScrollView
       contentContainerStyle={
-        [
-          {
-            "flexGrow": 1,
-          },
-          {
-            "backgroundColor": "#FFFFFF",
-          },
-          {},
-          {
-            "opacity": 1,
-          },
-        ]
+        {
+          "backgroundColor": "#FFFFFF",
+          "flexGrow": 1,
+          "opacity": 1,
+        }
       }
       data={[]}
       getItem={[Function]}
@@ -382,18 +375,11 @@ exports[`AttachButton should render a enabled AttachButton 1`] = `
   >
     <RCTScrollView
       contentContainerStyle={
-        [
-          {
-            "flexGrow": 1,
-          },
-          {
-            "backgroundColor": "#FFFFFF",
-          },
-          {},
-          {
-            "opacity": 1,
-          },
-        ]
+        {
+          "backgroundColor": "#FFFFFF",
+          "flexGrow": 1,
+          "opacity": 1,
+        }
       }
       data={[]}
       getItem={[Function]}
@@ -592,18 +578,11 @@ exports[`AttachButton should render an disabled AttachButton 1`] = `
   >
     <RCTScrollView
       contentContainerStyle={
-        [
-          {
-            "flexGrow": 1,
-          },
-          {
-            "backgroundColor": "#FFFFFF",
-          },
-          {},
-          {
-            "opacity": 1,
-          },
-        ]
+        {
+          "backgroundColor": "#FFFFFF",
+          "flexGrow": 1,
+          "opacity": 1,
+        }
       }
       data={[]}
       getItem={[Function]}
diff --git a/package/src/components/MessageInput/__tests__/__snapshots__/SendButton.test.js.snap b/package/src/components/MessageInput/__tests__/__snapshots__/SendButton.test.js.snap
index b46c4162bf..ca6b9d765b 100644
--- a/package/src/components/MessageInput/__tests__/__snapshots__/SendButton.test.js.snap
+++ b/package/src/components/MessageInput/__tests__/__snapshots__/SendButton.test.js.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`SendButton should render a SendButton 1`] = `
 <View
@@ -147,18 +147,11 @@ exports[`SendButton should render a SendButton 1`] = `
   >
     <RCTScrollView
       contentContainerStyle={
-        [
-          {
-            "flexGrow": 1,
-          },
-          {
-            "backgroundColor": "#FFFFFF",
-          },
-          {},
-          {
-            "opacity": 1,
-          },
-        ]
+        {
+          "backgroundColor": "#FFFFFF",
+          "flexGrow": 1,
+          "opacity": 1,
+        }
       }
       data={[]}
       getItem={[Function]}
@@ -332,18 +325,11 @@ exports[`SendButton should render a disabled SendButton 1`] = `
   >
     <RCTScrollView
       contentContainerStyle={
-        [
-          {
-            "flexGrow": 1,
-          },
-          {
-            "backgroundColor": "#FFFFFF",
-          },
-          {},
-          {
-            "opacity": 1,
-          },
-        ]
+        {
+          "backgroundColor": "#FFFFFF",
+          "flexGrow": 1,
+          "opacity": 1,
+        }
       }
       data={[]}
       getItem={[Function]}
diff --git a/package/src/components/Poll/components/PollOption.tsx b/package/src/components/Poll/components/PollOption.tsx
index 2667775961..cfd5ae034a 100644
--- a/package/src/components/Poll/components/PollOption.tsx
+++ b/package/src/components/Poll/components/PollOption.tsx
@@ -181,6 +181,8 @@ export const VoteButton = ({ onPress, option }: PollVoteButtonProps) => {
     toggleVote();
   }, [message, onPress, poll, toggleVote]);
 
+  const hasVote = !!ownVotesByOptionId[option.id];
+
   return ownCapabilities.castPollVote && !isClosed ? (
     <Pressable
       onPress={onPressHandler}
@@ -188,17 +190,15 @@ export const VoteButton = ({ onPress, option }: PollVoteButtonProps) => {
         { opacity: pressed ? 0.5 : 1 },
         styles.voteContainer,
         {
-          backgroundColor: ownVotesByOptionId[option.id]
-            ? voteButtonActive || accent_dark_blue
-            : 'transparent',
-          borderColor: ownVotesByOptionId[option.id]
+          backgroundColor: hasVote ? voteButtonActive || accent_dark_blue : 'transparent',
+          borderColor: hasVote
             ? voteButtonActive || accent_dark_blue
             : voteButtonInactive || disabled,
         },
         voteButtonContainer,
       ]}
     >
-      {ownVotesByOptionId[option.id] ? <Check height={15} pathFill='white' width={20} /> : null}
+      {hasVote ? <Check height={15} pathFill='white' width={20} /> : null}
     </Pressable>
   ) : null;
 };
diff --git a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
index af67127f37..a445b548d4 100644
--- a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
+++ b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
@@ -2439,18 +2439,11 @@ exports[`Thread should match thread snapshot 1`] = `
   >
     <RCTScrollView
       contentContainerStyle={
-        [
-          {
-            "flexGrow": 1,
-          },
-          {
-            "backgroundColor": "#FFFFFF",
-          },
-          {},
-          {
-            "opacity": 1,
-          },
-        ]
+        {
+          "backgroundColor": "#FFFFFF",
+          "flexGrow": 1,
+          "opacity": 1,
+        }
       }
       data={[]}
       getItem={[Function]}