From 160e3423c8e0a30d1d841f46fdde58cf6679f502 Mon Sep 17 00:00:00 2001
From: PhilReact <philliplangmartinez@gmail.com>
Date: Sun, 1 Dec 2024 15:08:30 +0200
Subject: [PATCH] added q-manager default

---
 src/atoms/global.ts                         | 4 ++++
 src/background.ts                           | 2 +-
 src/components/Apps/AppsCategory.tsx        | 3 ++-
 src/components/Apps/AppsCategoryDesktop.tsx | 1 +
 src/components/Apps/AppsLibrary.tsx         | 3 ++-
 src/components/Apps/AppsLibraryDesktop.tsx  | 1 +
 src/components/Chat/ChatGroup.tsx           | 6 ++----
 src/components/Embeds/PollEmbed.tsx         | 1 +
 src/components/Group/Group.tsx              | 9 ++++++---
 src/components/Group/WebsocketActive.tsx    | 2 +-
 10 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/atoms/global.ts b/src/atoms/global.ts
index b2d9577..506a8d4 100644
--- a/src/atoms/global.ts
+++ b/src/atoms/global.ts
@@ -36,6 +36,10 @@ export const sortablePinnedAppsAtom = atom({
   {
     name: 'NodeInfo',
     service: 'APP'
+  },
+  {
+    name: 'Q-Manager',
+    service: 'APP'
   }
 ], 
 });
diff --git a/src/background.ts b/src/background.ts
index 6efc048..d2ea6ca 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -2934,7 +2934,7 @@ const checkGroupList = async () => {
   try {
     const wallet = await getSaveWallet();
     const address = wallet.address0;
-    const url = await createEndpoint(`/chat/active/${address}`);
+    const url = await createEndpoint(`/chat/active/${address}?encoding=BASE64&haschatreference=false`);
     const response = await fetch(url, {
       method: "GET",
       headers: {
diff --git a/src/components/Apps/AppsCategory.tsx b/src/components/Apps/AppsCategory.tsx
index 423693e..5045f1c 100644
--- a/src/components/Apps/AppsCategory.tsx
+++ b/src/components/Apps/AppsCategory.tsx
@@ -41,7 +41,8 @@ const officialAppList = [
   "q-shop",
   "q-trade",
   "q-support",
-  "nodeinfo"
+  "nodeinfo",
+  "q-manager"
 ];
 
 const ScrollerStyled = styled('div')({
diff --git a/src/components/Apps/AppsCategoryDesktop.tsx b/src/components/Apps/AppsCategoryDesktop.tsx
index 91e818d..02ff7cd 100644
--- a/src/components/Apps/AppsCategoryDesktop.tsx
+++ b/src/components/Apps/AppsCategoryDesktop.tsx
@@ -47,6 +47,7 @@ const officialAppList = [
   "qombo",
   "q-fund",
   "q-shop",
+  "q-manager"
 ];
 
 const ScrollerStyled = styled("div")({
diff --git a/src/components/Apps/AppsLibrary.tsx b/src/components/Apps/AppsLibrary.tsx
index 887c22f..6961a61 100644
--- a/src/components/Apps/AppsLibrary.tsx
+++ b/src/components/Apps/AppsLibrary.tsx
@@ -44,7 +44,8 @@ const officialAppList = [
   "q-shop",
   "q-trade",
   "q-support",
-  "nodeinfo"
+  "nodeinfo",
+  "q-manager"
 ];
 
 const ScrollerStyled = styled('div')({
diff --git a/src/components/Apps/AppsLibraryDesktop.tsx b/src/components/Apps/AppsLibraryDesktop.tsx
index 20a631a..08a649d 100644
--- a/src/components/Apps/AppsLibraryDesktop.tsx
+++ b/src/components/Apps/AppsLibraryDesktop.tsx
@@ -55,6 +55,7 @@ const officialAppList = [
   "qombo",
   "q-fund",
   "q-shop",
+  "q-manager"
 ];
 
 const ScrollerStyled = styled("div")({
diff --git a/src/components/Chat/ChatGroup.tsx b/src/components/Chat/ChatGroup.tsx
index 7dadd28..fa9bdd1 100644
--- a/src/components/Chat/ChatGroup.tsx
+++ b/src/components/Chat/ChatGroup.tsx
@@ -74,14 +74,12 @@ export const ChatGroup = ({selectedGroup, secretKey, setSecretKey, getSecretKey,
         window.sendMessage("addTimestampEnterChat", {
           timestamp: Date.now(),
           groupId: selectedGroup
+        }).then((res)=> {
+          getTimestampEnterChatParent();
         }).catch((error) => {
             console.error("Failed to add timestamp:", error.message || "An error occurred");
           });
         
-
-        setTimeout(() => {
-          getTimestampEnterChatParent();
-        }, 600);
       }
     
       res(response);
diff --git a/src/components/Embeds/PollEmbed.tsx b/src/components/Embeds/PollEmbed.tsx
index 60797d5..8597d8f 100644
--- a/src/components/Embeds/PollEmbed.tsx
+++ b/src/components/Embeds/PollEmbed.tsx
@@ -20,6 +20,7 @@ import { getFee } from "../../background";
 import RefreshIcon from "@mui/icons-material/Refresh";
 import { Spacer } from "../../common/Spacer";
 import OpenInNewIcon from "@mui/icons-material/OpenInNew";
+import { CustomLoader } from "../../common/CustomLoader";
 
 
 export const PollCard = ({
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index 7b8b26b..1be20d1 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -913,6 +913,9 @@ export const Group = ({
           window.sendMessage("addTimestampEnterChat", {
             timestamp: Date.now(),
             groupId: selectedGroupRef.current.groupId,
+          }).then((res)=> {
+            getTimestampEnterChat();
+
           }).catch((error) => {
             console.error("Failed to add timestamp:", error.message || "An error occurred");
           });
@@ -922,14 +925,14 @@ export const Group = ({
           window.sendMessage("addTimestampEnterChat", {
             timestamp: Date.now(),
             groupId: selectedDirectRef.current.address,
+          }).then((res)=> {
+            getTimestampEnterChat();
+
           }).catch((error) => {
             console.error("Failed to add timestamp:", error.message || "An error occurred");
           });
         }
   
-        setTimeout(() => {
-          getTimestampEnterChat();
-        }, 600);
       }
   
       if (message?.action === "SET_GROUP_ANNOUNCEMENTS") {
diff --git a/src/components/Group/WebsocketActive.tsx b/src/components/Group/WebsocketActive.tsx
index 37cc48e..18941a4 100644
--- a/src/components/Group/WebsocketActive.tsx
+++ b/src/components/Group/WebsocketActive.tsx
@@ -59,7 +59,7 @@ export const WebSocketActive = ({ myAddress, setIsLoadingGroups }) => {
           pauseAllQueues()
           
         }
-        const socketLink = `${getBaseApiReactSocket()}/websockets/chat/active/${currentAddress}?encoding=BASE64`;
+        const socketLink = `${getBaseApiReactSocket()}/websockets/chat/active/${currentAddress}?encoding=BASE64&haschatreference=false`;
         socketRef.current = new WebSocket(socketLink);
 
         socketRef.current.onopen = () => {