From 0b591264b2174ade27417dc7c77d1eb00763555f Mon Sep 17 00:00:00 2001
From: Harshil Sharma <harshilsharma63@gmail.com>
Date: Fri, 16 Jun 2023 16:02:53 +0530
Subject: [PATCH] WIP

---
 app/queries/servers/post.ts                              | 2 +-
 app/screens/post_priority_picker/index.ts                | 5 +++++
 .../post_priority_picker/post_priority_picker.tsx        | 9 ++++++++-
 app/screens/post_priority_picker/utils.ts                | 4 ++--
 assets/base/i18n/en.json                                 | 4 ++--
 package-lock.json                                        | 2 +-
 types/api/config.d.ts                                    | 1 +
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/queries/servers/post.ts b/app/queries/servers/post.ts
index 38e52b2b7..d504bd079 100644
--- a/app/queries/servers/post.ts
+++ b/app/queries/servers/post.ts
@@ -9,7 +9,7 @@ import {MM_TABLES} from '@constants/database';
 
 import {queryGroupsByNames} from './group';
 import {querySavedPostsPreferences} from './preference';
-import {getConfigValue, observeConfigBooleanValue} from './system';
+import {getConfigValue, observeConfigBooleanValue, observeConfigIntValue, observeConfigValue} from './system';
 import {queryUsersByUsername, observeUser, observeCurrentUser} from './user';
 
 import type PostModel from '@typings/database/models/servers/post';
diff --git a/app/screens/post_priority_picker/index.ts b/app/screens/post_priority_picker/index.ts
index 810b2e061..3fe86ba5b 100644
--- a/app/screens/post_priority_picker/index.ts
+++ b/app/screens/post_priority_picker/index.ts
@@ -6,14 +6,19 @@ import withObservables from '@nozbe/with-observables';
 
 import {observeIsPostAcknowledgementsEnabled, observePersistentNotificationsEnabled} from '@queries/servers/post';
 
+import {observeConfigIntValue} from '../../queries/servers/system';
+
 import PostPriorityPicker from './post_priority_picker';
 
 import type {Database} from '@nozbe/watermelondb';
 
 const enhanced = withObservables([], ({database}: {database: Database}) => {
+    const persistentNotificationInterval = observeConfigIntValue(database, 'PersistentNotificationIntervalMinutes');
+
     return {
         isPostAcknowledgementEnabled: observeIsPostAcknowledgementsEnabled(database),
         isPersistenNotificationsEnabled: observePersistentNotificationsEnabled(database),
+        persistentNotificationInterval,
     };
 });
 
diff --git a/app/screens/post_priority_picker/post_priority_picker.tsx b/app/screens/post_priority_picker/post_priority_picker.tsx
index 01a8d065f..65e197938 100644
--- a/app/screens/post_priority_picker/post_priority_picker.tsx
+++ b/app/screens/post_priority_picker/post_priority_picker.tsx
@@ -35,6 +35,7 @@ type Props = {
     postPriority: PostPriority;
     updatePostPriority: (data: PostPriority) => void;
     closeButtonId: string;
+    persistentNotificationInterval: number;
 };
 
 const TITLE_HEIGHT = 30; // typography 600 line height
@@ -83,6 +84,7 @@ const PostPriorityPicker = ({
     componentId,
     isPostAcknowledgementEnabled,
     isPersistenNotificationsEnabled,
+    persistentNotificationInterval,
     postPriority,
     updatePostPriority,
     closeButtonId,
@@ -201,7 +203,12 @@ const PostPriorityPicker = ({
                                 <PickerOption
                                     action={handleUpdatePersistentNotifications}
                                     label={intl.formatMessage(labels.persistentNotifications.label)}
-                                    description={intl.formatMessage(labels.persistentNotifications.description)}
+                                    description={intl.formatMessage(
+                                        labels.persistentNotifications.description,
+                                        {
+                                            interval: persistentNotificationInterval,
+                                        },
+                                    )}
                                     icon='bell-ring-outline'
                                     type='toggle'
                                     selected={data.persistent_notifications}
diff --git a/app/screens/post_priority_picker/utils.ts b/app/screens/post_priority_picker/utils.ts
index f2df2cb40..26c1e0b0f 100644
--- a/app/screens/post_priority_picker/utils.ts
+++ b/app/screens/post_priority_picker/utils.ts
@@ -29,7 +29,7 @@ export const labels = {
         },
         description: {
             id: t('post_priority.picker.label.request_ack.description'),
-            defaultMessage: 'An acknowledgement button appears with your message.',
+            defaultMessage: 'An acknowledgement button will appear with your message',
         },
     },
     persistentNotifications: {
@@ -39,7 +39,7 @@ export const labels = {
         },
         description: {
             id: t('post_priority.picker.label.persistent_notifications.description'),
-            defaultMessage: 'Recipients are notified every five minutes until they acknowledge or reply.',
+            defaultMessage: 'Recipients are notified every {interval, plural, one {minute} other {{interval} minutes}} minutes until they acknowledge or reply.',
         },
     },
 };
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index d3f8a7ca9..be1711805 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -844,9 +844,9 @@
   "post_priority.picker.cancel": "Cancel",
   "post_priority.picker.label.important": "Important",
   "post_priority.picker.label.persistent_notifications": "Send persistent notifications",
-  "post_priority.picker.label.persistent_notifications.description": "Recipients are notified every five minutes until they acknowledge or reply.",
+  "post_priority.picker.label.persistent_notifications.description": "Recipients are notified every {interval, plural, one {minute} other {{interval} minutes}} until they acknowledge or reply.",
   "post_priority.picker.label.request_ack": "Request acknowledgement",
-  "post_priority.picker.label.request_ack.description": "Recipients are notified every five minutes until they acknowledge or reply.",
+  "post_priority.picker.label.request_ack.description": "An acknowledgement button will appear with your message",
   "post_priority.picker.label.standard": "Standard",
   "post_priority.picker.label.urgent": "Urgent",
   "post_priority.picker.title": "Message priority",
diff --git a/package-lock.json b/package-lock.json
index 7e47b3044..2f5de1b3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26182,7 +26182,7 @@
       "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
       "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
       "requires": {
-        "@types/react": "^18.0.35",
+        "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
       }
     },
diff --git a/types/api/config.d.ts b/types/api/config.d.ts
index b2dc94f0b..a4c0d54c3 100644
--- a/types/api/config.d.ts
+++ b/types/api/config.d.ts
@@ -159,6 +159,7 @@ interface ClientConfig {
     PersistentNotificationMaxRecipients: string;
     PersistentNotificationInterval: string;
     AllowPersistentNotificationsForGuests: string;
+    PersistentNotificationIntervalMinutes: string;
     PrivacyPolicyLink: string;
     ReportAProblemLink: string;
     RequireEmailVerification: string;