diff --git a/src/App.tsx b/src/App.tsx
index a983363..fe1f497 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -149,7 +149,7 @@ const defaultValues: MyContextInterface = {
message: "",
},
};
-export let isMobile = false;
+export let isMobile = true;
const isMobileDevice = () => {
const userAgent = navigator.userAgent || navigator.vendor || window.opera;
diff --git a/src/components/Apps/AppInfo.tsx b/src/components/Apps/AppInfo.tsx
index 3a3c687..b99c4bd 100644
--- a/src/components/Apps/AppInfo.tsx
+++ b/src/components/Apps/AppInfo.tsx
@@ -43,6 +43,7 @@ export const AppInfo = ({ app, myName }) => {
display: 'flex',
flexDirection: 'column',
maxWidth: "500px",
+ width: '90%'
}}>
diff --git a/src/components/Apps/AppPublish.tsx b/src/components/Apps/AppPublish.tsx
index 22534bd..9736bfe 100644
--- a/src/components/Apps/AppPublish.tsx
+++ b/src/components/Apps/AppPublish.tsx
@@ -258,12 +258,12 @@ export const AppPublish = ({ names, categories }) => {
};
return (
Create Apps!
@@ -513,6 +513,7 @@ export const AppPublish = ({ names, categories }) => {
info={infoSnack}
setInfo={setInfoSnack}
/>
+
);
};
diff --git a/src/components/Apps/Apps.tsx b/src/components/Apps/Apps.tsx
index e1ddfbc..d0163ef 100644
--- a/src/components/Apps/Apps.tsx
+++ b/src/components/Apps/Apps.tsx
@@ -303,10 +303,10 @@ export const Apps = ({ mode, setMode, show , myName}) => {
categories={categories}
/>
- {mode === "appInfo" && }
- {mode === "appInfo-from-category" && }
+ {mode === "appInfo" && !selectedTab && }
+ {mode === "appInfo-from-category" && !selectedTab && }
- {mode === "publish" && }
+ {mode === "publish" && !selectedTab && }
{tabs.map((tab) => {
return (
diff --git a/src/components/Apps/AppsDesktop.tsx b/src/components/Apps/AppsDesktop.tsx
index c3d4d52..64bba6b 100644
--- a/src/components/Apps/AppsDesktop.tsx
+++ b/src/components/Apps/AppsDesktop.tsx
@@ -394,10 +394,10 @@ export const AppsDesktop = ({ mode, setMode, show , myName, goToHome, setDesktop
categories={categories}
/>
- {mode === "appInfo" && }
- {mode === "appInfo-from-category" && }
+ {mode === "appInfo" && !selectedTab && }
+ {mode === "appInfo-from-category" && !selectedTab && }
- {mode === "publish" && }
+ {mode === "publish" && !selectedTab && }
{tabs.map((tab) => {
return (
diff --git a/src/components/Group/Forum/GroupMail.tsx b/src/components/Group/Forum/GroupMail.tsx
index 05a1b3e..f64db60 100644
--- a/src/components/Group/Forum/GroupMail.tsx
+++ b/src/components/Group/Forum/GroupMail.tsx
@@ -172,6 +172,7 @@ export const GroupMail = ({
const getAllThreads = React.useCallback(
async (groupId: string, mode: string, isInitial?: boolean) => {
try {
+ console.log('mode', mode)
setIsLoading(true)
const offset = isInitial ? 0 : allThreads.length;
const isReverse = mode === "Newest" ? true : false;
@@ -536,10 +537,14 @@ export const GroupMail = ({
});
// Convert the map back to an array and sort by "created" timestamp in descending order
- const sortedList = Array.from(uniqueItems.values()).sort((a, b) => b.threadData?.createdAt - a.threadData?.createdAt);
+ const sortedList = Array.from(uniqueItems.values()).sort((a, b) =>
+ filterMode === 'Oldest'
+ ? a.threadData?.createdAt - b.threadData?.createdAt
+ : b.threadData?.createdAt - a.threadData?.createdAt
+);
return sortedList;
- }, [tempPublishedList, listOfThreadsToDisplay]);
+ }, [tempPublishedList, listOfThreadsToDisplay, filterMode]);
if (currentThread)
return (
diff --git a/src/components/Group/Forum/Mail-styles.ts b/src/components/Group/Forum/Mail-styles.ts
index 2d39cee..5308bf0 100644
--- a/src/components/Group/Forum/Mail-styles.ts
+++ b/src/components/Group/Forum/Mail-styles.ts
@@ -754,29 +754,7 @@ export const GroupContainer = styled(Box)`
position: relative;
overflow: auto;
width: 100%;
-&::-webkit-scrollbar-track {
- background-color: transparent;
-}
-&::-webkit-scrollbar-track:hover {
- background-color: transparent;
-}
-&::-webkit-scrollbar {
- width: 16px;
- height: 10px;
- background-color: white;
-}
-
-&::-webkit-scrollbar-thumb {
- background-color: #838eee;
- border-radius: 8px;
- background-clip: content-box;
- border: 4px solid transparent;
-}
-
-&::-webkit-scrollbar-thumb:hover {
- background-color: #6270f0;
-}
`
diff --git a/src/components/Group/GroupMenu.tsx b/src/components/Group/GroupMenu.tsx
index 5aff12e..989c7de 100644
--- a/src/components/Group/GroupMenu.tsx
+++ b/src/components/Group/GroupMenu.tsx
@@ -134,6 +134,7 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers,
"& .MuiTypography-root": {
fontSize: "12px",
fontWeight: 600,
+ color: hasUnreadChat ? "var(--unread)" :"#fff"
},
}} primary="Chat" />
@@ -153,6 +154,7 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers,
"& .MuiTypography-root": {
fontSize: "12px",
fontWeight: 600,
+ color: hasUnreadAnnouncements ? "var(--unread)" :"#fff"
},
}} primary="Announcements" />
diff --git a/src/components/Mobile/MobileHeader.tsx b/src/components/Mobile/MobileHeader.tsx
index 1773262..e4e5abc 100644
--- a/src/components/Mobile/MobileHeader.tsx
+++ b/src/components/Mobile/MobileHeader.tsx
@@ -203,7 +203,7 @@ const Header = ({
"& .MuiTypography-root": {
fontSize: "12px",
fontWeight: 600,
- color: hasUnreadDirects ? "var(--unread)" :"rgba(250, 250, 250, 0.5)"
+ color: hasUnreadGroups ? "var(--unread)" :"rgba(250, 250, 250, 0.5)"
},
}} primary="Hubs" />