From 6e135cdd36ef5335598de237ab54301414115561 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Tue, 26 Dec 2023 13:02:55 +0500
Subject: [PATCH] mobile: sort reminders

---
 .../app/components/list-items/headers/section-header.js      | 5 ++---
 apps/mobile/app/components/sheets/sort/index.js              | 5 +++++
 apps/mobile/app/stores/use-reminder-store.ts                 | 5 ++++-
 apps/mobile/app/utils/constants.js                           | 3 ++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/mobile/app/components/list-items/headers/section-header.js b/apps/mobile/app/components/list-items/headers/section-header.js
index c026e36518..dc84ecc207 100644
--- a/apps/mobile/app/components/list-items/headers/section-header.js
+++ b/apps/mobile/app/components/list-items/headers/section-header.js
@@ -101,7 +101,7 @@ export const SectionHeader = React.memo(
             alignItems: "center"
           }}
         >
-          {index === 0 && (
+          {index === 0 ? (
             <>
               <Button
                 onPress={() => {
@@ -109,7 +109,6 @@ export const SectionHeader = React.memo(
                     component: <Sort screen={screen} type={type} />
                   });
                 }}
-                hidden={screen === "Reminders"}
                 tooltipText="Change sorting of items in list"
                 fwdRef={sortRef}
                 title={groupBy}
@@ -160,7 +159,7 @@ export const SectionHeader = React.memo(
                 size={SIZE.lg - 2}
               />
             </>
-          )}
+          ) : null}
         </View>
       </View>
     );
diff --git a/apps/mobile/app/components/sheets/sort/index.js b/apps/mobile/app/components/sheets/sort/index.js
index b85ff3673c..64dbbc2b42 100644
--- a/apps/mobile/app/components/sheets/sort/index.js
+++ b/apps/mobile/app/components/sheets/sort/index.js
@@ -88,10 +88,14 @@ const Sort = ({ type, screen }) => {
               ? groupOptions.groupBy === "abc" ||
                 groupOptions.sortBy === "title"
                 ? "A - Z"
+                : groupOptions.sortBy === "dueDate"
+                ? "Earliest first"
                 : "Old - New"
               : groupOptions.groupBy === "abc" ||
                 groupOptions.sortBy === "title"
               ? "Z - A"
+              : groupOptions.sortBy === "dueDate"
+              ? "Latest first"
               : "New - Old"
           }
           icon={
@@ -142,6 +146,7 @@ const Sort = ({ type, screen }) => {
           />
         ) : (
           Object.keys(SORT).map((item) =>
+            (item === "dueDate" && screen !== "Reminders") ||
             (item === "title" && groupOptions.groupBy !== "none") ||
             ((screen !== "Tags" || screen !== "Reminders") &&
               item === "dateModified") ||
diff --git a/apps/mobile/app/stores/use-reminder-store.ts b/apps/mobile/app/stores/use-reminder-store.ts
index 45d77fd2cd..f5fb8b176c 100644
--- a/apps/mobile/app/stores/use-reminder-store.ts
+++ b/apps/mobile/app/stores/use-reminder-store.ts
@@ -32,7 +32,10 @@ export const useReminderStore = create<ReminderStore>((set) => ({
   reminders: [],
   setReminders: () => {
     set({
-      reminders: groupReminders((db.reminders?.all as Reminder[]) || [])
+      reminders: groupReminders(
+        (db.reminders?.all as Reminder[]) || [],
+        db.settings?.getGroupOptions("reminders")
+      )
     });
   },
   cleareReminders: () => set({ reminders: [] })
diff --git a/apps/mobile/app/utils/constants.js b/apps/mobile/app/utils/constants.js
index 03a80b55e3..40024e0589 100644
--- a/apps/mobile/app/utils/constants.js
+++ b/apps/mobile/app/utils/constants.js
@@ -41,7 +41,8 @@ export const SORT = {
   dateModified: "Date modified",
   dateEdited: "Date edited",
   dateCreated: "Date created",
-  title: "Title"
+  title: "Title",
+  dueDate: "Due date"
 };
 
 export const itemSkus = [