Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
RocketChat
Rocket.Chat.ReactNative
Commits
1ec4046a
Unverified
Commit
1ec4046a
authored
Nov 18, 2021
by
Matheus Barbosa Silva
Committed by
GitHub
Nov 18, 2021
Browse files
[FIX] Push notifications user preference not syncing correctly (#3494)
Co-authored-by:
Diego Mello
<
diegolmello@gmail.com
>
parent
cedca3f0
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/views/UserNotificationPreferencesView/index.tsx
View file @
1ec4046a
...
...
@@ -22,12 +22,12 @@ const styles = StyleSheet.create({
}
});
type
TKey
=
'
desktopNotifications
'
|
'
mobile
Notifications
'
|
'
emailNotificationMode
'
;
type
TKey
=
'
desktopNotifications
'
|
'
push
Notifications
'
|
'
emailNotificationMode
'
;
interface
IUserNotificationPreferencesViewState
{
preferences
:
{
desktopNotifications
?:
string
;
mobile
Notifications
?:
string
;
push
Notifications
?:
string
;
emailNotificationMode
?:
string
;
};
loading
:
boolean
;
...
...
@@ -137,8 +137,8 @@ class UserNotificationPreferencesView extends React.Component<
<
List
.
Item
title
=
'Alert'
testID
=
'user-notification-preference-view-push-notification'
onPress
=
{
(
title
:
string
)
=>
this
.
pickerSelection
(
title
,
'
mobile
Notifications
'
)
}
right
=
{
()
=>
this
.
renderPickerOption
(
'
mobile
Notifications
'
)
}
onPress
=
{
(
title
:
string
)
=>
this
.
pickerSelection
(
title
,
'
push
Notifications
'
)
}
right
=
{
()
=>
this
.
renderPickerOption
(
'
push
Notifications
'
)
}
/>
<
List
.
Separator
/>
<
List
.
Info
info
=
'Push_Notifications_Alert_Info'
/>
...
...
app/views/UserNotificationPreferencesView/options.ts
View file @
1ec4046a
...
...
@@ -19,7 +19,7 @@ const commonOptions = [
export
const
OPTIONS
=
{
desktopNotifications
:
commonOptions
,
mobile
Notifications
:
commonOptions
,
push
Notifications
:
commonOptions
,
emailNotificationMode
:
[
{
label
:
'
Email_Notification_Mode_All
'
,
...
...
e2e/docker/docker-entrypoint-initdb.d/rocketchat_permissions.js
View file @
1ec4046a
...
...
@@ -80,7 +80,7 @@ db.getCollection("rocketchat_permissions").insert({"_id":"change-setting-Account
db
.
getCollection
(
"
rocketchat_permissions
"
).
insert
({
"
_id
"
:
"
change-setting-Accounts_Default_User_Preferences_hideUsernames
"
,
"
_updatedAt
"
:
new
Date
(
1591734395388
),
"
group
"
:
"
Accounts
"
,
"
groupPermissionId
"
:
"
change-setting-Accounts
"
,
"
level
"
:
"
settings
"
,
"
roles
"
:[],
"
section
"
:
"
Accounts_Default_User_Preferences
"
,
"
sectionPermissionId
"
:
"
change-setting-Accounts_Default_User_Preferences
"
,
"
settingId
"
:
"
Accounts_Default_User_Preferences_hideUsernames
"
,
"
sorter
"
:
NumberInt
(
60
)});
db
.
getCollection
(
"
rocketchat_permissions
"
).
insert
({
"
_id
"
:
"
change-setting-Accounts_Default_User_Preferences_idleTimeLimit
"
,
"
_updatedAt
"
:
new
Date
(
1591734395359
),
"
group
"
:
"
Accounts
"
,
"
groupPermissionId
"
:
"
change-setting-Accounts
"
,
"
level
"
:
"
settings
"
,
"
roles
"
:[],
"
section
"
:
"
Accounts_Default_User_Preferences
"
,
"
sectionPermissionId
"
:
"
change-setting-Accounts_Default_User_Preferences
"
,
"
settingId
"
:
"
Accounts_Default_User_Preferences_idleTimeLimit
"
,
"
sorter
"
:
NumberInt
(
48
)});
db
.
getCollection
(
"
rocketchat_permissions
"
).
insert
({
"
_id
"
:
"
change-setting-Accounts_Default_User_Preferences_messageViewMode
"
,
"
_updatedAt
"
:
new
Date
(
1591734395410
),
"
group
"
:
"
Accounts
"
,
"
groupPermissionId
"
:
"
change-setting-Accounts
"
,
"
level
"
:
"
settings
"
,
"
roles
"
:[],
"
section
"
:
"
Accounts_Default_User_Preferences
"
,
"
sectionPermissionId
"
:
"
change-setting-Accounts_Default_User_Preferences
"
,
"
settingId
"
:
"
Accounts_Default_User_Preferences_messageViewMode
"
,
"
sorter
"
:
NumberInt
(
71
)});
db
.
getCollection
(
"
rocketchat_permissions
"
).
insert
({
"
_id
"
:
"
change-setting-Accounts_Default_User_Preferences_
mobile
Notifications
"
,
"
_updatedAt
"
:
new
Date
(
1591734395373
),
"
group
"
:
"
Accounts
"
,
"
groupPermissionId
"
:
"
change-setting-Accounts
"
,
"
level
"
:
"
settings
"
,
"
roles
"
:[],
"
section
"
:
"
Accounts_Default_User_Preferences
"
,
"
sectionPermissionId
"
:
"
change-setting-Accounts_Default_User_Preferences
"
,
"
settingId
"
:
"
Accounts_Default_User_Preferences_
mobile
Notifications
"
,
"
sorter
"
:
NumberInt
(
53
)});
db
.
getCollection
(
"
rocketchat_permissions
"
).
insert
({
"
_id
"
:
"
change-setting-Accounts_Default_User_Preferences_
push
Notifications
"
,
"
_updatedAt
"
:
new
Date
(
1591734395373
),
"
group
"
:
"
Accounts
"
,
"
groupPermissionId
"
:
"
change-setting-Accounts
"
,
"
level
"
:
"
settings
"
,
"
roles
"
:[],
"
section
"
:
"
Accounts_Default_User_Preferences
"
,
"
sectionPermissionId
"
:
"
change-setting-Accounts_Default_User_Preferences
"
,
"
settingId
"
:
"
Accounts_Default_User_Preferences_
push
Notifications
"
,
"
sorter
"
:
NumberInt
(
53
)});
db
.
getCollection
(
"
rocketchat_permissions
"
).
insert
({
"
_id
"
:
"
change-setting-Accounts_Default_User_Preferences_muteFocusedConversations
"
,
"
_updatedAt
"
:
new
Date
(
1591734395420
),
"
group
"
:
"
Accounts
"
,
"
groupPermissionId
"
:
"
change-setting-Accounts
"
,
"
level
"
:
"
settings
"
,
"
roles
"
:[],
"
section
"
:
"
Accounts_Default_User_Preferences
"
,
"
sectionPermissionId
"
:
"
change-setting-Accounts_Default_User_Preferences
"
,
"
settingId
"
:
"
Accounts_Default_User_Preferences_muteFocusedConversations
"
,
"
sorter
"
:
NumberInt
(
75
)});
db
.
getCollection
(
"
rocketchat_permissions
"
).
insert
({
"
_id
"
:
"
change-setting-Accounts_Default_User_Preferences_newMessageNotification
"
,
"
_updatedAt
"
:
new
Date
(
1591734395417
),
"
group
"
:
"
Accounts
"
,
"
groupPermissionId
"
:
"
change-setting-Accounts
"
,
"
level
"
:
"
settings
"
,
"
roles
"
:[],
"
section
"
:
"
Accounts_Default_User_Preferences
"
,
"
sectionPermissionId
"
:
"
change-setting-Accounts_Default_User_Preferences
"
,
"
settingId
"
:
"
Accounts_Default_User_Preferences_newMessageNotification
"
,
"
sorter
"
:
NumberInt
(
74
)});
db
.
getCollection
(
"
rocketchat_permissions
"
).
insert
({
"
_id
"
:
"
change-setting-Accounts_Default_User_Preferences_newRoomNotification
"
,
"
_updatedAt
"
:
new
Date
(
1591734395415
),
"
group
"
:
"
Accounts
"
,
"
groupPermissionId
"
:
"
change-setting-Accounts
"
,
"
level
"
:
"
settings
"
,
"
roles
"
:[],
"
section
"
:
"
Accounts_Default_User_Preferences
"
,
"
sectionPermissionId
"
:
"
change-setting-Accounts_Default_User_Preferences
"
,
"
settingId
"
:
"
Accounts_Default_User_Preferences_newRoomNotification
"
,
"
sorter
"
:
NumberInt
(
73
)});
...
...
e2e/docker/docker-entrypoint-initdb.d/rocketchat_settings.js
View file @
1ec4046a
...
...
@@ -64,7 +64,7 @@ db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Pre
db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Preferences_hideUsernames","_updatedAt":new Date(1591734377818),"autocomplete":true,"blocked":false,"createdAt":new Date(1584022362944),"group":"Accounts","hidden":false,"i18nDescription":"Accounts_Default_User_Preferences_hideUsernames_Description","i18nLabel":"Hide_usernames","packageValue":false,"public":true,"secret":false,"section":"Accounts_Default_User_Preferences","sorter":NumberInt(60),"ts":new Date(1589465206154),"type":"boolean","value":false,"valueSource":"packageValue"});
db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Preferences_idleTimeLimit","_updatedAt":new Date(1591734377768),"autocomplete":true,"blocked":false,"createdAt":new Date(1584022362881),"group":"Accounts","hidden":false,"i18nDescription":"Accounts_Default_User_Preferences_idleTimeLimit_Description","i18nLabel":"Idle_Time_Limit","packageValue":NumberInt(300),"public":true,"secret":false,"section":"Accounts_Default_User_Preferences","sorter":NumberInt(48),"ts":new Date(1589465206085),"type":"int","value":NumberInt(300),"valueSource":"packageValue"});
db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Preferences_messageViewMode","_updatedAt":new Date(1591734377861),"autocomplete":true,"blocked":false,"createdAt":new Date(1584022362992),"group":"Accounts","hidden":false,"i18nDescription":"Accounts_Default_User_Preferences_messageViewMode_Description","i18nLabel":"MessageBox_view_mode","packageValue":NumberInt(0),"public":true,"secret":false,"section":"Accounts_Default_User_Preferences","sorter":NumberInt(71),"ts":new Date(1589465206214),"type":"select","value":NumberInt(0),"valueSource":"packageValue","values":[{"key":NumberInt(0),"i18nLabel":"Normal"},{"key":NumberInt(1),"i18nLabel":"Cozy"},{"key":NumberInt(2),"i18nLabel":"Compact"}]});
db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Preferences_
mobile
Notifications","_updatedAt":new Date(1591734377791),"autocomplete":true,"blocked":false,"createdAt":new Date(1584022362905),"group":"Accounts","hidden":false,"i18nDescription":"Accounts_Default_User_Preferences_
mobile
Notifications_Description","i18nLabel":"Accounts_Default_User_Preferences_
mobile
Notifications","packageValue":"all","public":true,"secret":false,"section":"Accounts_Default_User_Preferences","sorter":NumberInt(53),"ts":new Date(1589465206111),"type":"select","value":"all","valueSource":"packageValue","values":[{"key":"all","i18nLabel":"All_messages"},{"key":"mentions","i18nLabel":"Mentions"},{"key":"nothing","i18nLabel":"Nothing"}]});
db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Preferences_
push
Notifications","_updatedAt":new Date(1591734377791),"autocomplete":true,"blocked":false,"createdAt":new Date(1584022362905),"group":"Accounts","hidden":false,"i18nDescription":"Accounts_Default_User_Preferences_
push
Notifications_Description","i18nLabel":"Accounts_Default_User_Preferences_
push
Notifications","packageValue":"all","public":true,"secret":false,"section":"Accounts_Default_User_Preferences","sorter":NumberInt(53),"ts":new Date(1589465206111),"type":"select","value":"all","valueSource":"packageValue","values":[{"key":"all","i18nLabel":"All_messages"},{"key":"mentions","i18nLabel":"Mentions"},{"key":"nothing","i18nLabel":"Nothing"}]});
db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Preferences_muteFocusedConversations","_updatedAt":new Date(1591734377881),"autocomplete":true,"blocked":false,"createdAt":new Date(1584022363009),"group":"Accounts","hidden":false,"i18nDescription":"Accounts_Default_User_Preferences_muteFocusedConversations_Description","i18nLabel":"Mute_Focused_Conversations","packageValue":true,"public":true,"secret":false,"section":"Accounts_Default_User_Preferences","sorter":NumberInt(75),"ts":new Date(1589465206242),"type":"boolean","value":true,"valueSource":"packageValue"});
db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Preferences_newMessageNotification","_updatedAt":new Date(1591734377877),"autocomplete":true,"blocked":false,"createdAt":new Date(1584022363005),"group":"Accounts","hidden":false,"i18nDescription":"Accounts_Default_User_Preferences_newMessageNotification_Description","i18nLabel":"New_Message_Notification","packageValue":"chime","public":true,"secret":false,"section":"Accounts_Default_User_Preferences","sorter":NumberInt(74),"ts":new Date(1589465206236),"type":"select","value":"chime","valueSource":"packageValue","values":[{"key":"none","i18nLabel":"None"},{"key":"chime","i18nLabel":"Default"}]});
db.getCollection("rocketchat_settings").insert({"_id":"Accounts_Default_User_Preferences_newRoomNotification","_updatedAt":new Date(1591734377868),"autocomplete":true,"blocked":false,"createdAt":new Date(1584022363000),"group":"Accounts","hidden":false,"i18nDescription":"Accounts_Default_User_Preferences_newRoomNotification_Description","i18nLabel":"New_Room_Notification","packageValue":"door","public":true,"secret":false,"section":"Accounts_Default_User_Preferences","sorter":NumberInt(73),"ts":new Date(1589465206232),"type":"select","value":"door","valueSource":"packageValue","values":[{"key":"none","i18nLabel":"None"},{"key":"door","i18nLabel":"Default"}]});
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment