From e04aeb643c75b4a8422c2a1a390f3d829e413d82 Mon Sep 17 00:00:00 2001
From: PhilReact <philliplangmartinez@gmail.com>
Date: Wed, 25 Sep 2024 11:47:14 +0300
Subject: [PATCH] fix member list logic

---
 src/App.tsx                               | 4 ++--
 src/components/Group/Group.tsx            | 8 +++++++-
 src/components/TaskManager/TaskManger.tsx | 4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index f5d4939..129999f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1663,7 +1663,7 @@ function App() {
             {!isMobile && renderProfile()}
            
           </Box>
-          {!isMobile && (
+       
              <Box
              sx={{
                position: "fixed",
@@ -1675,7 +1675,7 @@ function App() {
            >
              <TaskManger getUserInfo={getUserInfo} />
            </Box>
-          )}
+          
          
         </MyContext.Provider>
       )}
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index 9e4e6fc..b1662ef 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -1336,6 +1336,7 @@ export const Group = ({
       setSecretKey(null);
       setGroupOwner(null)
       lastFetchedSecretKey.current = null;
+      initiatedGetMembers.current = false;
       setSecretKeyPublishDate(null);
       setAdmins([]);
       setSecretKeyDetails(null);
@@ -1384,6 +1385,7 @@ export const Group = ({
       setSecretKey(null);
       setGroupOwner(null)
       lastFetchedSecretKey.current = null;
+      initiatedGetMembers.current = false;
       setSecretKeyPublishDate(null);
       setAdmins([]);
       setSecretKeyDetails(null);
@@ -1443,6 +1445,7 @@ export const Group = ({
       setSecretKey(null);
       setGroupOwner(null)
       lastFetchedSecretKey.current = null;
+      initiatedGetMembers.current = false;
       setSecretKeyPublishDate(null);
       setAdmins([]);
       setSecretKeyDetails(null);
@@ -1494,6 +1497,7 @@ export const Group = ({
     setSecretKey(null);
     setGroupOwner(null)
     lastFetchedSecretKey.current = null;
+    initiatedGetMembers.current = false;
     setSecretKeyPublishDate(null);
     setAdmins([]);
     setSecretKeyDetails(null);
@@ -1977,6 +1981,7 @@ export const Group = ({
                 //   }
                 onClick={() => {
                   setMobileViewMode("group");
+                  initiatedGetMembers.current = false;
                   clearAllQueues();
                   setSelectedDirect(null);
                   setTriedToFetchSecretKey(false);
@@ -2477,10 +2482,11 @@ export const Group = ({
                         style={{
                           display: "flex",
                           width: "100%",
-                          height: "100$",
+                          height: isMobile ? `calc(${rootHeight} - 113px)` : "calc(100vh - 70px)",
                           flexDirection: "column",
                           alignItems: "flex-start",
                           padding: "20px",
+                          overflow: 'auto'
                         }}
                       >
                         {" "}
diff --git a/src/components/TaskManager/TaskManger.tsx b/src/components/TaskManager/TaskManger.tsx
index 203b59b..51434c3 100644
--- a/src/components/TaskManager/TaskManger.tsx
+++ b/src/components/TaskManager/TaskManger.tsx
@@ -10,7 +10,7 @@ import ExpandMore from "@mui/icons-material/ExpandMore";
 import StarBorder from "@mui/icons-material/StarBorder";
 import PendingIcon from "@mui/icons-material/Pending";
 import TaskAltIcon from "@mui/icons-material/TaskAlt";
-import { MyContext, getBaseApiReact } from "../../App";
+import { MyContext, getBaseApiReact, isMobile } from "../../App";
 import { getBaseApi } from "../../background";
 
 
@@ -146,6 +146,8 @@ export const TaskManger = ({getUserInfo}) => {
     });
   }, [memberGroups, getUserInfo]);
 
+  if(isMobile) return null
+
   if (txList?.length === 0 || txList.filter((item) => !item?.done).length === 0) return null;
   return (
     <List