chore: resolve conflicts from develop

GetStream · Dec 3, 2024 · 289331f · 289331f
2 parents a52b38b + 6d5a51b
commit 289331f
Show file tree

Hide file tree

Showing 20 changed files with 522 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -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-451%20KB-blue)
+![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-452%20KB-blue)
 
 <img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/[email protected]?auto=format,enhance" width="50%" />
 

diff --git a/examples/ExpoMessaging/yarn.lock b/examples/ExpoMessaging/yarn.lock
@@ -7521,10 +7521,10 @@ [email protected], stream-buffers@~2.2.0:
   version "0.0.0"
   uid ""
 
-[email protected].1:
-  version "5.43.1"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
-  integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
+[email protected].2:
+  version "5.43.2"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.2.tgz#b16add60d231509f864d7301ae281c4b4681ff7a"
+  integrity sha512-pdSaqw1aPHtxH0md7nnw/TLWPIqsb5TKFzGoWYd/cKRAw4pVDvxolSlha8vYSCwz7MmlarfsJPB0TlS9WcGsDQ==
   dependencies:
     "@gorhom/bottom-sheet" "^4.6.4"
     dayjs "1.10.5"

diff --git a/examples/SampleApp/CHANGELOG.md b/examples/SampleApp/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+### [1.32.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.2) (2024-11-28)
+
+### Workspaces
+
+- Following linked packages updated: [stream-chat-react-native]
+
 ### [1.32.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.1) (2024-11-22)
 
 ### Workspaces

diff --git a/examples/SampleApp/ios/Podfile.lock b/examples/SampleApp/ios/Podfile.lock
@@ -2489,7 +2489,7 @@ SPEC CHECKSUMS:
   FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d
   FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
   FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
-  fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
+  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
   GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a

diff --git a/examples/SampleApp/package.json b/examples/SampleApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sampleapp",
-  "version": "1.32.1",
+  "version": "1.32.2",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/examples/SampleApp/yarn.lock b/examples/SampleApp/yarn.lock
@@ -7364,10 +7364,10 @@ statuses@~1.5.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-[email protected].1:
-  version "5.43.1"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
-  integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
+[email protected].2:
+  version "5.43.2"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.2.tgz#b16add60d231509f864d7301ae281c4b4681ff7a"
+  integrity sha512-pdSaqw1aPHtxH0md7nnw/TLWPIqsb5TKFzGoWYd/cKRAw4pVDvxolSlha8vYSCwz7MmlarfsJPB0TlS9WcGsDQ==
   dependencies:
     "@gorhom/bottom-sheet" "^4.6.4"
     dayjs "1.10.5"

diff --git a/examples/TypeScriptMessaging/ios/Podfile.lock b/examples/TypeScriptMessaging/ios/Podfile.lock
@@ -1991,7 +1991,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - Yoga
   - SocketRocket (0.7.1)
-  - stream-chat-react-native (5.43.1):
+  - stream-chat-react-native (5.43.2):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2344,7 +2344,7 @@ SPEC CHECKSUMS:
   RNShare: 4305edead1b8f614ab994046c68193e8d50aaadc
   RNSVG: 536cd3c866c878faf72beaba166c8b02fe2b762b
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  stream-chat-react-native: 29e7961f8f0e5c8f80fcc421450122673d82d355
+  stream-chat-react-native: ad7a1338c67f023d3d7ebdfbdfb853376f1a36e3
   Yoga: db69236006b8b1c6d55ab453390c882306cbf219
 
 PODFILE CHECKSUM: 6b7a4b74915b42bfe4ffddaf67cbf5e7a2bfeab3

diff --git a/examples/TypeScriptMessaging/yarn.lock b/examples/TypeScriptMessaging/yarn.lock
diff --git a/package/CHANGELOG.md b/package/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+### [5.43.2](https://github.com/GetStream/stream-chat-react-native/compare/v5.43.1...v5.43.2) (2024-11-28)
+
+### Bug Fixes
+
+- 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))
+- 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))
+
 ### [5.43.1](https://github.com/GetStream/stream-chat-react-native/compare/v5.43.0...v5.43.1) (2024-11-22)
 
 ### Bug Fixes

diff --git a/package/expo-package/package.json b/package/expo-package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-expo",
   "description": "The official Expo SDK for Stream Chat, a service for building chat applications",
-  "version": "5.43.1",
+  "version": "5.43.2",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -10,7 +10,7 @@
   "main": "src/index.js",
   "types": "types/index.d.ts",
   "dependencies": {
-    "stream-chat-react-native-core": "5.43.1"
+    "stream-chat-react-native-core": "5.43.2"
   },
   "peerDependencies": {
     "expo": ">=51.0.0",

diff --git a/package/expo-package/yarn.lock b/package/expo-package/yarn.lock
@@ -5113,10 +5113,10 @@ [email protected], stream-buffers@~2.2.0:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
 
-[email protected].1:
-  version "5.43.1"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
-  integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
+[email protected].2:
+  version "5.43.2"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.2.tgz#b16add60d231509f864d7301ae281c4b4681ff7a"
+  integrity sha512-pdSaqw1aPHtxH0md7nnw/TLWPIqsb5TKFzGoWYd/cKRAw4pVDvxolSlha8vYSCwz7MmlarfsJPB0TlS9WcGsDQ==
   dependencies:
     "@gorhom/bottom-sheet" "^4.6.4"
     dayjs "1.10.5"

diff --git a/package/native-package/package.json b/package/native-package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native",
   "description": "The official React Native SDK for Stream Chat, a service for building chat applications",
-  "version": "5.43.1",
+  "version": "5.43.2",
   "homepage": "https://www.npmjs.com/package/stream-chat-react-native",
   "author": {
     "company": "Stream.io Inc",
@@ -20,7 +20,7 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "es6-symbol": "^3.1.3",
-    "stream-chat-react-native-core": "5.43.1"
+    "stream-chat-react-native-core": "5.43.2"
   },
   "peerDependencies": {
     "@react-native-camera-roll/camera-roll": ">=7.8.0",