chore: resolve conflicts

Author: khushal87

package/src/components/ChannelList/__tests__/ChannelList.test.js

@@ -40,7 +40,7 @@ import { ChannelList } from '../ChannelList';
  */
 const ChannelPreviewComponent = ({ channel, setActiveChannel }) => (
   <View accessibilityLabel='list-item' onPress={setActiveChannel} testID={channel.id}>
-    <Text>{channel.data.name}</Text>
+    <Text>{channel.data?.name}</Text>
     <Text>{channel.state.messages[0]?.text}</Text>
   </View>
 );
@@ -157,7 +157,7 @@ describe('ChannelList', () => {
       return deferredCallForStaleFilter.promise;
     });
 
-    render(
+    const { rerender, queryByTestId } = render(
       <Chat client={chatClient}>
         <ChannelList {...props} filters={staleFilter} />
       </Chat>,
@@ -172,10 +172,10 @@ describe('ChannelList', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByTestId('channel-list')).toBeTruthy();
+      expect(queryByTestId('channel-list')).toBeTruthy();
     });
 
-    screen.rerender(
+    rerender(
       <Chat client={chatClient}>
         <ChannelList {...props} filters={freshFilter} />
       </Chat>,
@@ -189,11 +189,13 @@ describe('ChannelList', () => {
       expect.anything(),
     );
 
-    deferredCallForStaleFilter.resolve(staleChannel);
-    deferredCallForFreshFilter.resolve(freshChannel);
+    await act(() => {
+      deferredCallForStaleFilter.resolve(staleChannel);
+      deferredCallForFreshFilter.resolve(freshChannel);
+    });
     await waitFor(() => {
-      expect(screen.getByTestId('channel-list')).toBeTruthy();
-      expect(screen.getByTestId('new-channel')).toBeTruthy();
+      expect(queryByTestId('channel-list')).toBeTruthy();
+      expect(queryByTestId('new-channel')).toBeTruthy();
     });
   });
 

package/src/components/MessageInput/MessageInput.tsx

@@ -64,7 +64,6 @@ import {
   NativeHandlers,
 } from '../../native';
 import { AIStates, useAIState } from '../AITypingIndicatorView';
-import { AttachmentPickerProps } from '../AttachmentPicker/AttachmentPicker';
 import { AutoCompleteInput } from '../AutoCompleteInput/AutoCompleteInput';
 import { CreatePoll } from '../Poll/CreatePollContent';
 
@@ -106,20 +105,10 @@ const styles = StyleSheet.create({
   },
 });
 
-type MessageInputPropsWithContext = Partial<
-  Pick<
-    AttachmentPickerProps,
-    | 'AttachmentPickerError'
-    | 'AttachmentPickerErrorImage'
-    | 'AttachmentPickerIOSSelectMorePhotos'
-    | 'ImageOverlaySelectedComponent'
-    | 'attachmentPickerErrorButtonText'
-    | 'attachmentPickerErrorText'
-    | 'numberOfAttachmentImagesToLoadPerCall'
-    | 'numberOfAttachmentPickerImageColumns'
-  >
+type MessageInputPropsWithContext = Pick<
+  AttachmentPickerContextValue,
+  'bottomInset' | 'selectedPicker'
 > &
-  Pick<AttachmentPickerContextValue, 'bottomInset' | 'bottomSheetRef' | 'selectedPicker'> &
   Pick<ChatContextValue, 'isOnline'> &
   Pick<ChannelContextValue, 'channel' | 'members' | 'threadList' | 'watchers'> &
   Pick<
@@ -130,9 +119,7 @@ type MessageInputPropsWithContext = Partial<
     | 'asyncMessagesMinimumPressDuration'
     | 'asyncMessagesSlideToCancelDistance'
     | 'asyncMessagesMultiSendEnabled'
-    | 'attachmentPickerBottomSheetHandleHeight'
     | 'attachmentPickerBottomSheetHeight'
-    | 'AttachmentPickerBottomSheetHandle'
     | 'AttachmentPickerSelectionBar'
     | 'attachmentSelectionBarHeight'
     | 'AudioRecorder'