Skip to content

Commit 289331f

Browse files
committed
chore: resolve conflicts from develop
2 parents a52b38b + 6d5a51b commit 289331f

File tree

20 files changed

+522
-40
lines changed

20 files changed

+522
-40
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
1111
[![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)
1212
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
13-
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-451%20KB-blue)
13+
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-452%20KB-blue)
1414

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

examples/ExpoMessaging/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7521,10 +7521,10 @@ [email protected], stream-buffers@~2.2.0:
75217521
version "0.0.0"
75227522
uid ""
75237523

7524-
7525-
version "5.43.1"
7526-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
7527-
integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
7524+
7525+
version "5.43.2"
7526+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.2.tgz#b16add60d231509f864d7301ae281c4b4681ff7a"
7527+
integrity sha512-pdSaqw1aPHtxH0md7nnw/TLWPIqsb5TKFzGoWYd/cKRAw4pVDvxolSlha8vYSCwz7MmlarfsJPB0TlS9WcGsDQ==
75287528
dependencies:
75297529
"@gorhom/bottom-sheet" "^4.6.4"
75307530
dayjs "1.10.5"

examples/SampleApp/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
### [1.32.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.2) (2024-11-28)
4+
5+
### Workspaces
6+
7+
- Following linked packages updated: [stream-chat-react-native]
8+
39
### [1.32.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.1) (2024-11-22)
410

511
### Workspaces

examples/SampleApp/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2489,7 +2489,7 @@ SPEC CHECKSUMS:
24892489
FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d
24902490
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
24912491
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
2492-
fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
2492+
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
24932493
glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
24942494
GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
24952495
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a

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.32.1",
3+
"version": "1.32.2",
44
"private": true,
55
"repository": {
66
"type": "git",

examples/SampleApp/yarn.lock

Lines changed: 4 additions & 4 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-
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==
7367+
7368+
version "5.43.2"
7369+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.2.tgz#b16add60d231509f864d7301ae281c4b4681ff7a"
7370+
integrity sha512-pdSaqw1aPHtxH0md7nnw/TLWPIqsb5TKFzGoWYd/cKRAw4pVDvxolSlha8vYSCwz7MmlarfsJPB0TlS9WcGsDQ==
73717371
dependencies:
73727372
"@gorhom/bottom-sheet" "^4.6.4"
73737373
dayjs "1.10.5"

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.43.1):
1994+
- stream-chat-react-native (5.43.2):
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: 29e7961f8f0e5c8f80fcc421450122673d82d355
2347+
stream-chat-react-native: ad7a1338c67f023d3d7ebdfbdfb853376f1a36e3
23482348
Yoga: db69236006b8b1c6d55ab453390c882306cbf219
23492349

23502350
PODFILE CHECKSUM: 6b7a4b74915b42bfe4ffddaf67cbf5e7a2bfeab3

examples/TypeScriptMessaging/yarn.lock

Lines changed: 240 additions & 8 deletions
Large diffs are not rendered by default.

package/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
### [5.43.2](https://github.com/GetStream/stream-chat-react-native/compare/v5.43.1...v5.43.2) (2024-11-28)
4+
5+
### Bug Fixes
6+
7+
- add safeguard for querying app settings ([#2765](https://github.com/GetStream/stream-chat-react-native/issues/2765)) ([f26e974](https://github.com/GetStream/stream-chat-react-native/commit/f26e9742ddf0243b973544d60c9569998ebf11ca))
8+
- show user reactions in threads ([#2814](https://github.com/GetStream/stream-chat-react-native/issues/2814)) ([837c2d2](https://github.com/GetStream/stream-chat-react-native/commit/837c2d234a56c813359486acdbeffa371be67d8e))
9+
310
### [5.43.1](https://github.com/GetStream/stream-chat-react-native/compare/v5.43.0...v5.43.1) (2024-11-22)
411

512
### Bug Fixes

package/expo-package/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "stream-chat-expo",
33
"description": "The official Expo SDK for Stream Chat, a service for building chat applications",
4-
"version": "5.43.1",
4+
"version": "5.43.2",
55
"author": {
66
"company": "Stream.io Inc",
77
"name": "Stream.io Inc"
@@ -10,7 +10,7 @@
1010
"main": "src/index.js",
1111
"types": "types/index.d.ts",
1212
"dependencies": {
13-
"stream-chat-react-native-core": "5.43.1"
13+
"stream-chat-react-native-core": "5.43.2"
1414
},
1515
"peerDependencies": {
1616
"expo": ">=51.0.0",

0 commit comments

Comments
 (0)