Skip to content

Commit f950b41

Browse files
committed
chore: resolve conflicts
2 parents 9af9290 + 9692f1a commit f950b41

File tree

77 files changed

+2900
-2762
lines changed

Some content is hidden

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

77 files changed

+2900
-2762
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
1111
[![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)
1212
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
13-
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-451%20KB-blue)
13+
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-452%20KB-blue)
1414

1515
<img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/[email protected]?auto=format,enhance" width="50%" />
1616

examples/ExpoMessaging/app.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"resizeMode": "contain",
1212
"backgroundColor": "#ffffff"
1313
},
14+
"newArchEnabled": true,
1415
"updates": {
1516
"fallbackToCacheTimeout": 0
1617
},
@@ -37,14 +38,26 @@
3738
[
3839
"expo-image-picker",
3940
{
40-
"cameraPermission": "$(PRODUCT_NAME) would like to use your camera to share image in a message."
41+
"photosPermission": "The app accesses your photos to let them share with others.",
42+
"cameraPermission": "The app accesses your camera to let you take photos and share with others."
4143
}
4244
],
4345
[
4446
"expo-av",
4547
{
4648
"microphonePermission": "$(PRODUCT_NAME) would like to use your microphone for voice recording."
4749
}
50+
],
51+
[
52+
"expo-build-properties",
53+
{
54+
"android": {
55+
"newArchEnabled": true
56+
},
57+
"ios": {
58+
"newArchEnabled": true
59+
}
60+
}
4861
]
4962
]
5063
}

examples/ExpoMessaging/package.json

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,41 @@
77
"android": "expo run:android",
88
"ios": "expo run:ios",
99
"web": "expo start --web",
10-
"eject": "expo eject",
11-
"postinstall": "patch-package"
10+
"eject": "expo eject"
1211
},
1312
"dependencies": {
14-
"@op-engineering/op-sqlite": "^6.0.4",
15-
"@react-native-community/netinfo": "11.3.1",
13+
"@op-engineering/op-sqlite": "^9.3.0",
14+
"@react-native-community/netinfo": "11.4.1",
1615
"@react-navigation/elements": "^1.3.30",
17-
"expo": "^51.0.38",
18-
"expo-av": "~14.0.7",
19-
"expo-build-properties": "~0.12.5",
20-
"expo-clipboard": "~6.0.3",
21-
"expo-constants": "~16.0.2",
22-
"expo-document-picker": "~12.0.2",
23-
"expo-file-system": "~17.0.1",
24-
"expo-haptics": "~13.0.1",
25-
"expo-image-manipulator": "~12.0.5",
26-
"expo-image-picker": "~15.0.7",
27-
"expo-linking": "~6.3.1",
28-
"expo-router": "~3.5.23",
29-
"expo-sharing": "~12.0.1",
30-
"expo-splash-screen": "~0.27.6",
31-
"expo-status-bar": "~1.12.1",
32-
"patch-package": "^8.0.0",
33-
"postinstall-postinstall": "^2.1.0",
34-
"react": "18.2.0",
35-
"react-dom": "18.2.0",
36-
"react-native": "0.74.5",
37-
"react-native-gesture-handler": "~2.16.1",
38-
"react-native-reanimated": "~3.10.1",
39-
"react-native-safe-area-context": "4.10.5",
40-
"react-native-screens": "3.31.1",
41-
"react-native-svg": "15.2.0",
42-
"react-native-web": "~0.19.6",
16+
"expo": "^52.0.0",
17+
"expo-av": "~15.0.1",
18+
"expo-clipboard": "~7.0.0",
19+
"expo-constants": "~17.0.3",
20+
"expo-document-picker": "~13.0.1",
21+
"expo-file-system": "~18.0.4",
22+
"expo-haptics": "~14.0.0",
23+
"expo-image-manipulator": "~13.0.5",
24+
"expo-image-picker": "^16.0.3",
25+
"expo-linking": "~7.0.3",
26+
"expo-router": "~4.0.11",
27+
"expo-sharing": "~13.0.0",
28+
"expo-splash-screen": "~0.29.13",
29+
"expo-status-bar": "~2.0.0",
30+
"react": "18.3.1",
31+
"react-dom": "18.3.1",
32+
"react-native": "0.76.3",
33+
"react-native-gesture-handler": "~2.20.2",
34+
"react-native-reanimated": "~3.16.1",
35+
"react-native-safe-area-context": "4.12.0",
36+
"react-native-screens": "~4.1.0",
37+
"react-native-svg": "15.8.0",
38+
"react-native-web": "~0.19.13",
4339
"stream-chat-expo": "link:../../package/expo-package",
4440
"stream-chat-react-native-core": "link:../../package",
4541
"typescript": "~5.3.3"
4642
},
4743
"devDependencies": {
48-
"@babel/core": "^7.24.0",
44+
"@babel/core": "^7.25.2",
4945
"@rnx-kit/metro-config": "^1.3.15",
5046
"@rnx-kit/metro-resolver-symlinks": "^0.1.35"
5147
},

0 commit comments

Comments
 (0)