Skip to content

Commit aebea34

Browse files
authored
fix: use global disableUserProfile if each context's one is defined (#639)
Resolves https://sendbird.atlassian.net/browse/UIKIT-4139 Put a fallback value for `disableUserProfile` where gets the value from `UserProfileContext` so the global config can also be used.
1 parent c102cdd commit aebea34

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/modules/Channel/context/ChannelProvider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ const ChannelProvider: React.FC<ChannelContextProps> = (props: ChannelContextPro
486486
toggleReaction,
487487
}}>
488488
<UserProfileProvider
489-
disableUserProfile={props?.disableUserProfile}
489+
disableUserProfile={props?.disableUserProfile ?? config?.disableUserProfile}
490490
renderUserProfile={props?.renderUserProfile}
491491
onUserProfileMessage={onUserProfileMessage}
492492
>

src/modules/ChannelList/context/ChannelListProvider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ const ChannelListProvider: React.FC<ChannelListProviderProps> = (props: ChannelL
366366
isMessageReceiptStatusEnabled: (isMessageReceiptStatusEnabled !== null) ? isMessageReceiptStatusEnabled : isMessageReceiptStatusEnabledOnChannelList,
367367
}}>
368368
<UserProfileProvider
369-
disableUserProfile={userDefinedDisableUserProfile}
369+
disableUserProfile={userDefinedDisableUserProfile ?? config?.disableUserProfile}
370370
renderUserProfile={userDefinedRenderProfile}
371371
onUserProfileMessage={onUserProfileMessage}
372372
>

src/modules/ChannelSettings/context/ChannelSettingsProvider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const ChannelSettingsProvider: React.FC<ChannelSettingsContextProps> = (props: C
130130
}}>
131131
<UserProfileProvider
132132
renderUserProfile={props?.renderUserProfile}
133-
disableUserProfile={props?.disableUserProfile}
133+
disableUserProfile={props?.disableUserProfile ?? config?.disableUserProfile}
134134
onUserProfileMessage={onUserProfileMessage}
135135
>
136136
<div className={`sendbird-channel-settings ${className}`}>

src/modules/OpenChannel/context/OpenChannelProvider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ const OpenChannelProvider: React.FC<OpenChannelProviderProps> = (props: OpenChan
312312
<UserProfileProvider
313313
isOpenChannel
314314
renderUserProfile={props?.renderUserProfile}
315-
disableUserProfile={props?.disableUserProfile}
315+
disableUserProfile={props?.disableUserProfile ?? config?.disableUserProfile}
316316
>
317317
{children}
318318
</UserProfileProvider>

src/modules/OpenChannelSettings/context/OpenChannelSettingsProvider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const OpenChannelSettingsProvider: React.FC<OpenChannelSettingsContextProps> = (
155155
<UserProfileProvider
156156
isOpenChannel
157157
renderUserProfile={props?.renderUserProfile}
158-
disableUserProfile={props?.disableUserProfile}
158+
disableUserProfile={props?.disableUserProfile ?? globalStore?.config?.disableUserProfile}
159159
>
160160
{children}
161161
</UserProfileProvider>

src/modules/Thread/context/ThreadProvider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ export const ThreadProvider: React.FC<ThreadProviderProps> = (props: ThreadProvi
225225
>
226226
{/* UserProfileProvider */}
227227
<UserProfileProvider
228-
disableUserProfile={disableUserProfile}
228+
disableUserProfile={disableUserProfile ?? config.disableUserProfile}
229229
renderUserProfile={renderUserProfile}
230230
onUserProfileMessage={onUserProfileMessage}
231231
>

0 commit comments

Comments
 (0)