chore: resolve conflicts from develop on v6

examples/ExpoMessaging/yarn.lock

@@ -7513,10 +7513,10 @@ [email protected], stream-buffers@~2.2.0:
   version "0.0.0"
   uid ""
 
-stream-chat-react-native-core@5.41.4:
-  version "5.41.4"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.4.tgz#55104e1eb10f464b27d82b9566a18005723ea26d"
-  integrity sha512-Fe2AnbfZ98nRfP5BwMOwR2iae/hT8N5oEiYOb2FwbgtJqot4UFABZDCxMVcoYcFouOK1gc5BkTjdnXYYm/L8EQ==
+stream-chat-react-native-core@5.43.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==
   dependencies:
     "@gorhom/bottom-sheet" "^4.6.4"
     dayjs "1.10.5"
@@ -7529,27 +7529,12 @@ [email protected]:
     path "0.12.7"
     react-native-markdown-package "1.8.2"
     react-native-url-polyfill "^1.3.0"
-    stream-chat "8.42.0"
+    stream-chat "8.45.1"
 
 "stream-chat-react-native-core@link:../../package":
   version "0.0.0"
   uid ""
 
-[email protected]:
-  version "8.42.0"
-  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
-  integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
-  dependencies:
-    "@babel/runtime" "^7.16.3"
-    "@types/jsonwebtoken" "~9.0.0"
-    "@types/ws" "^7.4.0"
-    axios "^1.6.0"
-    base64-js "^1.5.1"
-    form-data "^4.0.0"
-    isomorphic-ws "^4.0.1"
-    jsonwebtoken "~9.0.0"
-    ws "^7.5.10"
-
 [email protected]:
   version "8.45.1"
   resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"

examples/SampleApp/CHANGELOG.md

@@ -1,85 +1,108 @@
 # Change Log
 
-### [1.31.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.5) (2024-11-08)
+### [1.32.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.1) (2024-11-22)
+
+### Workspaces
 
+- Following linked packages updated: [stream-chat-react-native]
+
+## [1.32.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.0) (2024-11-20)
+
+### Features
+
+- 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))
+- 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))
 
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
-### [1.31.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].3[email protected].4) (2024-11-07)
+### [1.31.8](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].7[email protected].8) (2024-11-19)
 
+### Workspaces
+
+- Following linked packages updated: [stream-chat-react-native]
+
+### [1.31.7](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.7) (2024-11-15)
 
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
-### [1.31.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.3) (2024-11-04)
+### [1.31.6](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.6) (2024-11-14)
+
+### Workspaces
+
+- Following linked packages updated: [stream-chat-react-native]
 
+### [1.31.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.5) (2024-11-08)
 
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
+
+### [1.31.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.4) (2024-11-07)
 
-### [1.31.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.2) (2024-11-01)
+### Workspaces
+
+- Following linked packages updated: [stream-chat-react-native]
 
+### [1.31.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.3) (2024-11-04)
 
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
-### [1.31.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].0[email protected].1) (2024-10-31)
+### [1.31.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].1[email protected].2) (2024-11-01)
 
+### Workspaces
+
+- Following linked packages updated: [stream-chat-react-native]
+
+### [1.31.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.1) (2024-10-31)
 
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
 ## [1.31.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.0) (2024-10-31)
 
-
 ### Features
 
-* polls implementation ([#2719](https://github.com/GetStream/stream-chat-react-native/issues/2719)) ([c770854](https://github.com/GetStream/stream-chat-react-native/commit/c7708544d49e27dab4a2fee08c235fb39afd2178))
-
+- polls implementation ([#2719](https://github.com/GetStream/stream-chat-react-native/issues/2719)) ([c770854](https://github.com/GetStream/stream-chat-react-native/commit/c7708544d49e27dab4a2fee08c235fb39afd2178))
 
 ### Bug Fixes
 
-* 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))
-* 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))
-
+- 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))
+- 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))
 
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
 ### [1.30.6](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.6) (2024-10-28)
 
-
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
 ### [1.30.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.5) (2024-10-24)
 
-
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
 ### [1.30.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.4) (2024-10-21)
 
-
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
 ### [1.30.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.3) (2024-10-15)
 
-
 ### Workspaces
 
-* Following linked packages updated: [stream-chat-react-native]
+- Following linked packages updated: [stream-chat-react-native]
 
 ### [1.30.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.2) (2024-10-14)
 

examples/SampleApp/ios/Podfile.lock

@@ -2166,7 +2166,7 @@ PODS:
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.10)
   - SocketRocket (0.7.1)
-  - stream-chat-react-native (5.41.4):
+  - stream-chat-react-native (5.43.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2578,7 +2578,7 @@ SPEC CHECKSUMS:
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  stream-chat-react-native: 5f358230d87074128d47ea6bee43ef6a81720186
+  stream-chat-react-native: 98ee8e5faacce9bbdcbf8579802c6d04897e48d0
   Yoga: 83048fe4b4ce15018a5e9ccbf0b06bd76fc643d4
 
 PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d

examples/SampleApp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sampleapp",
-  "version": "1.31.5",
+  "version": "1.32.1",
   "private": true,
   "repository": {
     "type": "git",

examples/SampleApp/src/components/NewDirectMessagingSendButton.tsx

@@ -51,9 +51,7 @@ const SendButtonWithContext = <
   );
 };
 
-const areEqual = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
+const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
   prevProps: NewDirectMessagingSendButtonPropsWithContext<StreamChatGenerics>,
   nextProps: NewDirectMessagingSendButtonPropsWithContext<StreamChatGenerics>,
 ) => {

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==
 
-stream-chat-react-native-core@5.41.4:
-  version "5.41.4"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.4.tgz#55104e1eb10f464b27d82b9566a18005723ea26d"
-  integrity sha512-Fe2AnbfZ98nRfP5BwMOwR2iae/hT8N5oEiYOb2FwbgtJqot4UFABZDCxMVcoYcFouOK1gc5BkTjdnXYYm/L8EQ==
+stream-chat-react-native-core@5.43.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==
   dependencies:
     "@gorhom/bottom-sheet" "^4.6.4"
     dayjs "1.10.5"
@@ -7380,7 +7380,7 @@ [email protected]:
     path "0.12.7"
     react-native-markdown-package "1.8.2"
     react-native-url-polyfill "^1.3.0"
-    stream-chat "8.42.0"
+    stream-chat "8.45.1"
 
 "stream-chat-react-native-core@link:../../package":
   version "0.0.0"
@@ -7390,10 +7390,10 @@ [email protected]:
   version "0.0.0"
   uid ""
 
-stream-chat@8.42.0:
-  version "8.42.0"
-  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
-  integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
+stream-chat@8.45.1:
+  version "8.45.1"
+  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"
+  integrity sha512-7OMpL2RHUd+PXSWzhTUAIjjXlI9Oqc4HhUBRfc5i6dK+Ug9S5ertb7RvyzGL5N4ITpq/6ZUAwXtTqRaN9+UUkw==
   dependencies:
     "@babel/runtime" "^7.16.3"
     "@types/jsonwebtoken" "~9.0.0"

examples/TypeScriptMessaging/ios/Podfile.lock

@@ -1991,7 +1991,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - Yoga
   - SocketRocket (0.7.1)
-  - stream-chat-react-native (5.41.4):
+  - stream-chat-react-native (5.43.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2344,7 +2344,7 @@ SPEC CHECKSUMS:
   RNShare: 4305edead1b8f614ab994046c68193e8d50aaadc
   RNSVG: 536cd3c866c878faf72beaba166c8b02fe2b762b
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  stream-chat-react-native: 3dd1b4ffe7aa3dba15f4f7ed23c19712b25ad230
+  stream-chat-react-native: 29e7961f8f0e5c8f80fcc421450122673d82d355
   Yoga: db69236006b8b1c6d55ab453390c882306cbf219
 
 PODFILE CHECKSUM: 6b7a4b74915b42bfe4ffddaf67cbf5e7a2bfeab3

examples/TypeScriptMessaging/yarn.lock

@@ -6815,10 +6815,10 @@ statuses@~1.5.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-stream-chat-react-native-core@5.41.4:
-  version "5.41.4"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.4.tgz#55104e1eb10f464b27d82b9566a18005723ea26d"
-  integrity sha512-Fe2AnbfZ98nRfP5BwMOwR2iae/hT8N5oEiYOb2FwbgtJqot4UFABZDCxMVcoYcFouOK1gc5BkTjdnXYYm/L8EQ==
+stream-chat-react-native-core@5.43.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==
   dependencies:
     "@gorhom/bottom-sheet" "^4.6.4"
     dayjs "1.10.5"
@@ -6831,7 +6831,7 @@ [email protected]:
     path "0.12.7"
     react-native-markdown-package "1.8.2"
     react-native-url-polyfill "^1.3.0"
-    stream-chat "8.42.0"
+    stream-chat "8.45.1"
 
 "stream-chat-react-native-core@link:../../package":
   version "0.0.0"
@@ -6841,10 +6841,10 @@ [email protected]:
   version "0.0.0"
   uid ""
 
-stream-chat@8.42.0:
-  version "8.42.0"
-  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
-  integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
+stream-chat@8.45.1:
+  version "8.45.1"
+  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"
+  integrity sha512-7OMpL2RHUd+PXSWzhTUAIjjXlI9Oqc4HhUBRfc5i6dK+Ug9S5ertb7RvyzGL5N4ITpq/6ZUAwXtTqRaN9+UUkw==
   dependencies:
     "@babel/runtime" "^7.16.3"
     "@types/jsonwebtoken" "~9.0.0"