fix: merge conflicts

Author: isekovanic

package/expo-package/yarn.lock

@@ -4782,9 +4782,9 @@ stream-buffers@2.2.x, stream-buffers@~2.2.0:
   version "0.0.0"
   uid ""
 
-"stream-chat@https://github.com/GetStream/stream-chat-js.git#6d936386dbf69e33b8e146e5e48c20a74482eb50":
+"stream-chat@https://github.com/GetStream/stream-chat-js.git#4ff638045e434cc091a1200ecff4749b428d6936":
   version "0.0.0-development"
-  resolved "https://github.com/GetStream/stream-chat-js.git#6d936386dbf69e33b8e146e5e48c20a74482eb50"
+  resolved "https://github.com/GetStream/stream-chat-js.git#4ff638045e434cc091a1200ecff4749b428d6936"
   dependencies:
     "@types/jsonwebtoken" "^9.0.8"
     "@types/ws" "^8.5.14"

package/native-package/yarn.lock

@@ -3498,9 +3498,9 @@ statuses@~1.5.0:
   version "0.0.0"
   uid ""
 
-"stream-chat@https://github.com/GetStream/stream-chat-js.git#6d936386dbf69e33b8e146e5e48c20a74482eb50":
+"stream-chat@https://github.com/GetStream/stream-chat-js.git#4ff638045e434cc091a1200ecff4749b428d6936":
   version "0.0.0-development"
-  resolved "https://github.com/GetStream/stream-chat-js.git#6d936386dbf69e33b8e146e5e48c20a74482eb50"
+  resolved "https://github.com/GetStream/stream-chat-js.git#4ff638045e434cc091a1200ecff4749b428d6936"
   dependencies:
     "@types/jsonwebtoken" "^9.0.8"
     "@types/ws" "^8.5.14"

package/package.json

@@ -77,7 +77,7 @@
     "path": "0.12.7",
     "react-native-markdown-package": "1.8.2",
     "react-native-url-polyfill": "^1.3.0",
-    "stream-chat": "https://github.com/GetStream/stream-chat-js.git#6d936386dbf69e33b8e146e5e48c20a74482eb50",
+    "stream-chat": "https://github.com/GetStream/stream-chat-js.git#4ff638045e434cc091a1200ecff4749b428d6936",
     "use-sync-external-store": "^1.4.0"
   },
   "peerDependencies": {