From 2a31f70b4a038d955dcf04b5db20df024ce9d91a Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Sat, 10 Jun 2023 12:25:03 +0500
Subject: [PATCH] mobile: fix compactMode indicators show always

---
 .../app/components/list-items/note/index.js   | 88 ++++++++++---------
 .../components/list-items/notebook/index.js   | 31 ++++---
 2 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/apps/mobile/app/components/list-items/note/index.js b/apps/mobile/app/components/list-items/note/index.js
index 9f0818da3..cd0bf9c78 100644
--- a/apps/mobile/app/components/list-items/note/index.js
+++ b/apps/mobile/app/components/list-items/note/index.js
@@ -298,7 +298,7 @@ const NoteItem = ({
                 {item.favorite ? (
                   <Icon
                     testID="icon-star"
-                    name="star"
+                    name="star-outline"
                     size={SIZE.md}
                     style={{
                       marginRight: 6
@@ -368,50 +368,54 @@ const NoteItem = ({
           alignItems: "center"
         }}
       >
-        {item.conflicted ? (
-          <Icon
-            name="alert-circle"
-            style={{
-              marginRight: 6
-            }}
-            size={SIZE.sm}
-            color={colors.red}
-          />
-        ) : null}
+        {compactMode ? (
+          <>
+            {item.conflicted ? (
+              <Icon
+                name="alert-circle"
+                style={{
+                  marginRight: 6
+                }}
+                size={SIZE.sm}
+                color={colors.red}
+              />
+            ) : null}
 
-        {item.locked ? (
-          <Icon
-            name="lock"
-            testID="note-locked-icon"
-            size={SIZE.sm}
-            style={{
-              marginRight: 6
-            }}
-            color={colors.icon}
-          />
-        ) : null}
+            {item.locked ? (
+              <Icon
+                name="lock"
+                testID="note-locked-icon"
+                size={SIZE.sm}
+                style={{
+                  marginRight: 6
+                }}
+                color={colors.icon}
+              />
+            ) : null}
 
-        {item.favorite ? (
-          <Icon
-            testID="icon-star"
-            name="star-outline"
-            size={SIZE.md}
-            style={{
-              marginRight: 6
-            }}
-            color="orange"
-          />
-        ) : null}
+            {item.favorite ? (
+              <Icon
+                testID="icon-star"
+                name="star-outline"
+                size={SIZE.md}
+                style={{
+                  marginRight: 6
+                }}
+                color="orange"
+              />
+            ) : null}
 
-        <TimeSince
-          style={{
-            fontSize: SIZE.xs,
-            color: colors.icon,
-            marginRight: 6
-          }}
-          time={item[dateBy]}
-          updateFrequency={Date.now() - item[dateBy] < 60000 ? 2000 : 60000}
-        />
+            <TimeSince
+              style={{
+                fontSize: SIZE.xs,
+                color: colors.icon,
+                marginRight: 6
+              }}
+              time={item[dateBy]}
+              updateFrequency={Date.now() - item[dateBy] < 60000 ? 2000 : 60000}
+            />
+          </>
+        ) : null}
 
         <IconButton
           testID={notesnook.listitem.menu}
diff --git a/apps/mobile/app/components/list-items/notebook/index.js b/apps/mobile/app/components/list-items/notebook/index.js
index ea24465f0..165621d0a 100644
--- a/apps/mobile/app/components/list-items/notebook/index.js
+++ b/apps/mobile/app/components/list-items/notebook/index.js
@@ -215,19 +215,24 @@ export const NotebookItem = ({
           alignItems: "center"
         }}
       >
-        <Paragraph
-          color={colors.icon}
-          size={SIZE.xs}
-          style={{
-            marginRight: 6
-          }}
-        >
-          {item && totalNotes > 1
-            ? totalNotes + " notes"
-            : totalNotes === 1
-            ? totalNotes + " note"
-            : "0 notes"}
-        </Paragraph>
+        {compactMode ? (
+          <>
+            <Paragraph
+              color={colors.icon}
+              size={SIZE.xs}
+              style={{
+                marginRight: 6
+              }}
+            >
+              {item && totalNotes > 1
+                ? totalNotes + " notes"
+                : totalNotes === 1
+                ? totalNotes + " note"
+                : "0 notes"}
+            </Paragraph>
+          </>
+        ) : null}
+
         <IconButton
           color={colors.heading}
           name="dots-horizontal"