diff --git a/src/App.tsx b/src/App.tsx
index b20b6d5..1814032 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1817,10 +1817,6 @@ function App() {
-
-
-
-
diff --git a/src/assets/Icons/AppsIcon.tsx b/src/assets/Icons/AppsIcon.tsx
index d2ad47c..3f58604 100644
--- a/src/assets/Icons/AppsIcon.tsx
+++ b/src/assets/Icons/AppsIcon.tsx
@@ -1,4 +1,4 @@
-import { useTheme } from "@mui/material";
+import { useTheme } from '@mui/material';
export const AppsIcon = ({ height = 31, width = 31 }) => {
const theme = useTheme();
diff --git a/src/assets/Icons/HomeIcon.tsx b/src/assets/Icons/HomeIcon.tsx
index 7659119..0d3c4fe 100644
--- a/src/assets/Icons/HomeIcon.tsx
+++ b/src/assets/Icons/HomeIcon.tsx
@@ -1,4 +1,4 @@
-import { useTheme } from "@mui/material";
+import { useTheme } from '@mui/material';
export const HomeIcon = ({ height = 20, width = 23 }) => {
const theme = useTheme();
diff --git a/src/components/Apps/AppsDesktop.tsx b/src/components/Apps/AppsDesktop.tsx
index c17521f..6952be4 100644
--- a/src/components/Apps/AppsDesktop.tsx
+++ b/src/components/Apps/AppsDesktop.tsx
@@ -1,34 +1,29 @@
-import React, {
- useContext,
- useEffect,
- useMemo,
- useRef,
- useState,
-} from "react";
-import { AppsHomeDesktop } from "./AppsHomeDesktop";
-import { Spacer } from "../../common/Spacer";
-import { GlobalContext, getBaseApiReact } from "../../App";
-import { AppInfo } from "./AppInfo";
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
+import { AppsHomeDesktop } from './AppsHomeDesktop';
+import { Spacer } from '../../common/Spacer';
+import { GlobalContext, getBaseApiReact } from '../../App';
+import { AppInfo } from './AppInfo';
import {
executeEvent,
subscribeToEvent,
unsubscribeFromEvent,
-} from "../../utils/events";
-import { AppsParent } from "./Apps-styles";
-import AppViewerContainer from "./AppViewerContainer";
-import ShortUniqueId from "short-unique-id";
-import { AppPublish } from "./AppPublish";
-import { AppsLibraryDesktop } from "./AppsLibraryDesktop";
-import { AppsCategoryDesktop } from "./AppsCategoryDesktop";
-import { AppsNavBarDesktop } from "./AppsNavBarDesktop";
-import { Box, ButtonBase, useTheme } from "@mui/material";
-import { HomeIcon } from "../../assets/Icons/HomeIcon";
-import { MessagingIcon } from "../../assets/Icons/MessagingIcon";
-import { Save } from "../Save/Save";
-import { IconWrapper } from "../Desktop/DesktopFooter";
-import { useRecoilState } from "recoil";
-import { enabledDevModeAtom } from "../../atoms/global";
-import { AppsIcon } from "../../assets/Icons/AppsIcon";
+} from '../../utils/events';
+import { AppsParent } from './Apps-styles';
+import AppViewerContainer from './AppViewerContainer';
+import ShortUniqueId from 'short-unique-id';
+import { AppPublish } from './AppPublish';
+import { AppsLibraryDesktop } from './AppsLibraryDesktop';
+import { AppsCategoryDesktop } from './AppsCategoryDesktop';
+import { AppsNavBarDesktop } from './AppsNavBarDesktop';
+import { Box, ButtonBase, useTheme } from '@mui/material';
+import { HomeIcon } from '../../assets/Icons/HomeIcon';
+import { MessagingIcon } from '../../assets/Icons/MessagingIcon';
+import { Save } from '../Save/Save';
+import { IconWrapper } from '../Desktop/DesktopFooter';
+import { useRecoilState } from 'recoil';
+import { enabledDevModeAtom } from '../../atoms/global';
+import { AppsIcon } from '../../assets/Icons/AppsIcon';
+import { CoreSyncStatus } from '../CoreSyncStatus';
const uid = new ShortUniqueId({ length: 8 });
@@ -58,25 +53,25 @@ export const AppsDesktop = ({
const myApp = useMemo(() => {
return availableQapps.find(
- (app) => app.name === myName && app.service === "APP"
+ (app) => app.name === myName && app.service === 'APP'
);
}, [myName, availableQapps]);
const myWebsite = useMemo(() => {
return availableQapps.find(
- (app) => app.name === myName && app.service === "WEBSITE"
+ (app) => app.name === myName && app.service === 'WEBSITE'
);
}, [myName, availableQapps]);
useEffect(() => {
if (show) {
- showTutorial("qapps");
+ showTutorial('qapps');
}
}, [show]);
useEffect(() => {
setTimeout(() => {
- executeEvent("setTabsToNav", {
+ executeEvent('setTabsToNav', {
data: {
tabs: tabs,
selectedTab: selectedTab,
@@ -91,9 +86,9 @@ export const AppsDesktop = ({
const url = `${getBaseApiReact()}/arbitrary/categories`;
const response = await fetch(url, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
if (!response?.ok) return;
@@ -115,9 +110,9 @@ export const AppsDesktop = ({
const url = `${getBaseApiReact()}/arbitrary/resources/search?service=APP&mode=ALL&limit=0&includestatus=true&includemetadata=true`;
const response = await fetch(url, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
if (!response?.ok) return;
@@ -125,9 +120,9 @@ export const AppsDesktop = ({
const urlWebsites = `${getBaseApiReact()}/arbitrary/resources/search?service=WEBSITE&mode=ALL&limit=0&includestatus=true&includemetadata=true`;
const responseWebsites = await fetch(urlWebsites, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
if (!responseWebsites?.ok) return;
@@ -150,9 +145,12 @@ export const AppsDesktop = ({
useEffect(() => {
getQapps();
- const interval = setInterval(() => {
- getQapps();
- }, 20 * 60 * 1000); // 20 minutes in milliseconds
+ const interval = setInterval(
+ () => {
+ getQapps();
+ },
+ 20 * 60 * 1000
+ ); // 20 minutes in milliseconds
return () => clearInterval(interval);
}, [getQapps]);
@@ -160,29 +158,29 @@ export const AppsDesktop = ({
const selectedAppInfoFunc = (e) => {
const data = e.detail?.data;
setSelectedAppInfo(data);
- setMode("appInfo");
+ setMode('appInfo');
};
useEffect(() => {
- subscribeToEvent("selectedAppInfo", selectedAppInfoFunc);
+ subscribeToEvent('selectedAppInfo', selectedAppInfoFunc);
return () => {
- unsubscribeFromEvent("selectedAppInfo", selectedAppInfoFunc);
+ unsubscribeFromEvent('selectedAppInfo', selectedAppInfoFunc);
};
}, []);
const selectedAppInfoCategoryFunc = (e) => {
const data = e.detail?.data;
setSelectedAppInfo(data);
- setMode("appInfo-from-category");
+ setMode('appInfo-from-category');
};
useEffect(() => {
- subscribeToEvent("selectedAppInfoCategory", selectedAppInfoCategoryFunc);
+ subscribeToEvent('selectedAppInfoCategory', selectedAppInfoCategoryFunc);
return () => {
unsubscribeFromEvent(
- "selectedAppInfoCategory",
+ 'selectedAppInfoCategory',
selectedAppInfoCategoryFunc
);
};
@@ -191,43 +189,43 @@ export const AppsDesktop = ({
const selectedCategoryFunc = (e) => {
const data = e.detail?.data;
setSelectedCategory(data);
- setMode("category");
+ setMode('category');
};
useEffect(() => {
- subscribeToEvent("selectedCategory", selectedCategoryFunc);
+ subscribeToEvent('selectedCategory', selectedCategoryFunc);
return () => {
- unsubscribeFromEvent("selectedCategory", selectedCategoryFunc);
+ unsubscribeFromEvent('selectedCategory', selectedCategoryFunc);
};
}, []);
const navigateBackFunc = (e) => {
if (
[
- "category",
- "appInfo-from-category",
- "appInfo",
- "library",
- "publish",
+ 'category',
+ 'appInfo-from-category',
+ 'appInfo',
+ 'library',
+ 'publish',
].includes(mode)
) {
// Handle the various modes as needed
- if (mode === "category") {
- setMode("library");
+ if (mode === 'category') {
+ setMode('library');
setSelectedCategory(null);
- } else if (mode === "appInfo-from-category") {
- setMode("category");
- } else if (mode === "appInfo") {
- setMode("library");
- } else if (mode === "library") {
+ } else if (mode === 'appInfo-from-category') {
+ setMode('category');
+ } else if (mode === 'appInfo') {
+ setMode('library');
+ } else if (mode === 'library') {
if (isNewTabWindow) {
- setMode("viewer");
+ setMode('viewer');
} else {
- setMode("home");
+ setMode('home');
}
- } else if (mode === "publish") {
- setMode("library");
+ } else if (mode === 'publish') {
+ setMode('library');
}
} else if (selectedTab?.tabId) {
executeEvent(`navigateBackApp-${selectedTab?.tabId}`, {});
@@ -235,10 +233,10 @@ export const AppsDesktop = ({
};
useEffect(() => {
- subscribeToEvent("navigateBack", navigateBackFunc);
+ subscribeToEvent('navigateBack', navigateBackFunc);
return () => {
- unsubscribeFromEvent("navigateBack", navigateBackFunc);
+ unsubscribeFromEvent('navigateBack', navigateBackFunc);
};
}, [mode, selectedTab]);
@@ -250,16 +248,16 @@ export const AppsDesktop = ({
};
setTabs((prev) => [...prev, newTab]);
setSelectedTab(newTab);
- setMode("viewer");
+ setMode('viewer');
setIsNewTabWindow(false);
};
useEffect(() => {
- subscribeToEvent("addTab", addTabFunc);
+ subscribeToEvent('addTab', addTabFunc);
return () => {
- unsubscribeFromEvent("addTab", addTabFunc);
+ unsubscribeFromEvent('addTab', addTabFunc);
};
}, [tabs]);
const setSelectedTabFunc = (e) => {
@@ -268,7 +266,7 @@ export const AppsDesktop = ({
setSelectedTab(data);
setTimeout(() => {
- executeEvent("setTabsToNav", {
+ executeEvent('setTabsToNav', {
data: {
tabs: tabs,
selectedTab: data,
@@ -280,10 +278,10 @@ export const AppsDesktop = ({
};
useEffect(() => {
- subscribeToEvent("setSelectedTab", setSelectedTabFunc);
+ subscribeToEvent('setSelectedTab', setSelectedTabFunc);
return () => {
- unsubscribeFromEvent("setSelectedTab", setSelectedTabFunc);
+ unsubscribeFromEvent('setSelectedTab', setSelectedTabFunc);
};
}, [tabs, isNewTabWindow]);
@@ -291,14 +289,14 @@ export const AppsDesktop = ({
const data = e.detail?.data;
const copyTabs = [...tabs].filter((tab) => tab?.tabId !== data?.tabId);
if (copyTabs?.length === 0) {
- setMode("home");
+ setMode('home');
} else {
setSelectedTab(copyTabs[0]);
}
setTabs(copyTabs);
setSelectedTab(copyTabs[0]);
setTimeout(() => {
- executeEvent("setTabsToNav", {
+ executeEvent('setTabsToNav', {
data: {
tabs: copyTabs,
selectedTab: copyTabs[0],
@@ -308,10 +306,10 @@ export const AppsDesktop = ({
};
useEffect(() => {
- subscribeToEvent("removeTab", removeTabFunc);
+ subscribeToEvent('removeTab', removeTabFunc);
return () => {
- unsubscribeFromEvent("removeTab", removeTabFunc);
+ unsubscribeFromEvent('removeTab', removeTabFunc);
};
}, [tabs]);
@@ -321,10 +319,10 @@ export const AppsDesktop = ({
};
useEffect(() => {
- subscribeToEvent("newTabWindow", setNewTabWindowFunc);
+ subscribeToEvent('newTabWindow', setNewTabWindowFunc);
return () => {
- unsubscribeFromEvent("newTabWindow", setNewTabWindowFunc);
+ unsubscribeFromEvent('newTabWindow', setNewTabWindowFunc);
};
}, [tabs]);
@@ -333,24 +331,33 @@ export const AppsDesktop = ({
sx={{
position: !show && 'fixed',
left: !show && '-200vw',
- flexDirection: 'row'
+ flexDirection: 'row',
}}
>
+
+
+
+ {
goToHome();
@@ -361,7 +368,7 @@ export const AppsDesktop = ({
{
- setDesktopViewMode("apps");
+ setDesktopViewMode('apps');
}}
>
@@ -371,13 +378,13 @@ export const AppsDesktop = ({
{
- setDesktopViewMode("chat");
+ setDesktopViewMode('chat');
}}
>
@@ -434,7 +441,7 @@ export const AppsDesktop = ({
{isEnabledDevMode && (
{
- setDesktopViewMode("dev");
+ setDesktopViewMode('dev');
}}
>
@@ -442,21 +449,21 @@ export const AppsDesktop = ({
)}
- {mode !== "home" && (
+ {mode !== 'home' && (
)}
- {mode === "home" && (
+ {mode === 'home' && (
@@ -471,7 +478,7 @@ export const AppsDesktop = ({
)}
- {mode === "appInfo" && !selectedTab && (
+ {mode === 'appInfo' && !selectedTab && (
)}
- {mode === "appInfo-from-category" && !selectedTab && (
+ {mode === 'appInfo-from-category' && !selectedTab && (
)}
- {mode === "publish" && !selectedTab && (
+ {mode === 'publish' && !selectedTab && (
)}
{tabs.map((tab) => {
@@ -511,15 +518,15 @@ export const AppsDesktop = ({
);
})}
- {isNewTabWindow && mode === "viewer" && (
+ {isNewTabWindow && mode === 'viewer' && (
<>
diff --git a/src/components/Apps/AppsDevMode.tsx b/src/components/Apps/AppsDevMode.tsx
index a01f6d7..6301286 100644
--- a/src/components/Apps/AppsDevMode.tsx
+++ b/src/components/Apps/AppsDevMode.tsx
@@ -31,6 +31,7 @@ import { HubsIcon } from '../../assets/Icons/HubsIcon';
import { AppsDevModeNavBar } from './AppsDevModeNavBar';
import { AppsIcon } from '../../assets/Icons/AppsIcon';
import { IconWrapper } from '../Desktop/DesktopFooter';
+import { CoreSyncStatus } from '../CoreSyncStatus';
const uid = new ShortUniqueId({ length: 8 });
@@ -243,11 +244,20 @@ export const AppsDevMode = ({
gap: '25px',
}}
>
+
+
+
+
{
goToHome();
diff --git a/src/components/CoreSyncStatus.tsx b/src/components/CoreSyncStatus.tsx
index e0e4692..66d16ec 100644
--- a/src/components/CoreSyncStatus.tsx
+++ b/src/components/CoreSyncStatus.tsx
@@ -73,6 +73,7 @@ export const CoreSyncStatus = () => {
let imagePath = syncingImg;
let message = `Synchronizing`;
+
if (isMintingPossible && !isUsingGateway) {
imagePath = syncedMintingImg;
message = `${isSynchronizing ? 'Synchronizing' : 'Synchronized'} ${'(Minting)'}`;
@@ -101,7 +102,7 @@ export const CoreSyncStatus = () => {
diff --git a/src/components/Desktop/DesktopFooter.tsx b/src/components/Desktop/DesktopFooter.tsx
index 3bcaad5..ebfbc6f 100644
--- a/src/components/Desktop/DesktopFooter.tsx
+++ b/src/components/Desktop/DesktopFooter.tsx
@@ -22,27 +22,27 @@ export const IconWrapper = ({
return (
{children}
{label}
@@ -68,18 +68,20 @@ export const DesktopFooter = ({
const [isEnabledDevMode, setIsEnabledDevMode] =
useRecoilState(enabledDevModeAtom);
+ const theme = useTheme();
+
if (hide) return;
return (
@@ -141,8 +143,8 @@ export const DesktopFooter = ({
hasUnreadDirects
? 'var(--danger)'
: isDirects
- ? 'white'
- : 'rgba(250, 250, 250, 0.5)'
+ ? theme.palette.text.primary
+ : theme.palette.text.secondary
}
/>
diff --git a/src/components/DesktopSideBar.tsx b/src/components/DesktopSideBar.tsx
index dce577b..d1c8a7a 100644
--- a/src/components/DesktopSideBar.tsx
+++ b/src/components/DesktopSideBar.tsx
@@ -7,6 +7,7 @@ import { useRecoilState } from 'recoil';
import { enabledDevModeAtom } from '../atoms/global';
import { AppsIcon } from '../assets/Icons/AppsIcon';
import ThemeSelector from './Theme/ThemeSelector';
+import { CoreSyncStatus } from './CoreSyncStatus';
export const DesktopSideBar = ({
goToHome,
@@ -30,19 +31,28 @@ export const DesktopSideBar = ({
return (
+
+
+
+
{
goToHome();
@@ -51,10 +61,13 @@ export const DesktopSideBar = ({
+
{
setDesktopViewMode('apps');
@@ -63,17 +76,22 @@ export const DesktopSideBar = ({
}}
>
+
{
setDesktopViewMode('chat');
@@ -98,24 +116,7 @@ export const DesktopSideBar = ({
/>
- {/* {
- setDesktopSideView("groups");
- toggleSideViewGroups()
- }}
- >
-
-
- */}
+
{/* */}
{isEnabledDevMode && (
@@ -126,7 +127,9 @@ export const DesktopSideBar = ({
>