IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-58008] Calls Mobile: Settings for DM/GM ringing (#27213)

Browse Source 
* prevent webapp from erasing new mobile notify props

* allow blank, will be used on mobile to default to desktop setting

* update snapshots

* Revert "update snapshots"

This reverts commit 0bcd515de8.

* Revert "allow blank, will be used on mobile to default to desktop setting"

This reverts commit 56e16e887f.

* Revert "prevent webapp from erasing new mobile notify props"

This reverts commit e983d7b8f4.

* simplify how we handle mobile notification props

* linting

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Christopher Poile 2024-06-06 15:32:01 -04:00 committed by GitHub
parent 65f7a623ce
commit 91741a7fa4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/channels/src/components/user_settings/notifications/user_settings_notifications.tsx
View File

@ -231,7 +231,7 @@ class NotificationsTab extends React.PureComponent<Props, State> {
}
handleSubmit = async () => {
const data: UserNotifyProps = {} as UserNotifyProps;
const data: UserNotifyProps = {...this.props.user.notify_props};
data.email = this.state.enableEmail;
data.desktop_sound = this.state.desktopSound;
data.calls_desktop_sound = this.state.callsDesktopSound;

2
webapp/platform/types/src/users.ts
View File

@ -28,6 +28,8 @@ export type UserNotifyProps = {
push_threads?: 'default' | 'all' | 'mention' | 'none';
auto_responder_active?: 'true' | 'false';
auto_responder_message?: string;
calls_mobile_sound?: 'true' | 'false' | '';
calls_mobile_notification_sound?: 'Dynamic' | 'Calm' | 'Urgent' | 'Cheerful' | '';
};
export type UserProfile = {