Skip to content

Commit 36f2fe1

Browse files
khushal87khushal87
committed
chore: resolve conflicts from develop
2 parents de27078 + 0b9f18a commit 36f2fe1

File tree

92 files changed

+555
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+555
-201
lines changed

‎.github/workflows/sample-distribution.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
paths:
1010
- '.github/workflows/sample-distribution.yml'
1111
- 'package/**'
12-
- 'packages/examples/SampleApp/**'
12+
- 'examples/SampleApp/**'
1313

1414
jobs:
1515
build_and_deploy_ios_testflight_qa:

‎.prettierignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
**/dist/
44
**/.expo/
55
**/vendor/
6-
*.md
7-
*.mdx
86
package/src/components/docs/
9-
package/lib/
10-
docusaurus/
7+
package/lib/

‎examples/ExpoMessaging/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7469,10 +7469,10 @@ [email protected], stream-buffers@~2.2.0:
74697469
version "0.0.0"
74707470
uid ""
74717471

7472-
stream-chat-react-native-core@5.35.0:
7473-
version "5.35.0"
7474-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.35.0.tgz#fe12428400edf715e2ff9ef567b1233d35b9d357"
7475-
integrity sha512-botPziAoRY7SE/XdLECCKdYAcYiRuQFj0IeUWj2HNkEwCU0bpjQT9y+wpHKC0gKX57VUksPJsoV9ZBQT0KclTQ==
7472+
stream-chat-react-native-core@5.36.0:
7473+
version "5.36.0"
7474+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.36.0.tgz#c8a7d5e22481a198bd4d2e3ed50ab6f73f09aa0b"
7475+
integrity sha512-9UpKXe+/+wfm4ubEjE6oRxc/oTnTSApwqNAvDzdH6cDjSDR/m/+VN3VSxFHrIptm8DHO1nteMzHXcXQwpJZaVA==
74767476
dependencies:
74777477
"@gorhom/bottom-sheet" "4.4.8"
74787478
dayjs "1.10.5"

‎examples/SampleApp/CHANGELOG.md‎

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

3+
## [1.28.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.28.0) (2024-08-29)
4+
5+
6+
### Features
7+
8+
* Implement SDK Size analysis on CI ([#2612](https://github.com/GetStream/stream-chat-react-native/issues/2612)) ([8812be4](https://github.com/GetStream/stream-chat-react-native/commit/8812be4dc32f3fb1c2da1d7fa07ae1df576ab85d))
9+
10+
11+
### Workspaces
12+
13+
* Following linked packages updated: [stream-chat-react-native]
14+
315
### [1.27.8](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.27.8) (2024-08-19)
416

517

‎examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -636,9 +636,6 @@
636636
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
637637
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
638638
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
639-
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
640-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
641-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
642639
);
643640
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
644641
LD_RUNPATH_SEARCH_PATHS = (
@@ -753,9 +750,6 @@
753750
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
754751
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
755752
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
756-
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
757-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
758-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
759753
);
760754
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
761755
LD_RUNPATH_SEARCH_PATHS = (

‎examples/SampleApp/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sampleapp",
3-
"version": "1.27.8",
3+
"version": "1.28.0",
44
"private": true,
55
"repository": {
66
"type": "git",
@@ -49,6 +49,7 @@
4949
"react-native-share": "^10.2.1",
5050
"react-native-svg": "^15.6.0",
5151
"react-native-video": "^6.4.2",
52+
"moment-timezone": "^0.5.45",
5253
"stream-chat-react-native": "link:../../package/native-package",
5354
"stream-chat-react-native-core": "link:../../package"
5455
},

‎examples/SampleApp/yarn.lock‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5718,6 +5718,18 @@ mkdirp@^1.0.4:
57185718
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
57195719
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
57205720

5721+
moment-timezone@^0.5.45:
5722+
version "0.5.45"
5723+
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
5724+
integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
5725+
dependencies:
5726+
moment "^2.29.4"
5727+
5728+
moment@^2.29.4:
5729+
version "2.30.1"
5730+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
5731+
integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
5732+
57215733
[email protected]:
57225734
version "2.0.0"
57235735
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6944,10 +6956,10 @@ statuses@~1.5.0:
69446956
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
69456957
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
69466958

6947-
stream-chat-react-native-core@5.35.0:
6948-
version "5.35.0"
6949-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.35.0.tgz#fe12428400edf715e2ff9ef567b1233d35b9d357"
6950-
integrity sha512-botPziAoRY7SE/XdLECCKdYAcYiRuQFj0IeUWj2HNkEwCU0bpjQT9y+wpHKC0gKX57VUksPJsoV9ZBQT0KclTQ==
6959+
stream-chat-react-native-core@5.36.0:
6960+
version "5.36.0"
6961+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.36.0.tgz#c8a7d5e22481a198bd4d2e3ed50ab6f73f09aa0b"
6962+
integrity sha512-9UpKXe+/+wfm4ubEjE6oRxc/oTnTSApwqNAvDzdH6cDjSDR/m/+VN3VSxFHrIptm8DHO1nteMzHXcXQwpJZaVA==
69516963
dependencies:
69526964
"@gorhom/bottom-sheet" "4.4.8"
69536965
dayjs "1.10.5"

‎examples/TypeScriptMessaging/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7208,10 +7208,10 @@ statuses@~1.5.0:
72087208
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
72097209
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
72107210

7211-
stream-chat-react-native-core@5.35.0:
7212-
version "5.35.0"
7213-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.35.0.tgz#fe12428400edf715e2ff9ef567b1233d35b9d357"
7214-
integrity sha512-botPziAoRY7SE/XdLECCKdYAcYiRuQFj0IeUWj2HNkEwCU0bpjQT9y+wpHKC0gKX57VUksPJsoV9ZBQT0KclTQ==
7211+
stream-chat-react-native-core@5.36.0:
7212+
version "5.36.0"
7213+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.36.0.tgz#c8a7d5e22481a198bd4d2e3ed50ab6f73f09aa0b"
7214+
integrity sha512-9UpKXe+/+wfm4ubEjE6oRxc/oTnTSApwqNAvDzdH6cDjSDR/m/+VN3VSxFHrIptm8DHO1nteMzHXcXQwpJZaVA==
72157215
dependencies:
72167216
"@gorhom/bottom-sheet" "4.4.8"
72177217
dayjs "1.10.5"

‎package/.eslintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
"@typescript-eslint/ban-ts-comment": 0,
149149
"@typescript-eslint/no-unused-vars": 1,
150150
"@typescript-eslint/no-var-requires": 0,
151-
"react-hooks/exhaustive-deps": 0,
151+
"react-hooks/exhaustive-deps": 1,
152152
"react-native/no-inline-styles": 0,
153153
"array-callback-return": 2,
154154
"arrow-body-style": 2,

‎package/CHANGELOG.md‎

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

3+
## [5.36.0](https://github.com/GetStream/stream-chat-react-native/compare/v5.35.0...v5.36.0) (2024-08-29)
4+
5+
6+
### Features
7+
8+
* Implement SDK Size analysis on CI ([#2612](https://github.com/GetStream/stream-chat-react-native/issues/2612)) ([8812be4](https://github.com/GetStream/stream-chat-react-native/commit/8812be4dc32f3fb1c2da1d7fa07ae1df576ab85d))
9+
10+
11+
### Bug Fixes
12+
13+
* appSettings rerender issue in the ChatContext ([#2620](https://github.com/GetStream/stream-chat-react-native/issues/2620)) ([190be2f](https://github.com/GetStream/stream-chat-react-native/commit/190be2f6a4f12d11918a0d9a6917abbe7af49d29))
14+
* giphy lightning icon in giphy attachments ([0a385db](https://github.com/GetStream/stream-chat-react-native/commit/0a385dba4b0a8d96f3d7555c74a7b72c290a81b9))
15+
* image gallery footer safe area view theme style order ([4832f10](https://github.com/GetStream/stream-chat-react-native/commit/4832f10c3634b9e0571519ea81b03b47dfa5ee2d))
16+
* inability to cancel file uploads ([#2632](https://github.com/GetStream/stream-chat-react-native/issues/2632)) ([b9e904b](https://github.com/GetStream/stream-chat-react-native/commit/b9e904b10360805f96c45ec28338553a21ec26ad))
17+
* issue closing native attachment picker icons when attach button is tapped ([e139a53](https://github.com/GetStream/stream-chat-react-native/commit/e139a53200fbf3c8e63cc98aa5b5c33a8a875496))
18+
* memory leak during remount or user change ([#2639](https://github.com/GetStream/stream-chat-react-native/issues/2639)) ([338d445](https://github.com/GetStream/stream-chat-react-native/commit/338d445f648cbcd9d274a371c1f3689308d38fa3))
19+
* targeting message outside bounds ([#2630](https://github.com/GetStream/stream-chat-react-native/issues/2630)) ([ec9ea53](https://github.com/GetStream/stream-chat-react-native/commit/ec9ea537b7a3bc2dd265b1f7c07974689eac4e76))
20+
321
## [5.35.0](https://github.com/GetStream/stream-chat-react-native/compare/v5.34.0...v5.35.0) (2024-08-19)
422

523

0 commit comments

Comments
 (0)