Skip to content

Commit 24664a9

Browse files
committed
Merge branch 'message-pagination' of github.com:GetStream/stream-chat-react-native into message-list-pagincation-implementation
2 parents 64818b6 + 078ad3c commit 24664a9

File tree

28 files changed

+229
-307
lines changed

28 files changed

+229
-307
lines changed

.github/workflows/sample-distribution.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: sample-distribution
22

3+
## TODO: Make sure to revert the changes here when moving this to main. We want them right now to be able to have the SampleApp live with V6.
4+
35
concurrency:
46
group: sample-distribution-${{ github.ref }}
57
cancel-in-progress: true
@@ -13,7 +15,7 @@ on:
1315

1416
jobs:
1517
build_and_deploy_ios_testflight_qa:
16-
name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/develop' }}
18+
name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/v6.0.0' }}
1719
runs-on: [macos-14]
1820
steps:
1921
- name: Connect Bot
@@ -33,17 +35,19 @@ jobs:
3335
${{ runner.os }}-pods-
3436
- name: iOS Pods setup
3537
working-directory: examples/SampleApp/ios
36-
run: bundle exec pod install
38+
run: |
39+
pod update hermes-engine --no-repo-update
40+
bundle exec pod install
3741
- name: Build and release Testflight QA
3842
working-directory: examples/SampleApp
39-
run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/develop' }};
43+
run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/v6.0.0' }};
4044
env:
4145
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
4246
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
4347
APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
4448

4549
build_and_deploy_android_s3:
46-
name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/develop' }}
50+
name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/v6.0.0' }}
4751
runs-on: ubuntu-latest
4852
steps:
4953
- uses: actions/checkout@v2
@@ -64,13 +68,13 @@ jobs:
6468
rm -rf $HOME/.gradle/caches/ && ./gradlew assembleRelease
6569
- name: Configure AWS credentials
6670
uses: aws-actions/configure-aws-credentials@v1
67-
if: ${{ github.ref == 'refs/heads/develop' }}
71+
if: ${{ github.ref == 'refs/heads/v6.0.0' }}
6872
with:
6973
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
7074
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
7175
aws-region: us-east-1
7276
- name: Upload APK
73-
if: ${{ github.ref == 'refs/heads/develop' }}
77+
if: ${{ github.ref == 'refs/heads/v6.0.0' }}
7478
# https://getstream.io/downloads/rn-sample-app.apk
7579
run: |
7680
cp examples/SampleApp/android/app/build/outputs/apk/release/app-release.apk rn-sample-app.apk

examples/ExpoMessaging/types.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ export type LocalEventType = Record<string, unknown>;
55
export type LocalMessageType = Record<string, unknown>;
66
export type LocalReactionType = Record<string, unknown>;
77
export type LocalUserType = Record<string, unknown>;
8-
type LocalPollOptionType = Record<string, unknown>;
9-
type LocalPollType = Record<string, unknown>;
8+
export type LocalPollOptionType = Record<string, unknown>;
9+
export type LocalPollType = Record<string, unknown>;
10+
export type LocalMemberType = Record<string, unknown>;
1011

1112
export type StreamChatGenerics = {
1213
attachmentType: LocalAttachmentType;
1314
channelType: LocalChannelType;
1415
commandType: LocalCommandType;
1516
eventType: LocalEventType;
17+
memberType: LocalMemberType;
1618
messageType: LocalMessageType;
1719
pollOptionType: LocalPollOptionType;
1820
pollType: LocalPollType;

examples/ExpoMessaging/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7550,10 +7550,10 @@ [email protected]:
75507550
jsonwebtoken "~9.0.0"
75517551
ws "^7.5.10"
75527552

7553-
stream-chat@8.44.0:
7554-
version "8.44.0"
7555-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.44.0.tgz#e48446cf91db786e80a2e7358ac4f1601e5e97f0"
7556-
integrity sha512-7HNtimD8sT/51rsFibGcD6uBgKj+vlKyYCZMDzjYQEaEsrLqyAg48dOyNM4L2FTF5aXgo9SlxZr21SPleeA2BA==
7553+
stream-chat@8.45.1:
7554+
version "8.45.1"
7555+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"
7556+
integrity sha512-7OMpL2RHUd+PXSWzhTUAIjjXlI9Oqc4HhUBRfc5i6dK+Ug9S5ertb7RvyzGL5N4ITpq/6ZUAwXtTqRaN9+UUkw==
75577557
dependencies:
75587558
"@babel/runtime" "^7.16.3"
75597559
"@types/jsonwebtoken" "~9.0.0"

examples/SampleApp/ios/Podfile.lock

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,27 +1439,6 @@ PODS:
14391439
- ReactCommon/turbomodule/bridging
14401440
- ReactCommon/turbomodule/core
14411441
- Yoga
1442-
- react-native-cameraroll (7.8.1):
1443-
- DoubleConversion
1444-
- glog
1445-
- hermes-engine
1446-
- RCT-Folly (= 2024.01.01.00)
1447-
- RCTRequired
1448-
- RCTTypeSafety
1449-
- React-Core
1450-
- React-debug
1451-
- React-Fabric
1452-
- React-featureflags
1453-
- React-graphics
1454-
- React-ImageManager
1455-
- React-NativeModulesApple
1456-
- React-RCTFabric
1457-
- React-rendererdebug
1458-
- React-utils
1459-
- ReactCodegen
1460-
- ReactCommon/turbomodule/bridging
1461-
- ReactCommon/turbomodule/core
1462-
- Yoga
14631442
- react-native-document-picker (9.3.1):
14641443
- DoubleConversion
14651444
- glog
@@ -2254,7 +2233,6 @@ DEPENDENCIES:
22542233
- React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
22552234
- React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
22562235
- react-native-blob-util (from `../node_modules/react-native-blob-util`)
2257-
- "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
22582236
- react-native-document-picker (from `../node_modules/react-native-document-picker`)
22592237
- react-native-image-picker (from `../node_modules/react-native-image-picker`)
22602238
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
@@ -2403,8 +2381,6 @@ EXTERNAL SOURCES:
24032381
:path: "../node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
24042382
react-native-blob-util:
24052383
:path: "../node_modules/react-native-blob-util"
2406-
react-native-cameraroll:
2407-
:path: "../node_modules/@react-native-camera-roll/camera-roll"
24082384
react-native-document-picker:
24092385
:path: "../node_modules/react-native-document-picker"
24102386
react-native-image-picker:
@@ -2500,7 +2476,7 @@ EXTERNAL SOURCES:
25002476

25012477
SPEC CHECKSUMS:
25022478
boost: 1dca942403ed9342f98334bf4c3621f011aa7946
2503-
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
2479+
DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
25042480
FBLazyVector: 7075bb12898bc3998fd60f4b7ca422496cc2cdf7
25052481
Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
25062482
FirebaseAnalytics: b5efc493eb0f40ec560b04a472e3e1a15d39ca13
@@ -2514,7 +2490,7 @@ SPEC CHECKSUMS:
25142490
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
25152491
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
25162492
fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
2517-
glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
2493+
glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
25182494
GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
25192495
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
25202496
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
@@ -2555,7 +2531,6 @@ SPEC CHECKSUMS:
25552531
React-Mapbuffer: 858e7be7b51da78fd6a12b2461d92ea44e88c0f2
25562532
React-microtasksnativemodule: a221789bbd16b09f083a60a4bec8623e2dfbb59f
25572533
react-native-blob-util: 356047c561b3506396852bc0d7988243f74dd77d
2558-
react-native-cameraroll: 1f91168f2e07c0cd971e181dbf86ee40dd685ac3
25592534
react-native-document-picker: 1e082836a633ca9e7c75758036ff42535baaf36b
25602535
react-native-image-picker: df6597d4b1878a443796be11eb2b7286ed10ece6
25612536
react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc

0 commit comments

Comments
 (0)