Skip to content

Commit

Permalink
fix: resolve conflicts from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
khushal87 committed Dec 23, 2024
2 parents da1b5c3 + bf6ee2b commit 850b2da
Show file tree
Hide file tree
Showing 36 changed files with 2,091 additions and 916 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
[![Build Status](https://github.com/GetStream/stream-chat-react-native/actions/workflows/release.yml/badge.svg)](https://github.com/GetStream/stream-chat-react-native/actions)
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-453%20KB-blue)
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-456%20KB-blue)

<img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/[email protected]?auto=format,enhance" width="50%" />

Expand Down
4 changes: 2 additions & 2 deletions examples/SampleApp/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { ChannelPinnedMessagesScreen } from './src/screens/ChannelPinnedMessages
import { ChatScreen } from './src/screens/ChatScreen';
import { GroupChannelDetailsScreen } from './src/screens/GroupChannelDetailsScreen';
import { LoadingScreen } from './src/screens/LoadingScreen';
import { MenuDrawer } from './src/screens/MenuDrawer';
import { MenuDrawer } from './src/components/MenuDrawer';
import { NewDirectMessagingScreen } from './src/screens/NewDirectMessagingScreen';
import { NewGroupChannelAddMemberScreen } from './src/screens/NewGroupChannelAddMemberScreen';
import { NewGroupChannelAssignNameScreen } from './src/screens/NewGroupChannelAssignNameScreen';
Expand Down Expand Up @@ -183,7 +183,7 @@ const DrawerNavigatorWrapper: React.FC<{
enableOfflineSupport
// @ts-expect-error
ImageComponent={FastImage}
isMessageAIGenerated={(message: MessageType) => message.ai_generated}
isMessageAIGenerated={(message: MessageType) => !!message.ai_generated}
>
<AppOverlayProvider>
<UserSearchProvider>
Expand Down
9 changes: 9 additions & 0 deletions examples/SampleApp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

### [2.0.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v2.0.1) (2024-12-19)


### Bug Fixes

* image gallery safe area ([#2855](https://github.com/GetStream/stream-chat-react-native/issues/2855)) ([5825685](https://github.com/GetStream/stream-chat-react-native/commit/5825685179f7803007da5eac530e06caf513ec1f))
* ios push notifications on sample app ([#2856](https://github.com/GetStream/stream-chat-react-native/issues/2856)) ([d607132](https://github.com/GetStream/stream-chat-react-native/commit/d6071326903ec524914fb2a2319dda56ee9a9460))
* sample app ui bugs ([#2854](https://github.com/GetStream/stream-chat-react-native/issues/2854)) ([851237c](https://github.com/GetStream/stream-chat-react-native/commit/851237c5ba17789722a3898265ae8ef5566025b4))

## [2.0.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v2.0.0) (2024-12-12)


Expand Down
Loading

0 comments on commit 850b2da

Please sign in to comment.