diff --git a/src/assets/Icons/AdminsIcon.tsx b/src/assets/Icons/AdminsIcon.tsx
new file mode 100644
index 0000000..d2c89c6
--- /dev/null
+++ b/src/assets/Icons/AdminsIcon.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+export const AdminsIcon= ({ color = 'white', height = 48, width = 50 }) => {
+ return (
+
+
+
+
+
+
+ );
+ };
+
\ No newline at end of file
diff --git a/src/background-cases.ts b/src/background-cases.ts
index 64ca4d0..0eaed21 100644
--- a/src/background-cases.ts
+++ b/src/background-cases.ts
@@ -54,7 +54,7 @@ import {
updateThreadActivity,
walletVersion,
} from "./background";
-import { decryptGroupEncryption, encryptAndPublishSymmetricKeyGroupChat, publishGroupEncryptedResource, publishOnQDN } from "./backgroundFunctions/encryption";
+import { decryptGroupEncryption, encryptAndPublishSymmetricKeyGroupChat, encryptAndPublishSymmetricKeyGroupChatForAdmins, publishGroupEncryptedResource, publishOnQDN } from "./backgroundFunctions/encryption";
import { PUBLIC_NOTIFICATION_CODE_FIRST_SECRET_KEY } from "./constants/codes";
import { encryptSingle } from "./qdn/encryption/group-encryption";
import { _createPoll, _voteOnPoll } from "./qortalRequests/get";
@@ -1411,6 +1411,41 @@ export async function encryptAndPublishSymmetricKeyGroupChatCase(
}
}
+export async function encryptAndPublishSymmetricKeyGroupChatForAdminsCase(
+ request,
+ event
+) {
+ try {
+ const { groupId, previousData, admins } = request.payload;
+ const { data, numberOfMembers } =
+ await encryptAndPublishSymmetricKeyGroupChatForAdmins({
+ groupId,
+ previousData,
+ admins
+ });
+
+ event.source.postMessage(
+ {
+ requestId: request.requestId,
+ action: "encryptAndPublishSymmetricKeyGroupChatForAdmins",
+ payload: data,
+ type: "backgroundMessageResponse",
+ },
+ event.origin
+ );
+ } catch (error) {
+ event.source.postMessage(
+ {
+ requestId: request.requestId,
+ action: "encryptAndPublishSymmetricKeyGroupChat",
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ },
+ event.origin
+ );
+ }
+}
+
export async function publishGroupEncryptedResourceCase(request, event) {
try {
const {encryptedData, identifier} = request.payload;
diff --git a/src/background.ts b/src/background.ts
index 7532956..da726c3 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -52,6 +52,7 @@ import {
decryptSingleForPublishesCase,
decryptWalletCase,
encryptAndPublishSymmetricKeyGroupChatCase,
+ encryptAndPublishSymmetricKeyGroupChatForAdminsCase,
encryptSingleCase,
getApiKeyCase,
getCustomNodesFromStorageCase,
@@ -2956,6 +2957,9 @@ function setupMessageListener() {
case "encryptAndPublishSymmetricKeyGroupChat":
encryptAndPublishSymmetricKeyGroupChatCase(request, event);
break;
+ case "encryptAndPublishSymmetricKeyGroupChatForAdmins":
+ encryptAndPublishSymmetricKeyGroupChatForAdminsCase(request, event);
+ break;
case "publishGroupEncryptedResource":
publishGroupEncryptedResourceCase(request, event);
break;
diff --git a/src/backgroundFunctions/encryption.ts b/src/backgroundFunctions/encryption.ts
index 3511597..badd0aa 100644
--- a/src/backgroundFunctions/encryption.ts
+++ b/src/backgroundFunctions/encryption.ts
@@ -85,6 +85,26 @@ const getPublicKeys = async (groupNumber: number) => {
return members
}
+ export const getPublicKeysByAddress = async (admins) => {
+ const validApi = await getBaseApi()
+
+
+ let members: any = [];
+ if (Array.isArray(admins)) {
+ for (const address of admins) {
+ if (address) {
+ const resAddress = await fetch(`${validApi}/addresses/${address}`);
+ const resData = await resAddress.json();
+ const publicKey = resData.publicKey;
+ members.push(publicKey)
+ }
+ }
+ }
+
+ return members
+ }
+
+
export const encryptAndPublishSymmetricKeyGroupChat = async ({groupId, previousData}: {
@@ -136,6 +156,57 @@ export const encryptAndPublishSymmetricKeyGroupChat = async ({groupId, previousD
throw new Error(error.message);
}
}
+export const encryptAndPublishSymmetricKeyGroupChatForAdmins = async ({groupId, previousData, admins}: {
+ groupId: number,
+ previousData: Object,
+}) => {
+ try {
+
+ let highestKey = 0
+ if(previousData){
+ highestKey = Math.max(...Object.keys((previousData || {})).filter(item=> !isNaN(+item)).map(Number));
+
+ }
+
+ const resKeyPair = await getKeyPair()
+ const parsedData = resKeyPair
+ const privateKey = parsedData.privateKey
+ const userPublicKey = parsedData.publicKey
+ const groupmemberPublicKeys = await getPublicKeysByAddress(admins.map((admin)=> admin.address))
+
+
+ const symmetricKey = createSymmetricKeyAndNonce()
+ const nextNumber = highestKey + 1
+ const objectToSave = {
+ ...previousData,
+ [nextNumber]: symmetricKey
+ }
+
+ const symmetricKeyAndNonceBase64 = await objectToBase64(objectToSave)
+
+ const encryptedData = encryptDataGroup({
+ data64: symmetricKeyAndNonceBase64,
+ publicKeys: groupmemberPublicKeys,
+ privateKey,
+ userPublicKey
+ })
+ if(encryptedData){
+ const registeredName = await getNameInfo()
+ const data = await publishData({
+ registeredName, file: encryptedData, service: 'DOCUMENT_PRIVATE', identifier: `admins-symmetric-qchat-group-${groupId}`, uploadType: 'file', isBase64: true, withFee: true
+ })
+ return {
+ data,
+ numberOfMembers: groupmemberPublicKeys.length
+ }
+
+ } else {
+ throw new Error('Cannot encrypt content')
+ }
+ } catch (error: any) {
+ throw new Error(error.message);
+ }
+}
export const publishGroupEncryptedResource = async ({encryptedData, identifier}) => {
try {
diff --git a/src/components/Chat/AdminSpace.tsx b/src/components/Chat/AdminSpace.tsx
new file mode 100644
index 0000000..f340e45
--- /dev/null
+++ b/src/components/Chat/AdminSpace.tsx
@@ -0,0 +1,66 @@
+import React, {
+ useCallback,
+ useContext,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from "react";
+import { GroupMail } from "../Group/Forum/GroupMail";
+import { MyContext, isMobile } from "../../App";
+import { getRootHeight } from "../../utils/mobile/mobileUtils";
+import { Box, Typography } from "@mui/material";
+import { AdminSpaceInner } from "./AdminSpaceInner";
+
+
+
+
+
+
+export const AdminSpace = ({
+ selectedGroup,
+ adminsWithNames,
+ userInfo,
+ secretKey,
+ getSecretKey,
+ isAdmin,
+ myAddress,
+ hide,
+ defaultThread,
+ setDefaultThread
+}) => {
+ const { rootHeight } = useContext(MyContext);
+ const [isMoved, setIsMoved] = useState(false);
+ useEffect(() => {
+ if (hide) {
+ setTimeout(() => setIsMoved(true), 300); // Wait for the fade-out to complete before moving
+ } else {
+ setIsMoved(false); // Reset the position immediately when showing
+ }
+ }, [hide]);
+
+ return (
+
+ {!isAdmin &&
Sorry, this space is only for Admins.}
+ {isAdmin &&
}
+
+