Skip to content

Commit 0c9e04b

Browse files
committed
chore: resolve conflicts from V8
2 parents 6a287f9 + 82c9c8f commit 0c9e04b

File tree

18 files changed

+734
-552
lines changed

18 files changed

+734
-552
lines changed

examples/SampleApp/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2667,4 +2667,4 @@ SPEC CHECKSUMS:
26672667

26682668
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d
26692669

2670-
COCOAPODS: 1.14.3
2670+
COCOAPODS: 1.16.2

examples/SampleApp/yarn.lock

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7614,9 +7614,10 @@ stream-chat@^9.2.0:
76147614
linkifyjs "^4.2.0"
76157615
ws "^8.18.1"
76167616

7617-
stream-chat@getstream/stream-chat-js#handle-command-injection:
7618-
version "0.0.0-development"
7619-
resolved "https://codeload.github.com/getstream/stream-chat-js/tar.gz/780c52cfc3cd7379273a9b8db34461fb935f568d"
7617+
stream-chat@^9.5.1:
7618+
version "9.5.1"
7619+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-9.5.1.tgz#b8260bc1d1470ae3c91d8c40d22f41e9c4523d7b"
7620+
integrity sha512-X9w22JfEp2cTggAwyt0gyvwe8VBy1qvJENliNen/2FJDpS3k6PCaeSO6MHNXz3c0Qy21hqxuu8/b32jCSe4LSA==
76207621
dependencies:
76217622
"@types/jsonwebtoken" "^9.0.8"
76227623
"@types/ws" "^8.5.14"

examples/TypeScriptMessaging/ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,7 +2329,7 @@ SPEC CHECKSUMS:
23292329
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
23302330
glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
23312331
hermes-engine: b417d2b2aee3b89b58e63e23a51e02be91dc876d
2332-
op-sqlite: 2e34a191af7e843608357671c94a6e2befd4b986
2332+
op-sqlite: c33561ea312a2ae38aae032fd3a42635dc6b57e8
23332333
RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82
23342334
RCTDeprecation: b2eecf2d60216df56bc5e6be5f063826d3c1ee35
23352335
RCTRequired: 78522de7dc73b81f3ed7890d145fa341f5bb32ea
@@ -2404,9 +2404,9 @@ SPEC CHECKSUMS:
24042404
RNShare: 56b5431c60e1e9ee167191f4f327471af1c2941a
24052405
RNSVG: 8126581b369adf6a0004b6a6cab1a55e3002d5b0
24062406
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2407-
stream-chat-react-native: 54f4c8dafb167d76657b49f8a27ee6dacc925eb8
2407+
stream-chat-react-native: 29e40497a833dc204a6583a967dd6e4e105e0a0a
24082408
Yoga: afd04ff05ebe0121a00c468a8a3c8080221cb14c
24092409

24102410
PODFILE CHECKSUM: 6b7a4b74915b42bfe4ffddaf67cbf5e7a2bfeab3
24112411

2412-
COCOAPODS: 1.16.2
2412+
COCOAPODS: 1.14.3

examples/TypeScriptMessaging/yarn.lock

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6958,7 +6958,7 @@ [email protected]:
69586958
version "0.0.0"
69596959
uid ""
69606960

6961-
stream-chat@^9.2.0, stream-chat@^9.3.0:
6961+
stream-chat@^9.2.0:
69626962
version "9.3.0"
69636963
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-9.3.0.tgz#35ca4db9e841eb92d07413ae156de0500ad77b23"
69646964
integrity sha512-S73B3HrvmQvJjq58Zjo50vh74juhsWsVRpT+OBjGAxSGxlA+ITkZ3vKs8Y/r2eDK7mBTMmX5QCruFaDJH5dRuw==
@@ -6973,6 +6973,20 @@ stream-chat@^9.2.0, stream-chat@^9.3.0:
69736973
linkifyjs "^4.2.0"
69746974
ws "^8.18.1"
69756975

6976+
stream-chat@getstream/stream-chat-js#handle-command-injection:
6977+
version "0.0.0-development"
6978+
resolved "https://codeload.github.com/getstream/stream-chat-js/tar.gz/780c52cfc3cd7379273a9b8db34461fb935f568d"
6979+
dependencies:
6980+
"@types/jsonwebtoken" "^9.0.8"
6981+
"@types/ws" "^8.5.14"
6982+
axios "^1.6.0"
6983+
base64-js "^1.5.1"
6984+
form-data "^4.0.0"
6985+
isomorphic-ws "^5.0.0"
6986+
jsonwebtoken "^9.0.2"
6987+
linkifyjs "^4.2.0"
6988+
ws "^8.18.1"
6989+
69766990
strict-uri-encode@^2.0.0:
69776991
version "2.0.0"
69786992
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"

package/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"path": "0.12.7",
7979
"react-native-markdown-package": "1.8.2",
8080
"react-native-url-polyfill": "^1.3.0",
81-
"stream-chat": "^9.3.0",
81+
"stream-chat": "^9.5.1",
8282
"use-sync-external-store": "^1.4.0"
8383
},
8484
"peerDependencies": {

package/src/components/AutoCompleteInput/AutoCompleteInput.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ type AutoCompleteInputPropsWithContext = TextInputProps &
4242
type AutoCompleteInputProps = Partial<AutoCompleteInputPropsWithContext>;
4343

4444
const textComposerStateSelector = (state: TextComposerState) => ({
45-
command: state.command,
45+
// TODO: Comment out once the commands PR has been merged on the LLC
46+
// command: state.command,
47+
command: null,
4648
text: state.text,
4749
});
4850

package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageStatus.test.js.snap

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,55 @@ exports[`MessageStatus should render message status with read by container 1`] =
121121
</RNSVGSvgView>
122122
</View>
123123
</View>
124+
<View
125+
enablePanDownToClose={true}
126+
handleComponent={[Function]}
127+
handleHeight={20}
128+
index={-1}
129+
onChange={[Function]}
130+
snapPoints={
131+
[
132+
600.3000000000001,
133+
1334,
134+
]
135+
}
136+
>
137+
<RCTScrollView
138+
contentContainerStyle={
139+
[
140+
{
141+
"flexGrow": 1,
142+
},
143+
{
144+
"backgroundColor": "#FFFFFF",
145+
},
146+
{},
147+
{
148+
"opacity": 1,
149+
},
150+
]
151+
}
152+
data={[]}
153+
getItem={[Function]}
154+
getItemCount={[Function]}
155+
keyExtractor={[Function]}
156+
onContentSizeChange={[Function]}
157+
onEndReached={[Function]}
158+
onLayout={[Function]}
159+
onMomentumScrollBegin={[Function]}
160+
onMomentumScrollEnd={[Function]}
161+
onScroll={[Function]}
162+
onScrollBeginDrag={[Function]}
163+
onScrollEndDrag={[Function]}
164+
removeClippedSubviews={false}
165+
renderItem={[Function]}
166+
scrollEventThrottle={0.0001}
167+
stickyHeaderIndices={[]}
168+
testID="attachment-picker-list"
169+
viewabilityConfigCallbackPairs={[]}
170+
>
171+
<View />
172+
</RCTScrollView>
173+
</View>
124174
</View>
125175
`;

package/src/components/MessageInput/InputButtons.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ export type InputButtonsWithContextProps = Pick<
3535
Pick<OwnCapabilitiesContextValue, 'uploadFile'>;
3636

3737
const textComposerStateSelector = (state: TextComposerState) => ({
38-
command: state.command,
38+
// TODO: Comment out once the commands PR has been merged on the LLC
39+
// command: state.command,
40+
command: null,
3941
hasText: !!state.text,
4042
});
4143

package/src/components/MessageInput/MessageInput.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ type MessageInputPropsWithContext = Partial<
173173
Pick<MessageComposerAPIContextValue, 'clearEditingState'> & { editing: boolean };
174174

175175
const textComposerStateSelector = (state: TextComposerState) => ({
176-
command: state.command,
176+
// TODO: Comment out once the commands PR has been merged on the LLC
177+
// command: state.command,
178+
command: null,
177179
hasText: !!state.text,
178180
mentionedUsers: state.mentionedUsers,
179181
suggestions: state.suggestions,
@@ -378,7 +380,7 @@ const MessageInputWithContext = (props: MessageInputPropsWithContext) => {
378380
const showSendingButton = hasText || attachments.length;
379381

380382
const isSendingButtonVisible = useMemo(() => {
381-
return asyncAudioEnabled && showSendingButton && !recording;
383+
return asyncAudioEnabled ? showSendingButton && !recording : true;
382384
}, [asyncAudioEnabled, recording, showSendingButton]);
383385

384386
const micPositionX = useSharedValue(0);

package/src/components/MessageInput/SendButton.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ export type SendButtonProps = Partial<Pick<MessageInputContextValue, 'sendMessag
2020
disabled: boolean;
2121
};
2222

23+
// TODO: Comment out once the commands PR has been merged on the LLC
24+
// @ts-ignore
2325
const textComposerStateSelector = (state: TextComposerState) => ({
24-
command: state.command,
26+
// TODO: Comment out once the commands PR has been merged on the LLC
27+
// command: state.command,
28+
command: null,
2529
});
2630

2731
export const SendButton = (props: SendButtonProps) => {

0 commit comments

Comments
 (0)