Skip to content

Commit 4aea22d

Browse files
isekovanicisekovanic
committed
fix: changes after merge
1 parent aeeea75 commit 4aea22d

File tree

9 files changed

+55
-46
lines changed

9 files changed

+55
-46
lines changed

‎examples/SampleApp/ios/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,7 +1967,7 @@ PODS:
19671967
- libwebp (~> 1.0)
19681968
- SDWebImage/Core (~> 5.10)
19691969
- SocketRocket (0.7.0)
1970-
- stream-chat-react-native (5.39.5):
1970+
- stream-chat-react-native (5.41.2):
19711971
- React-Core
19721972
- Yoga (0.0.0)
19731973

@@ -2256,7 +2256,7 @@ EXTERNAL SOURCES:
22562256

22572257
SPEC CHECKSUMS:
22582258
boost: 4cb898d0bf20404aab1850c656dcea009429d6c1
2259-
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
2259+
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
22602260
FBLazyVector: 430e10366de01d1e3d57374500b1b150fe482e6d
22612261
Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
22622262
FirebaseAnalytics: b5efc493eb0f40ec560b04a472e3e1a15d39ca13
@@ -2270,7 +2270,7 @@ SPEC CHECKSUMS:
22702270
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
22712271
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
22722272
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
2273-
glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
2273+
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
22742274
GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
22752275
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
22762276
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
@@ -2357,9 +2357,9 @@ SPEC CHECKSUMS:
23572357
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
23582358
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
23592359
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
2360-
stream-chat-react-native: 489a6a053480ab8556883de05a28df2c7387ede6
2360+
stream-chat-react-native: 413ad7209150b272c7081dcba5208b65d07e5499
23612361
Yoga: b05994d1933f507b0a28ceaa4fdb968dc18da178
23622362

23632363
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d
23642364

2365-
COCOAPODS: 1.16.2
2365+
COCOAPODS: 1.14.3

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,15 @@
723723
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
724724
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
725725
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
726+
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
727+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
728+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
729+
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
730+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
731+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
732+
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
733+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
734+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
726735
);
727736
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
728737
LD = "";
@@ -927,6 +936,15 @@
927936
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
928937
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
929938
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
939+
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
940+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
941+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
942+
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
943+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
944+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
945+
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
946+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
947+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
930948
);
931949
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
932950
LD = "";

‎examples/SampleApp/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7784,10 +7784,10 @@ statuses@~1.5.0:
77847784
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
77857785
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
77867786

7787-
stream-chat-react-native-core@5.39.5:
7788-
version "5.39.5"
7789-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.39.5.tgz#8a2f587404bc84f1761e180602358a60b46f724b"
7790-
integrity sha512-H0wSnF7PgwepvozXRZs5K9TR9A3mOKMc6hyV+sLtLKW13rqyN11dSuSKorOYzCCkrnasYi+2sXM1dd7Orunbww==
7787+
stream-chat-react-native-core@5.41.2:
7788+
version "5.41.2"
7789+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.2.tgz#74fda94b80e28dd542a90abbfeb0291bf97a3d77"
7790+
integrity sha512-mr8yTj7O40w13EvOkhDTJH8OCisdB8f8REeFFt2y2LA2PWkFb5hpI1e5uFMW7XTuL58ftD1jXdF2ug6n4OUDug==
77917791
dependencies:
77927792
"@gorhom/bottom-sheet" "^4.6.4"
77937793
dayjs "1.10.5"
@@ -7800,7 +7800,7 @@ [email protected]:
78007800
path "0.12.7"
78017801
react-native-markdown-package "1.8.2"
78027802
react-native-url-polyfill "^1.3.0"
7803-
stream-chat "8.40.8"
7803+
stream-chat "8.42.0"
78047804

78057805
"stream-chat-react-native-core@link:../../package":
78067806
version "0.0.0"
@@ -7810,10 +7810,10 @@ [email protected]:
78107810
version "0.0.0"
78117811
uid ""
78127812

7813-
stream-chat@8.40.8:
7814-
version "8.40.8"
7815-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.40.8.tgz#0f5320bd8b03d1cbff377f8c7ae2f8afe24d0515"
7816-
integrity sha512-nYLvYAkrvXRzuPO52TIofNiInCkDdXrnBc/658297lC6hzrHNc87mmTht264BXmXLlpasTNP3rLKxR6MxhpgKg==
7813+
stream-chat@8.42.0:
7814+
version "8.42.0"
7815+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
7816+
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
78177817
dependencies:
78187818
"@babel/runtime" "^7.16.3"
78197819
"@types/jsonwebtoken" "~9.0.0"

‎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].1:
5117-
version "5.41.1"
5118-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.1.tgz#a202e37d9ee55f1fc90994ed4cb3684f91479f1b"
5119-
integrity sha512-DOsQ+aeYXTAXKLW9xovSe7Y1p7fhAVIoRdXfPryQcCRaeemkHMIjYq1AalYB6p5aPPa14Ht078MayrvJuw9eMw==
5116+
[email protected].2:
5117+
version "5.41.2"
5118+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.2.tgz#74fda94b80e28dd542a90abbfeb0291bf97a3d77"
5119+
integrity sha512-mr8yTj7O40w13EvOkhDTJH8OCisdB8f8REeFFt2y2LA2PWkFb5hpI1e5uFMW7XTuL58ftD1jXdF2ug6n4OUDug==
51205120
dependencies:
51215121
"@gorhom/bottom-sheet" "^4.6.4"
51225122
dayjs "1.10.5"

‎package/native-package/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4242,10 +4242,10 @@ statuses@~1.5.0:
42424242
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
42434243
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
42444244

4245-
stream-chat-react-native-core@5.39.5:
4246-
version "5.39.5"
4247-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.39.5.tgz#8a2f587404bc84f1761e180602358a60b46f724b"
4248-
integrity sha512-H0wSnF7PgwepvozXRZs5K9TR9A3mOKMc6hyV+sLtLKW13rqyN11dSuSKorOYzCCkrnasYi+2sXM1dd7Orunbww==
4245+
stream-chat-react-native-core@5.41.2:
4246+
version "5.41.2"
4247+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.2.tgz#74fda94b80e28dd542a90abbfeb0291bf97a3d77"
4248+
integrity sha512-mr8yTj7O40w13EvOkhDTJH8OCisdB8f8REeFFt2y2LA2PWkFb5hpI1e5uFMW7XTuL58ftD1jXdF2ug6n4OUDug==
42494249
dependencies:
42504250
"@gorhom/bottom-sheet" "^4.6.4"
42514251
dayjs "1.10.5"
@@ -4258,12 +4258,12 @@ [email protected]:
42584258
path "0.12.7"
42594259
react-native-markdown-package "1.8.2"
42604260
react-native-url-polyfill "^1.3.0"
4261-
stream-chat "8.40.8"
4261+
stream-chat "8.42.0"
42624262

4263-
stream-chat@8.40.8:
4264-
version "8.40.8"
4265-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.40.8.tgz#0f5320bd8b03d1cbff377f8c7ae2f8afe24d0515"
4266-
integrity sha512-nYLvYAkrvXRzuPO52TIofNiInCkDdXrnBc/658297lC6hzrHNc87mmTht264BXmXLlpasTNP3rLKxR6MxhpgKg==
4263+
stream-chat@8.42.0:
4264+
version "8.42.0"
4265+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
4266+
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
42674267
dependencies:
42684268
"@babel/runtime" "^7.16.3"
42694269
"@types/jsonwebtoken" "~9.0.0"

‎package/src/components/Message/Message.tsx‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useCallback, useMemo, useState } from 'react';
1+
import React, { useMemo, useState } from 'react';
22
import { GestureResponderEvent, Keyboard, StyleProp, View, ViewStyle } from 'react-native';
33

44
import type { Attachment, UserResponse } from 'stream-chat';
@@ -45,7 +45,6 @@ import {
4545
isMessageWithStylesReadByAndDateSeparator,
4646
MessageType,
4747
} from '../MessageList/hooks/useMessageList';
48-
import { Poll as PollComponent } from '../Poll';
4948

5049
export type TouchableEmitter =
5150
| 'fileAttachment'
@@ -239,7 +238,6 @@ const MessageWithContext = <
239238
onPressMessage: onPressMessageProp,
240239
onThreadSelect,
241240
openThread,
242-
PollContent,
243241
preventPress,
244242
removeMessage,
245243
retrySendMessage,
@@ -526,13 +524,6 @@ const MessageWithContext = <
526524
updateMessage,
527525
});
528526

529-
// TODO: Can be removed in V6 and from here completely once it becomes baseline.
530-
const PollWrapper = useCallback(() => {
531-
const poll = message?.poll_id ? client.polls.fromState(message.poll_id) : undefined;
532-
return message?.poll_id && poll ? (
533-
<PollComponent<StreamChatGenerics> message={message} poll={poll} PollContent={PollContent} />
534-
) : null;
535-
}, [PollContent, client, message]);
536527
const isThreadMessage = threadList || !!message.parent_id;
537528

538529
const messageActions =

‎package/src/store/SqliteClient.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import type { PreparedQueries, Table } from './types';
2929
* This way usage @op-engineering/op-sqlite package is scoped to a single class/file.
3030
*/
3131
export class SqliteClient {
32-
static dbVersion = 5;
32+
static dbVersion = 6;
3333

3434
static dbName = DB_NAME;
3535
static dbLocation = DB_LOCATION;

‎package/src/store/apis/updatePollMessage.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { PollResponse } from 'stream-chat';
22

3-
import { QuickSqliteClient } from '../QuickSqliteClient';
43
import { createSelectQuery } from '../sqlite-utils/createSelectQuery';
54
import { createUpdateQuery } from '../sqlite-utils/createUpdateQuery';
5+
import { SqliteClient } from '../SqliteClient';
66
import type { PreparedQueries } from '../types';
77

88
export const updatePollMessage = ({
@@ -14,7 +14,7 @@ export const updatePollMessage = ({
1414
}) => {
1515
const queries: PreparedQueries[] = [];
1616

17-
const messagesWithPoll = QuickSqliteClient.executeSql.apply(
17+
const messagesWithPoll = SqliteClient.executeSql.apply(
1818
null,
1919
createSelectQuery('messages', ['*'], {
2020
poll_id: poll.id,
@@ -34,14 +34,14 @@ export const updatePollMessage = ({
3434
id: message.id,
3535
}),
3636
);
37-
QuickSqliteClient.logger?.('info', 'updatePoll', {
37+
SqliteClient.logger?.('info', 'updatePoll', {
3838
message: storableMessage,
3939
poll: storablePoll,
4040
});
4141
}
4242

4343
if (flush) {
44-
QuickSqliteClient.executeSqlBatch(queries);
44+
SqliteClient.executeSqlBatch(queries);
4545
}
4646

4747
return queries;

‎package/yarn.lock‎

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

9314-
stream-chat@8.40.8:
9315-
version "8.40.8"
9316-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.40.8.tgz#0f5320bd8b03d1cbff377f8c7ae2f8afe24d0515"
9317-
integrity sha512-nYLvYAkrvXRzuPO52TIofNiInCkDdXrnBc/658297lC6hzrHNc87mmTht264BXmXLlpasTNP3rLKxR6MxhpgKg==
9314+
stream-chat@8.42.0:
9315+
version "8.42.0"
9316+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
9317+
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
93189318
dependencies:
93199319
"@babel/runtime" "^7.16.3"
93209320
"@types/jsonwebtoken" "~9.0.0"

0 commit comments

Comments
 (0)