Skip to content

Commit f19ac4f

Browse files
authored
[CLNP-6305] Stabilization bug-fix (#1310)
Fixes [CLNP-6305](https://sendbird.atlassian.net/browse/CLNP-6305) ### Checklist Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If unsure, ask the members. This is a reminder of what we look for before merging your code. - [x] **All tests pass locally with my changes** - [ ] **I have added tests that prove my fix is effective or that my feature works** - [ ] **Public components / utils / props are appropriately exported** - [ ] I have added necessary documentation (if appropriate) ## External Contributions This project is not yet set up to accept pull requests from external contributors. If you have a pull request that you believe should be accepted, please contact the Developer Relations team <[email protected]> with details and we'll evaluate if we can set up a [CLA](https://en.wikipedia.org/wiki/Contributor_License_Agreement) to allow for the contribution. [CLNP-6305]: https://sendbird.atlassian.net/browse/CLNP-6305?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
1 parent 4d6e55e commit f19ac4f

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"react-dom": "^16.8.6 || ^17.0.0 || ^18.0.0 || ^19.0.0"
7171
},
7272
"dependencies": {
73-
"@sendbird/chat": "^4.16.2",
73+
"@sendbird/chat": "^4.16.4",
7474
"@sendbird/react-uikit-message-template-view": "0.0.2",
7575
"@sendbird/uikit-tools": "0.0.2",
7676
"css-vars-ponyfill": "^2.3.2",

src/lib/Sendbird/__tests__/useSendbird.spec.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe('useSendbird', () => {
6767
});
6868

6969
const sdkStore = mockStore.getState().stores.sdkStore;
70-
expect(sdkStore.sdk).toBeNull();
70+
expect(sdkStore.sdk).toStrictEqual({});
7171
expect(sdkStore.initialized).toBe(false);
7272
expect(sdkStore.loading).toBe(false);
7373
});
@@ -129,7 +129,7 @@ describe('useSendbird', () => {
129129
});
130130

131131
const userStore = mockStore.getState().stores.userStore;
132-
expect(userStore.user).toBeNull();
132+
expect(userStore.user).toStrictEqual({});
133133
expect(userStore.initialized).toBe(false);
134134
});
135135

@@ -318,8 +318,8 @@ describe('useSendbird', () => {
318318
const sdkStore = mockStore.getState().stores.sdkStore;
319319
const userStore = mockStore.getState().stores.userStore;
320320

321-
expect(sdkStore.sdk).toBeNull();
322-
expect(userStore.user).toBeNull();
321+
expect(sdkStore.sdk).toStrictEqual({});
322+
expect(userStore.user).toStrictEqual({});
323323
});
324324

325325
it('should trigger onConnected event handler after successful connection', async () => {
@@ -398,8 +398,8 @@ describe('useSendbird', () => {
398398
const sdkStore = mockStore.getState().stores.sdkStore;
399399
const userStore = mockStore.getState().stores.userStore;
400400

401-
expect(sdkStore.sdk).toBeNull();
402-
expect(userStore.user).toBeNull();
401+
expect(sdkStore.sdk).toStrictEqual({});
402+
expect(userStore.user).toStrictEqual({});
403403

404404
expect(mockLogger.error).toHaveBeenCalledWith(
405405
'SendbirdProvider | useSendbird/connect failed',

src/lib/Sendbird/context/hooks/useSendbird.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { SendbirdError, User } from '@sendbird/chat';
44

55
import { SendbirdContext } from '../SendbirdContext';
66
import { LoggerInterface } from '../../../Logger';
7-
import { MessageTemplatesInfo, SendbirdState, WaitingTemplateKeyData } from '../../types';
7+
import { MessageTemplatesInfo, SdkStore, SendbirdState, WaitingTemplateKeyData } from '../../types';
88
import { initSDK, setupSDK, updateAppInfoStore, updateSdkStore, updateUserStore } from '../../utils';
99

1010
const NO_CONTEXT_ERROR = 'No sendbird state value available. Make sure you are rendering `<SendbirdProvider>` at the top of your app.';
@@ -113,7 +113,7 @@ export const useSendbird = () => {
113113
resetSdk: () => {
114114
store.setState((state): SendbirdState => (
115115
updateSdkStore(state, {
116-
sdk: null,
116+
sdk: {} as SdkStore['sdk'],
117117
initialized: false,
118118
loading: false,
119119
error: false,
@@ -136,7 +136,7 @@ export const useSendbird = () => {
136136
updateUserStore(state, {
137137
initialized: false,
138138
loading: false,
139-
user: null,
139+
user: {} as User,
140140
})
141141
));
142142
},

src/modules/Thread/components/ParentMessageInfo/ParentMessageInfoItem.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ export default function ParentMessageInfoItem({
8181
// For MultipleFilesMessage only.
8282
const statefulFileInfoList = useFileInfoListWithUploaded(message);
8383
const isMentionedMessage = isMentionEnabled
84+
&& message?.isUserMessage()
8485
&& message?.mentionedMessageTemplate?.length > 0
8586
&& message?.mentionedUsers
8687
&& message.mentionedUsers.length > 0;

yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -2747,9 +2747,9 @@ __metadata:
27472747
languageName: node
27482748
linkType: hard
27492749

2750-
"@sendbird/chat@npm:^4.16.2":
2751-
version: 4.16.2
2752-
resolution: "@sendbird/chat@npm:4.16.2"
2750+
"@sendbird/chat@npm:^4.16.4":
2751+
version: 4.16.4
2752+
resolution: "@sendbird/chat@npm:4.16.4"
27532753
peerDependencies:
27542754
"@react-native-async-storage/async-storage": ^1.17.6
27552755
react-native-mmkv: ^2.0.0
@@ -2758,7 +2758,7 @@ __metadata:
27582758
optional: true
27592759
react-native-mmkv:
27602760
optional: true
2761-
checksum: 8866fa3285348e723db6c2e68abf7d42c3835656b79c3d791477cfd21da7c611b15a15578cf763d8c2f57e15e9be441ef314df7b7ae63fabcb9f16da9cb9ef69
2761+
checksum: 8d552619fc72f507e7c926a55e9df8a5bc87e03ebfc2cb667bdcf1081a419516706c6d2f64af2d3f8799ad4b7b4cb297b3df8faaef1255e2588c88806459778b
27622762
languageName: node
27632763
linkType: hard
27642764

@@ -2803,7 +2803,7 @@ __metadata:
28032803
"@rollup/plugin-node-resolve": ^15.2.3
28042804
"@rollup/plugin-replace": ^5.0.4
28052805
"@rollup/plugin-typescript": ^11.1.5
2806-
"@sendbird/chat": ^4.16.2
2806+
"@sendbird/chat": ^4.16.4
28072807
"@sendbird/react-uikit-message-template-view": 0.0.2
28082808
"@sendbird/uikit-tools": 0.0.2
28092809
"@storybook/addon-essentials": ^8.5.0

0 commit comments

Comments
 (0)