fix member list logic

This commit is contained in:
PhilReact 2024-09-25 11:47:14 +03:00
parent ac5a6b251b
commit e04aeb643c
3 changed files with 12 additions and 4 deletions

View File

@ -1663,7 +1663,7 @@ function App() {
{!isMobile && renderProfile()} {!isMobile && renderProfile()}
</Box> </Box>
{!isMobile && (
<Box <Box
sx={{ sx={{
position: "fixed", position: "fixed",
@ -1675,7 +1675,7 @@ function App() {
> >
<TaskManger getUserInfo={getUserInfo} /> <TaskManger getUserInfo={getUserInfo} />
</Box> </Box>
)}
</MyContext.Provider> </MyContext.Provider>
)} )}

View File

@ -1336,6 +1336,7 @@ export const Group = ({
setSecretKey(null); setSecretKey(null);
setGroupOwner(null) setGroupOwner(null)
lastFetchedSecretKey.current = null; lastFetchedSecretKey.current = null;
initiatedGetMembers.current = false;
setSecretKeyPublishDate(null); setSecretKeyPublishDate(null);
setAdmins([]); setAdmins([]);
setSecretKeyDetails(null); setSecretKeyDetails(null);
@ -1384,6 +1385,7 @@ export const Group = ({
setSecretKey(null); setSecretKey(null);
setGroupOwner(null) setGroupOwner(null)
lastFetchedSecretKey.current = null; lastFetchedSecretKey.current = null;
initiatedGetMembers.current = false;
setSecretKeyPublishDate(null); setSecretKeyPublishDate(null);
setAdmins([]); setAdmins([]);
setSecretKeyDetails(null); setSecretKeyDetails(null);
@ -1443,6 +1445,7 @@ export const Group = ({
setSecretKey(null); setSecretKey(null);
setGroupOwner(null) setGroupOwner(null)
lastFetchedSecretKey.current = null; lastFetchedSecretKey.current = null;
initiatedGetMembers.current = false;
setSecretKeyPublishDate(null); setSecretKeyPublishDate(null);
setAdmins([]); setAdmins([]);
setSecretKeyDetails(null); setSecretKeyDetails(null);
@ -1494,6 +1497,7 @@ export const Group = ({
setSecretKey(null); setSecretKey(null);
setGroupOwner(null) setGroupOwner(null)
lastFetchedSecretKey.current = null; lastFetchedSecretKey.current = null;
initiatedGetMembers.current = false;
setSecretKeyPublishDate(null); setSecretKeyPublishDate(null);
setAdmins([]); setAdmins([]);
setSecretKeyDetails(null); setSecretKeyDetails(null);
@ -1977,6 +1981,7 @@ export const Group = ({
// } // }
onClick={() => { onClick={() => {
setMobileViewMode("group"); setMobileViewMode("group");
initiatedGetMembers.current = false;
clearAllQueues(); clearAllQueues();
setSelectedDirect(null); setSelectedDirect(null);
setTriedToFetchSecretKey(false); setTriedToFetchSecretKey(false);
@ -2477,10 +2482,11 @@ export const Group = ({
style={{ style={{
display: "flex", display: "flex",
width: "100%", width: "100%",
height: "100$", height: isMobile ? `calc(${rootHeight} - 113px)` : "calc(100vh - 70px)",
flexDirection: "column", flexDirection: "column",
alignItems: "flex-start", alignItems: "flex-start",
padding: "20px", padding: "20px",
overflow: 'auto'
}} }}
> >
{" "} {" "}

View File

@ -10,7 +10,7 @@ import ExpandMore from "@mui/icons-material/ExpandMore";
import StarBorder from "@mui/icons-material/StarBorder"; import StarBorder from "@mui/icons-material/StarBorder";
import PendingIcon from "@mui/icons-material/Pending"; import PendingIcon from "@mui/icons-material/Pending";
import TaskAltIcon from "@mui/icons-material/TaskAlt"; import TaskAltIcon from "@mui/icons-material/TaskAlt";
import { MyContext, getBaseApiReact } from "../../App"; import { MyContext, getBaseApiReact, isMobile } from "../../App";
import { getBaseApi } from "../../background"; import { getBaseApi } from "../../background";
@ -146,6 +146,8 @@ export const TaskManger = ({getUserInfo}) => {
}); });
}, [memberGroups, getUserInfo]); }, [memberGroups, getUserInfo]);
if(isMobile) return null
if (txList?.length === 0 || txList.filter((item) => !item?.done).length === 0) return null; if (txList?.length === 0 || txList.filter((item) => !item?.done).length === 0) return null;
return ( return (
<List <List