Skip to content

Commit ec958f3

Browse files
committed
Merge branch 'develop' into e2e-setup
2 parents 995cc65 + 584eb94 commit ec958f3

File tree

98 files changed

+8101
-6812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+8101
-6812
lines changed

.github/workflows/check-pr.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Check PR
1+
name: Lint & Unit Tests
22

33
on:
44
pull_request:
@@ -22,3 +22,5 @@ jobs:
2222
run: yarn --frozen-lockfile && yarn bootstrap-ci
2323
- name: Lint
2424
run: yarn lint
25+
- name: Test
26+
run: yarn test:unit

RELEASE_PROCESS.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ Please follow [the spec](https://www.conventionalcommits.org/en/v1.0.0-beta.4/#c
1717

1818
Please have in mind that the only line you have to add is the selected one. Github already takes care of adding the PR title to the body of the merge commit.
1919

20+
## Reverting a release
21+
22+
If you've released something you were not supposed to and want to remove that release from npm, remove the git tag and then rollback the changes, you have a few options:
23+
24+
### Reset master branch
25+
26+
Cleanest way is to just reset the master branch and remove the last few commits, so the ideal is just do reset and force-push.
27+
28+
### Revert unwanted commits
29+
30+
If you want some of the newest commits but want to remove older ones you can just revert the commit with `git revert MERGE_PR_COMMIT_HASH`. Please have in mind that in case your merge commit contains a commit with a breaking change flag, you need to revert that commit BEFORE reverting the PR merge commit.
31+
2032
## Git flow
2133

2234
### develop & next tags

docusaurus/docs/reactnative/basics/hello_stream_chat.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ export const App = () => {
425425
<OverlayProvider>
426426
<Chat client={client}>
427427
{channel ? (
428-
<Channel channel={channel} keyboardVerticalOffset={0} thread={thread} threadList={!!thread}>
428+
<Channel channel={channel} keyboardVerticalOffset={0} thread={thread}>
429429
{thread ? (
430430
<Thread />
431431
) : (
@@ -540,7 +540,7 @@ export const App = () => {
540540
<View style={{ flex: 1 }}>
541541
<Chat client={client}>
542542
{channel ? (
543-
<Channel channel={channel} keyboardVerticalOffset={60} thread={thread} threadList={!!thread}>
543+
<Channel channel={channel} keyboardVerticalOffset={60} thread={thread}>
544544
{thread ? (
545545
<Thread />
546546
) : (

docusaurus/docs/reactnative/basics/stream_chat_with_navigation.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ export const ThreadScreen = () => {
242242
const { setThread, thread } = useAppThread();
243243
244244
return (
245-
<Channel channel={channel} thread={thread} threadList>
245+
<Channel channel={channel} thread={thread}>
246246
<Thread onThreadDismount={() => setThread(undefined)} />
247247
</Channel>
248248
);

docusaurus/docs/reactnative/basics/translations.mdx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ At the moment we support the following languages (and more will be added in the
1515
- [Dutch (nl)](https://github.com/GetStream/stream-chat-react-native/blob/develop/package/src/i18n/nl.json)
1616
- [Turkish (tr)](https://github.com/GetStream/stream-chat-react-native/blob/develop/package/src/i18n/tr.json)
1717
- [Russian (ru)](https://github.com/GetStream/stream-chat-react-native/blob/develop/package/src/i18n/ru.json)
18+
- [Japanese (ja)](https://github.com/GetStream/stream-chat-react-native/blob/develop/package/src/i18n/ja.json)
19+
- [Korean (ko)](https://github.com/GetStream/stream-chat-react-native/blob/develop/package/src/i18n/ko.json)
1820

1921
## Usage
2022

@@ -36,7 +38,7 @@ Two components require your custom instance of `Streami18n` to properly pass you
3638
Both components accept an instance of `Streami18n` via the prop `i18nInstance`.
3739
Providing this prop will provide your instance of `Streami18n` to all of the components via [`context`](https://reactjs.org/docs/context.html) instead of the default instance.
3840

39-
```tsx {5,8}
41+
```tsx {5,8-9}
4042
import { StreamChat } from 'stream-chat';
4143
import { Chat, OverlayProvider, Streami18n } from 'stream-chat-react-native';
4244

@@ -255,6 +257,8 @@ The following options are available:
255257
- Dutch (`nl`)
256258
- Turkish (`tr`)
257259
- Russian (`ru`)
260+
- Japanese (`ja`)
261+
- Korean (`ko`)
258262

259263
| TYPE | DEFAULT |
260264
| - | - |

docusaurus/docs/reactnative/basics/troubleshooting.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ We suggest you keep track of a `thread` state on your own and provide it to any
3030

3131
```tsx {2}
3232
<Chat client={chatClient} i18nInstance={streami18n}>
33-
<Channel channel={channel} thread={thread} threadList>
33+
<Channel channel={channel} thread={thread}>
3434
<Thread onThreadDismount={() => setThread(null)} />
3535
</Channel>
3636
</Chat>
@@ -73,7 +73,7 @@ To do this make sure your `Channel` components are always aware of the thread st
7373
```
7474

7575
```tsx
76-
<Channel channel={channel} thread={thread} threadList>
76+
<Channel channel={channel} thread={thread}>
7777
<Thread onThreadDismount={() => setThread(null)} />
7878
</Channel>
7979
```

docusaurus/docs/reactnative/common-content/core-components/channel/props/thread_list.mdx

Lines changed: 0 additions & 6 deletions
This file was deleted.

docusaurus/docs/reactnative/core-components/channel.mdx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ import SendButton from '../common-content/core-components/channel/props/send_but
113113
import ShowThreadMessageInChannelButton from '../common-content/core-components/channel/props/show_thread_message_in_channel_button.mdx'
114114
import SupportedReactions from '../common-content/core-components/channel/props/supported_reactions.mdx';
115115
import Thread from '../common-content/core-components/channel/props/thread.mdx'
116-
import ThreadList from '../common-content/core-components/channel/props/thread_list.mdx';
117116
import ThreadRepliesEnabled from '../common-content/core-components/channel/props/thread_replies_enabled.mdx'
118117
import ThreadReply from '../common-content/core-components/channel/props/thread_reply.mdx';
119118
import TypingEventsEnabled from '../common-content/core-components/channel/props/typing_events_enabled.mdx'
@@ -678,10 +677,6 @@ Callback function to set the [ref](https://reactjs.org/docs/refs-and-the-dom.htm
678677

679678
<Thread />
680679

681-
### threadList
682-
683-
<ThreadList />
684-
685680
### threadReply
686681

687682
<ThreadReply />

docusaurus/docs/reactnative/ui-components/thread.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Component to render thread replies for a message, along with and input box for a
1818
```tsx
1919
<OverlayProvider>
2020
<Chat client={client}>
21-
<Channel channel={channel} thread={messageId} threadList>
21+
<Channel channel={channel} thread={messageId}>
2222
<Thread />
2323
</Channel>
2424
</Chat>

examples/ExpoMessaging/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const ThreadScreen = () => {
105105
return (
106106
<SafeAreaView>
107107
<Chat client={chatClient} i18nInstance={streami18n}>
108-
<Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread} threadList>
108+
<Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread}>
109109
<View
110110
style={{
111111
flex: 1,

0 commit comments

Comments
 (0)