From 87a7eaa9a5f5965e8a3c6ad25e970ee555da89ac Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Tue, 15 Aug 2023 18:48:22 +0500
Subject: [PATCH] mobile: fix list not updating on change date sort

---
 apps/mobile/app/components/list/index.js  | 14 ++++++++------
 packages/common/src/hooks/use-time-ago.ts |  4 ++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/mobile/app/components/list/index.js b/apps/mobile/app/components/list/index.js
index d1292cf92..4178f50aa 100644
--- a/apps/mobile/app/components/list/index.js
+++ b/apps/mobile/app/components/list/index.js
@@ -53,15 +53,10 @@ const renderItems = {
 const RenderItem = ({ item, index, type, ...restArgs }) => {
   if (!item) return <View />;
   const Item = renderItems[item.itemType || item.type] || View;
-  const groupOptions = db.settings?.getGroupOptions(type);
-  const dateBy =
-    groupOptions.sortBy !== "title" ? groupOptions.sortBy : "dateEdited";
   const totalNotes = getTotalNotes(item);
-
   return (
     <Item
       item={item}
-      dateBy={dateBy}
       index={index}
       type={type}
       totalNotes={totalNotes}
@@ -103,6 +98,12 @@ const List = ({
     (type === "notes" && notesListMode === "compact") ||
     type === "notebooks" ||
     notebooksListMode === "compact";
+  const groupType =
+    screen === "Notes" ? "home" : screen === "Favorites" ? "favorites" : type;
+
+  const groupOptions = db.settings?.getGroupOptions(groupType);
+  const dateBy =
+    groupOptions.sortBy !== "title" ? groupOptions.sortBy : "dateEdited";
 
   const renderItem = React.useCallback(
     ({ item, index }) => (
@@ -111,6 +112,7 @@ const List = ({
         index={index}
         color={headerProps?.color}
         title={headerProps?.heading}
+        dateBy={dateBy}
         type={
           screen === "Notes"
             ? "home"
@@ -122,7 +124,7 @@ const List = ({
         isSheet={isSheet}
       />
     ),
-    [headerProps?.color, headerProps?.heading, screen, type, isSheet]
+    [headerProps?.color, headerProps?.heading, screen, type, isSheet, dateBy]
   );
 
   const _onRefresh = async () => {
diff --git a/packages/common/src/hooks/use-time-ago.ts b/packages/common/src/hooks/use-time-ago.ts
index 8bad90b13..44c6ba446 100644
--- a/packages/common/src/hooks/use-time-ago.ts
+++ b/packages/common/src/hooks/use-time-ago.ts
@@ -74,6 +74,10 @@ export function useTimeAgo(
 
   useEffect(() => {
     if (!live) return;
+    const value = getTimeAgo(datetime, locale);
+    onUpdate?.(value);
+    setTimeAgo(value);
+
     const reset = setInterval(() => {
       const value = getTimeAgo(datetime, locale);
       onUpdate?.(value);