Skip to content

Commit 342f42a

Browse files
isekovanicisekovanic
committed
Merge branch 'develop' into chore/eslint-sdk-upgrade
# Conflicts: # examples/ExpoMessaging/yarn.lock # examples/SampleApp/package.json # examples/SampleApp/src/hooks/useChatClient.ts # examples/TypeScriptMessaging/.node-version
2 parents 2217e6b + 460e81e commit 342f42a

File tree

15 files changed

+700
-585
lines changed

15 files changed

+700
-585
lines changed

‎examples/ExpoMessaging/package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,41 @@
1010
"eject": "expo eject"
1111
},
1212
"dependencies": {
13-
"@op-engineering/op-sqlite": "^11.4.2",
13+
"@op-engineering/op-sqlite": "^11.4.7",
1414
"@react-native-community/netinfo": "11.4.1",
1515
"@react-navigation/elements": "^1.3.30",
16-
"expo": "~52.0.20",
16+
"expo": "~52.0.36",
1717
"expo-av": "~15.0.2",
1818
"expo-clipboard": "~7.0.1",
19-
"expo-constants": "~17.0.5",
20-
"expo-document-picker": "~13.0.2",
21-
"expo-file-system": "~18.0.7",
19+
"expo-constants": "~17.0.7",
20+
"expo-document-picker": "~13.0.3",
21+
"expo-file-system": "~18.0.11",
2222
"expo-haptics": "~14.0.1",
2323
"expo-image-manipulator": "~13.0.6",
24-
"expo-image-picker": "~16.0.4",
24+
"expo-image-picker": "~16.0.6",
2525
"expo-linking": "~7.0.5",
26-
"expo-media-library": "~17.0.5",
26+
"expo-media-library": "~17.0.6",
2727
"expo-router": "~4.0.17",
2828
"expo-sharing": "~13.0.1",
29-
"expo-splash-screen": "~0.29.21",
29+
"expo-splash-screen": "~0.29.22",
3030
"expo-status-bar": "~2.0.1",
3131
"react": "18.3.1",
3232
"react-dom": "18.3.1",
33-
"react-native": "0.76.6",
34-
"react-native-gesture-handler": "~2.20.2",
35-
"react-native-reanimated": "~3.16.1",
36-
"react-native-safe-area-context": "4.12.0",
37-
"react-native-screens": "~4.4.0",
38-
"react-native-svg": "15.8.0",
33+
"react-native": "0.77.1",
34+
"react-native-gesture-handler": "~2.24.0",
35+
"react-native-reanimated": "~3.16.7",
36+
"react-native-safe-area-context": "5.2.0",
37+
"react-native-screens": "~4.8.0",
38+
"react-native-svg": "15.11.1",
3939
"react-native-web": "~0.19.13",
4040
"stream-chat-expo": "link:../../package/expo-package",
4141
"stream-chat-react-native-core": "link:../../package",
42-
"typescript": "~5.3.3"
42+
"typescript": "~5.7.3"
4343
},
4444
"devDependencies": {
4545
"@babel/core": "^7.25.2",
46-
"@rnx-kit/metro-config": "^1.3.15",
47-
"@rnx-kit/metro-resolver-symlinks": "^0.1.35"
46+
"@rnx-kit/metro-config": "^2.0.1",
47+
"@rnx-kit/metro-resolver-symlinks": "^0.2.1"
4848
},
4949
"private": true
5050
}

‎examples/ExpoMessaging/yarn.lock‎

Lines changed: 628 additions & 540 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -688,10 +688,7 @@
688688
"-DFOLLY_USE_LIBCPP=1",
689689
"-DFOLLY_CFG_NO_COROUTINES=1",
690690
);
691-
OTHER_LDFLAGS = (
692-
"$(inherited)",
693-
" ",
694-
);
691+
OTHER_LDFLAGS = "$(inherited) ";
695692
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
696693
SDKROOT = iphoneos;
697694
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -823,10 +820,7 @@
823820
"-DFOLLY_USE_LIBCPP=1",
824821
"-DFOLLY_CFG_NO_COROUTINES=1",
825822
);
826-
OTHER_LDFLAGS = (
827-
"$(inherited)",
828-
" ",
829-
);
823+
OTHER_LDFLAGS = "$(inherited) ";
830824
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
831825
SDKROOT = iphoneos;
832826
USE_HERMES = true;

‎examples/SampleApp/src/hooks/useChatClient.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ export const useChatClient = () => {
120120
// Register FCM token with stream chat server.
121121
// await messaging.set;
122122
const apnsToken = await messaging.getAPNSToken();
123-
console.log('APNS: ', apnsToken);
124123
const firebaseToken = await messaging.getToken();
125124
const provider = await AsyncStore.getItem('@stream-rn-sampleapp-push-provider', { id: 'firebase', name: 'rn-fcm' });
126125
const id = provider?.id ?? 'firebase';

‎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+
### [6.6.4](https://github.com/GetStream/stream-chat-react-native/compare/v6.6.3...v6.6.4) (2025-02-24)
4+
5+
6+
### Bug Fixes
7+
8+
* upload file/image and respect app settings ([#2976](https://github.com/GetStream/stream-chat-react-native/issues/2976)) ([aa2be37](https://github.com/GetStream/stream-chat-react-native/commit/aa2be37ed8ee8c2d3fb5c9167bf36b54722d5681))
9+
310
### [6.6.3](https://github.com/GetStream/stream-chat-react-native/compare/v6.6.2...v6.6.3) (2025-02-21)
411

512

‎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": "6.6.3",
4+
"version": "6.6.4",
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": "6.6.3"
13+
"stream-chat-react-native-core": "6.6.4"
1414
},
1515
"peerDependencies": {
1616
"expo": ">=51.0.0",

‎package/expo-package/src/optionalDependencies/takePhoto.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const takePhoto = ImagePicker
6161
...photo,
6262
cancelled: false,
6363
duration: photo.duration, // in milliseconds
64-
name: 'video_recording_' + date + photo.uri.split('.').pop(),
64+
name: 'video_recording_' + date + '.' + photo.uri.split('.').pop(),
6565
size: photo.fileSize,
6666
source: 'camera',
6767
type: photo.mimeType,
@@ -91,9 +91,12 @@ export const takePhoto = ImagePicker
9191
width: photo.width,
9292
};
9393
}
94-
94+
const clearFilter = new RegExp('[.:]', 'g');
95+
const date = new Date().toISOString().replace(clearFilter, '_');
9596
return {
9697
cancelled: false,
98+
mimeType: photo.mimeType,
99+
name: 'image_' + date + '.' + photo.uri.split('.').pop(),
97100
size: photo.fileSize,
98101
source: 'camera',
99102
type: photo.mimeType,

‎package/expo-package/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5113,10 +5113,10 @@ [email protected], stream-buffers@~2.2.0:
51135113
resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
51145114
integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
51155115

5116-
[email protected].2:
5117-
version "6.6.2"
5118-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.2.tgz#a32bcf56f1675c60ceeef4507ed43120f659d52d"
5119-
integrity sha512-JeDMaVGEUCKYmG+qcbCsUPB7HyxYd4pEAMFXG0O180JOMAqemyjXMquKvGCGF8Q4YZAKUPV71VC/vGLpPDnGQg==
5116+
[email protected].3:
5117+
version "6.6.3"
5118+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.6.3.tgz#580225cbcd7a9fbfdb3461f76ef6784908b1533e"
5119+
integrity sha512-Oe5AYvamlI2qKO+VjcthaIm/J6+pCQRsVVn5EG5fiakya2sJPF2L3hGBPOjo6MNLe9oz7QKP7jp8U61j9vsqLA==
51205120
dependencies:
51215121
"@gorhom/bottom-sheet" "^5.0.6"
51225122
dayjs "1.10.5"

‎package/native-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-react-native",
33
"description": "The official React Native SDK for Stream Chat, a service for building chat applications",
4-
"version": "6.6.3",
4+
"version": "6.6.4",
55
"homepage": "https://www.npmjs.com/package/stream-chat-react-native",
66
"author": {
77
"company": "Stream.io Inc",
@@ -20,7 +20,7 @@
2020
"types": "types/index.d.ts",
2121
"dependencies": {
2222
"es6-symbol": "^3.1.3",
23-
"stream-chat-react-native-core": "6.6.3"
23+
"stream-chat-react-native-core": "6.6.4"
2424
},
2525
"peerDependencies": {
2626
"@react-native-camera-roll/camera-roll": ">=7.8.0",

‎package/native-package/src/optionalDependencies/takePhoto.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ export const takePhoto = ImagePicker
5353
...asset,
5454
cancelled: false,
5555
duration: asset.duration * 1000,
56-
name: 'video_recording_' + date + asset.fileName.split('.').pop(),
56+
mimeType: asset.type,
57+
name: 'video_recording_' + date + '.' + asset.fileName.split('.').pop(),
5758
size: asset.fileSize,
5859
source: 'camera',
5960
type: asset.type,
@@ -85,8 +86,12 @@ export const takePhoto = ImagePicker
8586
width: asset.width,
8687
};
8788
}
89+
const clearFilter = new RegExp('[.:]', 'g');
90+
const date = new Date().toISOString().replace(clearFilter, '_');
8891
return {
8992
cancelled: false,
93+
mimeType: asset.type,
94+
name: 'video_recording_' + date + '.' + asset.fileName.split('.').pop(),
9095
size: asset.size,
9196
source: 'camera',
9297
type: asset.type,

0 commit comments

Comments
 (0)