Skip to content

feat: add message of the day to general settings #176

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

Open
Sharmyn28 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: add message of the day to general settings #176

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
710c860
feat: add message of the day to general settings
Sharmyn28 Aug 22, 2023
693769c
Merge branch 'master' into DHIS2-12630
Sharmyn28 Dec 12, 2023
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
6 changes: 6 additions & 0 deletions src/pages/General/GeneralSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
EncryptDB,
MatomoId,
MatomoUrl,
MessageOfDay,
ReservedValues,
ShareScreen,
SmsGateway,
Expand Down Expand Up @@ -110,6 +111,11 @@ const GeneralSettings = () => {
onChange={setSettings}
disabled={disable}
/>
<MessageOfDay
value={settings}
onChange={setSettings}
disabled={disable}
/>
<EncryptDB
value={settings}
onChange={setSettings}
Expand Down
1 change: 1 addition & 0 deletions src/pages/General/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export const createInitialValues = (prevGeneralDetails) => ({
encryptDB: prevGeneralDetails.encryptDB || defaultEncryptDB,
allowScreenCapture:
prevGeneralDetails.allowScreenCapture || defaultShareScreen,
messageOfTheDay: prevGeneralDetails.messageOfTheDay,
})

const validReservedValue = (value) => {
Expand Down