Skip to content

[pull] develop from RocketChat:develop #325

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
pull merged 2 commits into from
Jan 28, 2026
Merged

[pull] develop from RocketChat:develop #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ec7a9
chore: validateDOMNesting warning in Analytics Reports (#38336)
NAME-ASHWANIYADAV Jan 27, 2026
31d0c01
chore: unsafe type assertion in `CannedResponseForm` (#38341)
NAME-ASHWANIYADAV Jan 27, 2026
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
7 changes: 1 addition & 6 deletions apps/meteor/client/views/admin/viewLogs/AnalyticsReports.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ const AnalyticsReports = () => {
return (
<Box display='flex' flexDirection='column' overflow='hidden' height='100%'>
<Callout title={t('Server_logs_access_has_changed_callout_title')} mbe={16}>
<p>
<MarkdownText
variant='inline'
content={t('Server_logs_access_has_changed_callout_description', { docsUrl: links.go.logsDocs })}
/>
</p>
<MarkdownText variant='inline' content={t('Server_logs_access_has_changed_callout_description', { docsUrl: links.go.logsDocs })} />
</Callout>
<Box backgroundColor='light' p={20} pbe={28} mbe={16} borderRadius={4}>
<Box display='flex' flexDirection='row' alignItems='center' mbe={20}>
Expand Down
6 changes: 1 addition & 5 deletions apps/meteor/client/views/omnichannel/cannedResponses/components/CannedResponseForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,7 @@ const CannedResponseForm = () => {
)}
</Field>
<Field>
<Controller
name='tags'
control={control}
render={({ field: { value, onChange } }) => <Tags handler={onChange} tags={value as unknown as string[]} />} // FIXME: fix types
/>
<Controller name='tags' control={control} render={({ field: { value, onChange } }) => <Tags handler={onChange} tags={value} />} />
</Field>
{(hasManagerPermission || hasMonitorPermission) && (
<>
Expand Down
Loading