Skip to content

Commit 44025e4

Browse files
khushal87isekovanicsemantic-release-bot
authored
chore: resolve conflicts from develop on v6 (#2813)
* chore(release): 5.42.0 [skip ci] * chore(release): 1.31.6 [skip ci] * fix: android modal size (#2784) * fix: backport crash fix (#2787) * fix: crash in some instances of useIsChannelMuted hook invocation * fix: properly use hook in channel preview * fix: edge cases and test * chore(release): 5.42.1 [skip ci] * chore(release): 1.31.7 [skip ci] * fix: recursion depth on regex parse issue (#2790) * fix: channel hook regressions * fix: expo media library permissions race conditions * fix: listen to correct channel read events * chore(release): 5.42.2 [skip ci] * chore(release): 1.31.8 [skip ci] * feat: moderation v2 support (#2801) * feat: enable moderation v2 on the sdk and sample apps * chore: update yarn.lock files as well * feat: add support for membership customization (#2802) * feat: add support for membership customization * fix: lint issues * chore(release): 5.43.0 [skip ci] * chore(release): 1.32.0 [skip ci] * fix: channel.state break on going to background (#2809) * chore(release): 5.43.1 [skip ci] * chore(release): 1.32.1 [skip ci] * chore: resolve conflicts from develop on v6 --------- Co-authored-by: Ivan Sekovanikj <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Ivan Sekovanikj <[email protected]>
1 parent 6201f33 commit 44025e4

File tree

15 files changed

+158
-122
lines changed

15 files changed

+158
-122
lines changed

‎examples/ExpoMessaging/yarn.lock‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7513,10 +7513,10 @@ [email protected], stream-buffers@~2.2.0:
75137513
version "0.0.0"
75147514
uid ""
75157515

7516-
stream-chat-react-native-core@5.41.4:
7517-
version "5.41.4"
7518-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.4.tgz#55104e1eb10f464b27d82b9566a18005723ea26d"
7519-
integrity sha512-Fe2AnbfZ98nRfP5BwMOwR2iae/hT8N5oEiYOb2FwbgtJqot4UFABZDCxMVcoYcFouOK1gc5BkTjdnXYYm/L8EQ==
7516+
stream-chat-react-native-core@5.43.1:
7517+
version "5.43.1"
7518+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
7519+
integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
75207520
dependencies:
75217521
"@gorhom/bottom-sheet" "^4.6.4"
75227522
dayjs "1.10.5"
@@ -7529,27 +7529,12 @@ [email protected]:
75297529
path "0.12.7"
75307530
react-native-markdown-package "1.8.2"
75317531
react-native-url-polyfill "^1.3.0"
7532-
stream-chat "8.42.0"
7532+
stream-chat "8.45.1"
75337533

75347534
"stream-chat-react-native-core@link:../../package":
75357535
version "0.0.0"
75367536
uid ""
75377537

7538-
[email protected]:
7539-
version "8.42.0"
7540-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
7541-
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
7542-
dependencies:
7543-
"@babel/runtime" "^7.16.3"
7544-
"@types/jsonwebtoken" "~9.0.0"
7545-
"@types/ws" "^7.4.0"
7546-
axios "^1.6.0"
7547-
base64-js "^1.5.1"
7548-
form-data "^4.0.0"
7549-
isomorphic-ws "^4.0.1"
7550-
jsonwebtoken "~9.0.0"
7551-
ws "^7.5.10"
7552-
75537538
[email protected]:
75547539
version "8.45.1"
75557540
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"

‎examples/SampleApp/CHANGELOG.md‎

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,108 @@
11
# Change Log
22

3-
### [1.31.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.5) (2024-11-08)
3+
### [1.32.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.1) (2024-11-22)
4+
5+
### Workspaces
46

7+
- Following linked packages updated: [stream-chat-react-native]
8+
9+
## [1.32.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.0) (2024-11-20)
10+
11+
### Features
12+
13+
- add support for membership customization ([#2802](https://github.com/GetStream/stream-chat-react-native/issues/2802)) ([376ac7d](https://github.com/GetStream/stream-chat-react-native/commit/376ac7d5bd5a5c34080b2272601300633b3412f1))
14+
- moderation v2 support ([#2801](https://github.com/GetStream/stream-chat-react-native/issues/2801)) ([9c55bd5](https://github.com/GetStream/stream-chat-react-native/commit/9c55bd543215a6c615b3e088238154bba34a958f))
515

616
### Workspaces
717

8-
* Following linked packages updated: [stream-chat-react-native]
18+
- Following linked packages updated: [stream-chat-react-native]
919

10-
### [1.31.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].3[email protected].4) (2024-11-07)
20+
### [1.31.8](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].7[email protected].8) (2024-11-19)
1121

22+
### Workspaces
23+
24+
- Following linked packages updated: [stream-chat-react-native]
25+
26+
### [1.31.7](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.7) (2024-11-15)
1227

1328
### Workspaces
1429

15-
* Following linked packages updated: [stream-chat-react-native]
30+
- Following linked packages updated: [stream-chat-react-native]
1631

17-
### [1.31.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.3) (2024-11-04)
32+
### [1.31.6](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.6) (2024-11-14)
33+
34+
### Workspaces
35+
36+
- Following linked packages updated: [stream-chat-react-native]
1837

38+
### [1.31.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.5) (2024-11-08)
1939

2040
### Workspaces
2141

22-
* Following linked packages updated: [stream-chat-react-native]
42+
- Following linked packages updated: [stream-chat-react-native]
43+
44+
### [1.31.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.4) (2024-11-07)
2345

24-
### [1.31.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.2) (2024-11-01)
46+
### Workspaces
47+
48+
- Following linked packages updated: [stream-chat-react-native]
2549

50+
### [1.31.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.3) (2024-11-04)
2651

2752
### Workspaces
2853

29-
* Following linked packages updated: [stream-chat-react-native]
54+
- Following linked packages updated: [stream-chat-react-native]
3055

31-
### [1.31.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].0[email protected].1) (2024-10-31)
56+
### [1.31.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].1[email protected].2) (2024-11-01)
3257

58+
### Workspaces
59+
60+
- Following linked packages updated: [stream-chat-react-native]
61+
62+
### [1.31.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.1) (2024-10-31)
3363

3464
### Workspaces
3565

36-
* Following linked packages updated: [stream-chat-react-native]
66+
- Following linked packages updated: [stream-chat-react-native]
3767

3868
## [1.31.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.0) (2024-10-31)
3969

40-
4170
### Features
4271

43-
* polls implementation ([#2719](https://github.com/GetStream/stream-chat-react-native/issues/2719)) ([c770854](https://github.com/GetStream/stream-chat-react-native/commit/c7708544d49e27dab4a2fee08c235fb39afd2178))
44-
72+
- polls implementation ([#2719](https://github.com/GetStream/stream-chat-react-native/issues/2719)) ([c770854](https://github.com/GetStream/stream-chat-react-native/commit/c7708544d49e27dab4a2fee08c235fb39afd2178))
4573

4674
### Bug Fixes
4775

48-
* bump sample apps and store issues ([#2735](https://github.com/GetStream/stream-chat-react-native/issues/2735)) ([424aefb](https://github.com/GetStream/stream-chat-react-native/commit/424aefba4b90b2de8c5bff59e52c0e9aaa580d09))
49-
* remove macos deployment destination ([#2736](https://github.com/GetStream/stream-chat-react-native/issues/2736)) ([e81c6bc](https://github.com/GetStream/stream-chat-react-native/commit/e81c6bc9a0e5734e7af02d59f8d644e7dbde36cb))
50-
76+
- bump sample apps and store issues ([#2735](https://github.com/GetStream/stream-chat-react-native/issues/2735)) ([424aefb](https://github.com/GetStream/stream-chat-react-native/commit/424aefba4b90b2de8c5bff59e52c0e9aaa580d09))
77+
- remove macos deployment destination ([#2736](https://github.com/GetStream/stream-chat-react-native/issues/2736)) ([e81c6bc](https://github.com/GetStream/stream-chat-react-native/commit/e81c6bc9a0e5734e7af02d59f8d644e7dbde36cb))
5178

5279
### Workspaces
5380

54-
* Following linked packages updated: [stream-chat-react-native]
81+
- Following linked packages updated: [stream-chat-react-native]
5582

5683
### [1.30.6](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.6) (2024-10-28)
5784

58-
5985
### Workspaces
6086

61-
* Following linked packages updated: [stream-chat-react-native]
87+
- Following linked packages updated: [stream-chat-react-native]
6288

6389
### [1.30.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.5) (2024-10-24)
6490

65-
6691
### Workspaces
6792

68-
* Following linked packages updated: [stream-chat-react-native]
93+
- Following linked packages updated: [stream-chat-react-native]
6994

7095
### [1.30.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.4) (2024-10-21)
7196

72-
7397
### Workspaces
7498

75-
* Following linked packages updated: [stream-chat-react-native]
99+
- Following linked packages updated: [stream-chat-react-native]
76100

77101
### [1.30.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.3) (2024-10-15)
78102

79-
80103
### Workspaces
81104

82-
* Following linked packages updated: [stream-chat-react-native]
105+
- Following linked packages updated: [stream-chat-react-native]
83106

84107
### [1.30.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.2) (2024-10-14)
85108

‎examples/SampleApp/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2166,7 +2166,7 @@ PODS:
21662166
- libwebp (~> 1.0)
21672167
- SDWebImage/Core (~> 5.10)
21682168
- SocketRocket (0.7.1)
2169-
- stream-chat-react-native (5.41.4):
2169+
- stream-chat-react-native (5.43.1):
21702170
- DoubleConversion
21712171
- glog
21722172
- hermes-engine
@@ -2578,7 +2578,7 @@ SPEC CHECKSUMS:
25782578
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
25792579
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
25802580
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2581-
stream-chat-react-native: 5f358230d87074128d47ea6bee43ef6a81720186
2581+
stream-chat-react-native: 98ee8e5faacce9bbdcbf8579802c6d04897e48d0
25822582
Yoga: 83048fe4b4ce15018a5e9ccbf0b06bd76fc643d4
25832583

25842584
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d

‎examples/SampleApp/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sampleapp",
3-
"version": "1.31.5",
3+
"version": "1.32.1",
44
"private": true,
55
"repository": {
66
"type": "git",

‎examples/SampleApp/src/components/NewDirectMessagingSendButton.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ const SendButtonWithContext = <
5151
);
5252
};
5353

54-
const areEqual = <
55-
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
56-
>(
54+
const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
5755
prevProps: NewDirectMessagingSendButtonPropsWithContext<StreamChatGenerics>,
5856
nextProps: NewDirectMessagingSendButtonPropsWithContext<StreamChatGenerics>,
5957
) => {

‎examples/SampleApp/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7364,10 +7364,10 @@ statuses@~1.5.0:
73647364
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
73657365
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
73667366

7367-
stream-chat-react-native-core@5.41.4:
7368-
version "5.41.4"
7369-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.4.tgz#55104e1eb10f464b27d82b9566a18005723ea26d"
7370-
integrity sha512-Fe2AnbfZ98nRfP5BwMOwR2iae/hT8N5oEiYOb2FwbgtJqot4UFABZDCxMVcoYcFouOK1gc5BkTjdnXYYm/L8EQ==
7367+
stream-chat-react-native-core@5.43.1:
7368+
version "5.43.1"
7369+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
7370+
integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
73717371
dependencies:
73727372
"@gorhom/bottom-sheet" "^4.6.4"
73737373
dayjs "1.10.5"
@@ -7380,7 +7380,7 @@ [email protected]:
73807380
path "0.12.7"
73817381
react-native-markdown-package "1.8.2"
73827382
react-native-url-polyfill "^1.3.0"
7383-
stream-chat "8.42.0"
7383+
stream-chat "8.45.1"
73847384

73857385
"stream-chat-react-native-core@link:../../package":
73867386
version "0.0.0"
@@ -7390,10 +7390,10 @@ [email protected]:
73907390
version "0.0.0"
73917391
uid ""
73927392

7393-
stream-chat@8.42.0:
7394-
version "8.42.0"
7395-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
7396-
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
7393+
stream-chat@8.45.1:
7394+
version "8.45.1"
7395+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"
7396+
integrity sha512-7OMpL2RHUd+PXSWzhTUAIjjXlI9Oqc4HhUBRfc5i6dK+Ug9S5ertb7RvyzGL5N4ITpq/6ZUAwXtTqRaN9+UUkw==
73977397
dependencies:
73987398
"@babel/runtime" "^7.16.3"
73997399
"@types/jsonwebtoken" "~9.0.0"

‎examples/TypeScriptMessaging/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,7 +1991,7 @@ PODS:
19911991
- ReactCommon/turbomodule/core
19921992
- Yoga
19931993
- SocketRocket (0.7.1)
1994-
- stream-chat-react-native (5.41.4):
1994+
- stream-chat-react-native (5.43.1):
19951995
- DoubleConversion
19961996
- glog
19971997
- hermes-engine
@@ -2344,7 +2344,7 @@ SPEC CHECKSUMS:
23442344
RNShare: 4305edead1b8f614ab994046c68193e8d50aaadc
23452345
RNSVG: 536cd3c866c878faf72beaba166c8b02fe2b762b
23462346
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2347-
stream-chat-react-native: 3dd1b4ffe7aa3dba15f4f7ed23c19712b25ad230
2347+
stream-chat-react-native: 29e7961f8f0e5c8f80fcc421450122673d82d355
23482348
Yoga: db69236006b8b1c6d55ab453390c882306cbf219
23492349

23502350
PODFILE CHECKSUM: 6b7a4b74915b42bfe4ffddaf67cbf5e7a2bfeab3

‎examples/TypeScriptMessaging/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6815,10 +6815,10 @@ statuses@~1.5.0:
68156815
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
68166816
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
68176817

6818-
stream-chat-react-native-core@5.41.4:
6819-
version "5.41.4"
6820-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.4.tgz#55104e1eb10f464b27d82b9566a18005723ea26d"
6821-
integrity sha512-Fe2AnbfZ98nRfP5BwMOwR2iae/hT8N5oEiYOb2FwbgtJqot4UFABZDCxMVcoYcFouOK1gc5BkTjdnXYYm/L8EQ==
6818+
stream-chat-react-native-core@5.43.1:
6819+
version "5.43.1"
6820+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
6821+
integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
68226822
dependencies:
68236823
"@gorhom/bottom-sheet" "^4.6.4"
68246824
dayjs "1.10.5"
@@ -6831,7 +6831,7 @@ [email protected]:
68316831
path "0.12.7"
68326832
react-native-markdown-package "1.8.2"
68336833
react-native-url-polyfill "^1.3.0"
6834-
stream-chat "8.42.0"
6834+
stream-chat "8.45.1"
68356835

68366836
"stream-chat-react-native-core@link:../../package":
68376837
version "0.0.0"
@@ -6841,10 +6841,10 @@ [email protected]:
68416841
version "0.0.0"
68426842
uid ""
68436843

6844-
stream-chat@8.42.0:
6845-
version "8.42.0"
6846-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
6847-
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
6844+
stream-chat@8.45.1:
6845+
version "8.45.1"
6846+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"
6847+
integrity sha512-7OMpL2RHUd+PXSWzhTUAIjjXlI9Oqc4HhUBRfc5i6dK+Ug9S5ertb7RvyzGL5N4ITpq/6ZUAwXtTqRaN9+UUkw==
68486848
dependencies:
68496849
"@babel/runtime" "^7.16.3"
68506850
"@types/jsonwebtoken" "~9.0.0"

0 commit comments

Comments
 (0)