Skip to content

Next Release #2764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isekovanic merged 4 commits into from
Nov 7, 2024
Merged

Next Release #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe08bd7
fix: message disallowed indicator display (#2754)
isekovanic Nov 5, 2024
b9c49be
fix: native image picker poll control (#2762)
isekovanic Nov 7, 2024
ff53399
fix: check for channel validity before consuming config (#2760)
isekovanic Nov 7, 2024
5258a18
fix: receiverMessageBackgroundColor hotfix (#2763)
isekovanic Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package/src/components/ChannelPreview/hooks/useLatestMessagePreview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,8 @@ export const useLatestMessagePreview = <

useEffect(() => {
if (channelConfigExists) {
const read_events = channel.getConfig()?.read_events;
const read_events =
!channel.disconnected && !!channel?.id && channel.getConfig()?.read_events;
if (typeof read_events === 'boolean') {
setReadEvents(read_events);
}
Expand Down
2 changes: 1 addition & 1 deletion package/src/components/MessageInput/MessageInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ export const MessageInput = <
* Disable the message input if the channel is frozen, or the user doesn't have the capability to send a message.
* Enable it in frozen mode, if it the input has editing state.
*/
if (!editing && disabled && !ownCapabilities.sendMessage && SendMessageDisallowedIndicator) {
if ((disabled || !ownCapabilities.sendMessage) && !editing && SendMessageDisallowedIndicator) {
return <SendMessageDisallowedIndicator />;
}

Expand Down
8 changes: 4 additions & 4 deletions package/src/components/MessageInput/components/NativeAttachmentPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,17 @@ export const NativeAttachmentPicker = ({

// do not allow poll creation in threads
const buttons =
threadList && hasCreatePoll && ownCapabilities.sendPoll
? []
: [
!threadList && hasCreatePoll && ownCapabilities.sendPoll
? [
{
icon: <CreatePollIcon />,
id: 'Poll',
onPressHandler: () => {
openPollCreationDialog?.({ sendMessage });
},
},
];
]
: [];

if (hasImagePicker) {
buttons.push({
Expand Down
8 changes: 4 additions & 4 deletions package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ exports[`Thread should match thread snapshot 1`] = `
"overflow": "hidden",
},
{
"backgroundColor": "#FFFFFF",
"backgroundColor": "#F2F2F2",
"borderBottomLeftRadius": 0,
"borderBottomRightRadius": 16,
"borderColor": "#ECEBEB",
Expand Down Expand Up @@ -742,7 +742,7 @@ exports[`Thread should match thread snapshot 1`] = `
"overflow": "hidden",
},
{
"backgroundColor": "#FFFFFF",
"backgroundColor": "#F2F2F2",
"borderBottomLeftRadius": 0,
"borderBottomRightRadius": 16,
"borderColor": "#ECEBEB",
Expand Down Expand Up @@ -1068,7 +1068,7 @@ exports[`Thread should match thread snapshot 1`] = `
"overflow": "hidden",
},
{
"backgroundColor": "#FFFFFF",
"backgroundColor": "#F2F2F2",
"borderBottomLeftRadius": 0,
"borderBottomRightRadius": 16,
"borderColor": "#ECEBEB",
Expand Down Expand Up @@ -1422,7 +1422,7 @@ exports[`Thread should match thread snapshot 1`] = `
"overflow": "hidden",
},
{
"backgroundColor": "#FFFFFF",
"backgroundColor": "#F2F2F2",
"borderBottomLeftRadius": 0,
"borderBottomRightRadius": 16,
"borderColor": "#ECEBEB",
Expand Down
2 changes: 1 addition & 1 deletion package/src/contexts/themeContext/utils/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ export const defaultTheme: Theme = {
metaText: {
fontSize: 12,
},
receiverMessageBackgroundColor: Colors.white,
receiverMessageBackgroundColor: Colors.white_smoke,
replyBorder: {},
replyContainer: {},
senderMessageBackgroundColor: Colors.grey_gainsboro,
Expand Down