- {!isAdmin && Sorry, this space is only for Admins.
+ style={{
+ // reference to change height
+ display: 'flex',
+ flexDirection: 'column',
+ height: isMobile ? `calc(${rootHeight} - 127px` : 'calc(100vh - 70px)',
+ left: hide && '-1000px',
+ opacity: hide ? 0 : 1,
+ position: hide ? 'fixed' : 'relative',
+ visibility: hide && 'hidden',
+ width: '100%',
+ }}
+ >
+ {!isAdmin && (
+
{!isMobile && (
Close Direct Chat
@@ -579,26 +586,26 @@ export const ChatDirect = ({
{isMobile && (
@@ -623,10 +630,10 @@ export const ChatDirect = ({
{
@@ -192,7 +194,9 @@ export const ChatGroup = ({
handleSecretKeyCreationInProgress();
return;
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
});
};
@@ -578,7 +582,9 @@ export const ChatGroup = ({
rej(error.message || 'An error occurred');
});
});
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
const forceCloseWebSocket = () => {
@@ -621,7 +627,9 @@ export const ChatGroup = ({
middletierFunc(JSON.parse(e.data), selectedGroup);
setIsLoading(false);
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
socketRef.current.onclose = () => {
clearTimeout(groupSocketTimeoutRef.current);
@@ -700,7 +708,9 @@ export const ChatGroup = ({
rej(error.message || 'An error occurred');
});
});
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
const sendChatGroup = async ({
diff --git a/src/components/Chat/GroupAnnouncements.tsx b/src/components/Chat/GroupAnnouncements.tsx
index 98dd48b..87f7658 100644
--- a/src/components/Chat/GroupAnnouncements.tsx
+++ b/src/components/Chat/GroupAnnouncements.tsx
@@ -106,7 +106,9 @@ export const decryptPublishes = async (encryptedMessages: any[], secretKey) => {
rej(error.message || 'An error occurred');
});
});
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
export const handleUnencryptedPublishes = (publishes) => {
let publishesData = [];
@@ -117,7 +119,9 @@ export const handleUnencryptedPublishes = (publishes) => {
if (decodedData) {
publishesData.push({ decryptedData: decodedData });
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
});
return publishesData;
};
@@ -236,7 +240,9 @@ export const GroupAnnouncements = ({
rej(error.message || 'An error occurred');
});
});
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
const publishAnc = async ({ encryptedData, identifier }: any) => {
@@ -286,7 +292,9 @@ export const GroupAnnouncements = ({
});
setTempPublishedList(tempData);
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
const publishAnnouncement = async () => {
@@ -422,7 +430,9 @@ export const GroupAnnouncements = ({
isPrivate
);
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
const interval = useRef(null);
@@ -449,7 +459,9 @@ export const GroupAnnouncements = ({
},
isPrivate
);
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
}
setAnnouncements(responseData);
return;
@@ -467,7 +479,9 @@ export const GroupAnnouncements = ({
{ name: data.name, identifier: data.identifier },
isPrivate
);
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
}
setAnnouncements((prev) => [...newArray, ...prev]);
} catch (error) {
diff --git a/src/components/Embeds/Embed.tsx b/src/components/Embeds/Embed.tsx
index 65b2cef..bef39c6 100644
--- a/src/components/Embeds/Embed.tsx
+++ b/src/components/Embeds/Embed.tsx
@@ -1,42 +1,46 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import { getBaseApiReact } from "../../App";
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { getBaseApiReact } from '../../App';
+import { CustomizedSnackbars } from '../Snackbar/Snackbar';
-import { CustomizedSnackbars } from "../Snackbar/Snackbar";
+import { extractComponents } from '../Chat/MessageDisplay';
+import { executeEvent } from '../../utils/events';
-import { extractComponents } from "../Chat/MessageDisplay";
-import { executeEvent } from "../../utils/events";
-
-import { base64ToBlobUrl } from "../../utils/fileReading";
-import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
-import { blobControllerAtom, blobKeySelector, resourceKeySelector, selectedGroupIdAtom } from "../../atoms/global";
-import { parseQortalLink } from "./embed-utils";
-import { PollCard } from "./PollEmbed";
-import { ImageCard } from "./ImageEmbed";
-import { AttachmentCard } from "./AttachmentEmbed";
-import { decodeIfEncoded } from "../../utils/decode";
+import { base64ToBlobUrl } from '../../utils/fileReading';
+import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
+import {
+ blobControllerAtom,
+ blobKeySelector,
+ resourceKeySelector,
+ selectedGroupIdAtom,
+} from '../../atoms/global';
+import { parseQortalLink } from './embed-utils';
+import { PollCard } from './PollEmbed';
+import { ImageCard } from './ImageEmbed';
+import { AttachmentCard } from './AttachmentEmbed';
+import { decodeIfEncoded } from '../../utils/decode';
const getPoll = async (name) => {
const pollName = name;
const url = `${getBaseApiReact()}/polls/${pollName}`;
const response = await fetch(url, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
const responseData = await response.json();
- if (responseData?.message?.includes("POLL_NO_EXISTS")) {
- throw new Error("POLL_NO_EXISTS");
+ if (responseData?.message?.includes('POLL_NO_EXISTS')) {
+ throw new Error('POLL_NO_EXISTS');
} else if (responseData?.pollName) {
const urlVotes = `${getBaseApiReact()}/polls/votes/${pollName}`;
const responseVotes = await fetch(urlVotes, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
@@ -49,56 +53,64 @@ const getPoll = async (name) => {
};
export const Embed = ({ embedLink }) => {
- const [errorMsg, setErrorMsg] = useState("");
+ const [errorMsg, setErrorMsg] = useState('');
const [isLoading, setIsLoading] = useState(false);
const [poll, setPoll] = useState(null);
- const [type, setType] = useState("");
+ const [type, setType] = useState('');
const hasFetched = useRef(false);
const [openSnack, setOpenSnack] = useState(false);
const [infoSnack, setInfoSnack] = useState(null);
const [external, setExternal] = useState(null);
- const [imageUrl, setImageUrl] = useState("");
+ const [imageUrl, setImageUrl] = useState('');
const [parsedData, setParsedData] = useState(null);
const setBlobs = useSetRecoilState(blobControllerAtom);
- const [selectedGroupId] = useRecoilState(selectedGroupIdAtom)
- const resourceData = useMemo(()=> {
+ const [selectedGroupId] = useRecoilState(selectedGroupIdAtom);
+ const resourceData = useMemo(() => {
const parsedDataOnTheFly = parseQortalLink(embedLink);
- if(parsedDataOnTheFly?.service && parsedDataOnTheFly?.name && parsedDataOnTheFly?.identifier){
+ if (
+ parsedDataOnTheFly?.service &&
+ parsedDataOnTheFly?.name &&
+ parsedDataOnTheFly?.identifier
+ ) {
return {
- service : parsedDataOnTheFly?.service,
+ service: parsedDataOnTheFly?.service,
name: parsedDataOnTheFly?.name,
identifier: parsedDataOnTheFly?.identifier,
- fileName: parsedDataOnTheFly?.fileName ? decodeURIComponent(parsedDataOnTheFly?.fileName) : null,
- mimeType: parsedDataOnTheFly?.mimeType ? decodeURIComponent(parsedDataOnTheFly?.mimeType) : null,
- key: parsedDataOnTheFly?.key ? decodeURIComponent(parsedDataOnTheFly?.key) : null,
- }
+ fileName: parsedDataOnTheFly?.fileName
+ ? decodeURIComponent(parsedDataOnTheFly?.fileName)
+ : null,
+ mimeType: parsedDataOnTheFly?.mimeType
+ ? decodeURIComponent(parsedDataOnTheFly?.mimeType)
+ : null,
+ key: parsedDataOnTheFly?.key
+ ? decodeURIComponent(parsedDataOnTheFly?.key)
+ : null,
+ };
} else {
- return null
+ return null;
}
- }, [embedLink])
+ }, [embedLink]);
- const keyIdentifier = useMemo(()=> {
-
- if(resourceData){
- return `${resourceData.service}-${resourceData.name}-${resourceData.identifier}`
+ const keyIdentifier = useMemo(() => {
+ if (resourceData) {
+ return `${resourceData.service}-${resourceData.name}-${resourceData.identifier}`;
} else {
- return undefined
+ return undefined;
}
- }, [resourceData])
+ }, [resourceData]);
const blobUrl = useRecoilValue(blobKeySelector(keyIdentifier));
const handlePoll = async (parsedData) => {
try {
setIsLoading(true);
- setErrorMsg("");
- setType("POLL");
+ setErrorMsg('');
+ setType('POLL');
if (!parsedData?.name)
- throw new Error("Invalid poll embed link. Missing name.");
+ throw new Error('Invalid poll embed link. Missing name.');
const pollRes = await getPoll(parsedData.name);
setPoll(pollRes);
-
} catch (error) {
- setErrorMsg(error?.message || "Invalid embed link");
+ setErrorMsg(error?.message || 'Invalid embed link');
} finally {
setIsLoading(false);
}
@@ -106,8 +118,8 @@ export const Embed = ({ embedLink }) => {
const getImage = async ({ identifier, name, service }, key, parsedData) => {
try {
- if(blobUrl?.blobUrl){
- return blobUrl?.blobUrl
+ if (blobUrl?.blobUrl) {
+ return blobUrl?.blobUrl;
}
let numberOfTries = 0;
let imageFinalUrl = null;
@@ -116,76 +128,76 @@ export const Embed = ({ embedLink }) => {
const urlStatus = `${getBaseApiReact()}/arbitrary/resource/status/${service}/${name}/${identifier}?build=true`;
const responseStatus = await fetch(urlStatus, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
const responseData = await responseStatus.json();
- if (responseData?.status === "READY") {
+ if (responseData?.status === 'READY') {
if (parsedData?.encryptionType) {
const urlData = `${getBaseApiReact()}/arbitrary/${service}/${name}/${identifier}?encoding=base64`;
const responseData = await fetch(urlData, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
const data = await responseData.text();
if (data) {
- let decryptedData
+ let decryptedData;
try {
- if(key && encryptionType === 'private'){
+ if (key && encryptionType === 'private') {
decryptedData = await window.sendMessage(
- "DECRYPT_DATA_WITH_SHARING_KEY",
-
- {
- encryptedData: data,
+ 'DECRYPT_DATA_WITH_SHARING_KEY',
+
+ {
+ encryptedData: data,
key: decodeURIComponent(key),
- }
-
+ }
);
}
- if(encryptionType === 'group'){
-
+ if (encryptionType === 'group') {
decryptedData = await window.sendMessage(
- "DECRYPT_QORTAL_GROUP_DATA",
-
- {
- data64: data,
- groupId: selectedGroupId,
- }
-
- );
+ 'DECRYPT_QORTAL_GROUP_DATA',
- }
+ {
+ data64: data,
+ groupId: selectedGroupId,
+ }
+ );
+ }
} catch (error) {
- throw new Error('Unable to decrypt')
+ throw new Error('Unable to decrypt');
}
-
- if (!decryptedData || decryptedData?.error) throw new Error("Could not decrypt data");
- imageFinalUrl = base64ToBlobUrl(decryptedData, parsedData?.mimeType ? decodeURIComponent(parsedData?.mimeType) : undefined)
- setBlobs((prev=> {
+
+ if (!decryptedData || decryptedData?.error)
+ throw new Error('Could not decrypt data');
+ imageFinalUrl = base64ToBlobUrl(
+ decryptedData,
+ parsedData?.mimeType
+ ? decodeURIComponent(parsedData?.mimeType)
+ : undefined
+ );
+ setBlobs((prev) => {
return {
...prev,
[`${service}-${name}-${identifier}`]: {
blobUrl: imageFinalUrl,
- timestamp: Date.now()
- }
- }
- }))
+ timestamp: Date.now(),
+ },
+ };
+ });
} else {
- throw new Error('No data for image')
+ throw new Error('No data for image');
}
-
} else {
- imageFinalUrl = `${getBaseApiReact()}/arbitrary/${service}/${name}/${identifier}?async=true`;
-
- // If parsedData is used here, it must be defined somewhere
-
- }
+ imageFinalUrl = `${getBaseApiReact()}/arbitrary/${service}/${name}/${identifier}?async=true`;
+
+ // If parsedData is used here, it must be defined somewhere
+ }
}
};
@@ -203,18 +215,19 @@ export const Embed = ({ embedLink }) => {
}
if (imageFinalUrl) {
-
return imageFinalUrl;
} else {
setErrorMsg(
- "Unable to download IMAGE. Please try again later by clicking the refresh button"
+ 'Unable to download IMAGE. Please try again later by clicking the refresh button'
);
return null;
}
} catch (error) {
- console.error("Error fetching image:", error);
+ console.error('Error fetching image:', error);
setErrorMsg(
- error?.error || error?.message || "An unexpected error occurred while trying to download the image"
+ error?.error ||
+ error?.message ||
+ 'An unexpected error occurred while trying to download the image'
);
return null;
}
@@ -223,25 +236,27 @@ export const Embed = ({ embedLink }) => {
const handleImage = async (parsedData) => {
try {
setIsLoading(true);
- setErrorMsg("");
+ setErrorMsg('');
if (!parsedData?.name || !parsedData?.service || !parsedData?.identifier)
- throw new Error("Invalid image embed link. Missing param.");
- let image = await getImage({
- name: parsedData.name,
- service: parsedData.service,
- identifier: parsedData?.identifier,
- }, parsedData?.key, parsedData);
-
- setImageUrl(image);
+ throw new Error('Invalid image embed link. Missing param.');
+ let image = await getImage(
+ {
+ name: parsedData.name,
+ service: parsedData.service,
+ identifier: parsedData?.identifier,
+ },
+ parsedData?.key,
+ parsedData
+ );
+ setImageUrl(image);
} catch (error) {
- setErrorMsg(error?.message || "Invalid embed link");
+ setErrorMsg(error?.message || 'Invalid embed link');
} finally {
setIsLoading(false);
}
};
-
const handleLink = () => {
try {
const parsedData = parseQortalLink(embedLink);
@@ -254,28 +269,26 @@ export const Embed = ({ embedLink }) => {
setExternal(res);
}
}
- } catch (error) {
-
- }
+ } catch (error) {}
switch (type) {
- case "POLL":
+ case 'POLL':
{
handlePoll(parsedData);
}
break;
- case "IMAGE":
- setType("IMAGE");
+ case 'IMAGE':
+ setType('IMAGE');
+
+ break;
+ case 'ATTACHMENT':
+ setType('ATTACHMENT');
break;
- case "ATTACHMENT":
- setType("ATTACHMENT");
-
- break;
default:
break;
}
} catch (error) {
- setErrorMsg(error?.message || "Invalid embed link");
+ setErrorMsg(error?.message || 'Invalid embed link');
}
};
@@ -284,13 +297,13 @@ export const Embed = ({ embedLink }) => {
const parsedData = parseQortalLink(embedLink);
handleImage(parsedData);
} catch (error) {
- setErrorMsg(error?.message || "Invalid embed link");
+ setErrorMsg(error?.message || 'Invalid embed link');
}
};
const openExternal = () => {
- executeEvent("addTab", { data: external });
- executeEvent("open-apps-mode", {});
+ executeEvent('addTab', { data: external });
+ executeEvent('open-apps-mode', {});
};
useEffect(() => {
@@ -299,8 +312,6 @@ export const Embed = ({ embedLink }) => {
hasFetched.current = true;
}, [embedLink]);
-
-
const resourceDetails = useRecoilValue(resourceKeySelector(keyIdentifier));
const { parsedType, encryptionType } = useMemo(() => {
@@ -312,15 +323,17 @@ export const Embed = ({ embedLink }) => {
parsedType = parsedDataOnTheFly.type;
}
if (parsedDataOnTheFly?.encryptionType) {
- encryptionType = parsedDataOnTheFly?.encryptionType
+ encryptionType = parsedDataOnTheFly?.encryptionType;
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
return { parsedType, encryptionType };
}, [embedLink]);
return (
{
+ if (poll?.info?.owner) {
+ getName(poll.info.owner);
+ }
+ }, [poll?.info?.owner]);
+
+ return (
+
+
-
- POLL embed
+
+
+
+ POLL embed
-
-
+
+ {external && (
-
- {external && (
-
-
- )}
-
+ )}
-
+
+
-
+
+
+ {!isOpen && !errorMsg && (
+ <>
+
- Created by {ownerName || poll?.info?.owner}
-
-
-
- {!isOpen && !errorMsg && (
- <>
-
- {" "}
-
- )}
- {errorMsg && (
-
- {" "}
-
- {errorMsg}
- {" "}
-
- )}
-
-
-
-
+ )}
+ {errorMsg && (
+
+ >
+ {' '}
- Options
-
- setSelectedOption(e.target.value)}
- >
- {poll?.info?.pollOptions?.map((option, index) => (
-
-
-
- {' '}
+
+ )}
+
+
+
+
+
+ Options
+
+ setSelectedOption(e.target.value)}
+ >
+ {poll?.info?.pollOptions?.map((option, index) => (
+
+
+
+
+ {' '}
+ {`${poll?.votes?.totalVotes} ${
+ poll?.votes?.totalVotes === 1 ? ' vote' : ' votes'
+ }`}
+
+
+
+ item?.voterPublicKey === userInfo?.publicKey
+ )
+ ? 'visible'
+ : 'hidden',
+ }}
+ >
+ You've already voted.
+
+
+ Is processing transaction, please wait...
+
+ )}
+ {
+ setShowResults((prev) => !prev);
+ }}
+ >
+ {showResults ? 'hide ' : 'show '} results
+
+
+ {showResults &&
+
+ );
+};
+
+const PollResults = ({ votes }) => {
+ const maxVotes = Math.max(
+ ...votes?.voteCounts?.map((option) => option.voteCount)
+ );
+ const options = votes?.voteCounts;
+ return (
+
+ {options
+ .sort((a, b) => b.voteCount - a.voteCount) // Sort options by votes (highest first)
+ .map((option, index) => (
+
+
+
- {" "}
- {`${poll?.votes?.totalVotes} ${
- poll?.votes?.totalVotes === 1 ? " vote" : " votes"
- }`}
+ {`${index + 1}. ${option.optionName}`}
+
+
+ {option.voteCount} votes
-
- item?.voterPublicKey === userInfo?.publicKey
- )
- ? "visible"
- : "hidden",
+ mt: 1,
+ height: 10,
+ backgroundColor: '#e0e0e0',
+ borderRadius: 5,
+ overflow: 'hidden',
}}
>
- You've already voted.
-
-
- Is processing transaction, please wait...
-
- )}
- {
- setShowResults((prev) => !prev);
- }}
- >
- {showResults ? "hide " : "show "} results
-
-
- {showResults &&
-
- );
- };
-
- const PollResults = ({ votes }) => {
- const maxVotes = Math.max(
- ...votes?.voteCounts?.map((option) => option.voteCount)
- );
- const options = votes?.voteCounts;
- return (
-
- {options
- .sort((a, b) => b.voteCount - a.voteCount) // Sort options by votes (highest first)
- .map((option, index) => (
-
-
-
- {`${index + 1}. ${option.optionName}`}
-
-
- {option.voteCount} votes
-
-
-
+ />
- ))}
-
- );
- };
\ No newline at end of file
+
+ ))}
+
+ );
+};
diff --git a/src/components/Group/AddGroupList.tsx b/src/components/Group/AddGroupList.tsx
index ccd4850..433d0e4 100644
--- a/src/components/Group/AddGroupList.tsx
+++ b/src/components/Group/AddGroupList.tsx
@@ -7,7 +7,7 @@ import {
Popover,
TextField,
Typography,
-} from "@mui/material";
+} from '@mui/material';
import React, {
useCallback,
useContext,
@@ -15,20 +15,20 @@ import React, {
useMemo,
useRef,
useState,
-} from "react";
+} from 'react';
import {
AutoSizer,
CellMeasurer,
CellMeasurerCache,
List,
-} from "react-virtualized";
-import _ from "lodash";
-import { MyContext, getBaseApiReact } from "../../App";
-import { LoadingButton } from "@mui/lab";
-import { getBaseApi, getFee } from "../../background";
+} from 'react-virtualized';
+import _ from 'lodash';
+import { MyContext, getBaseApiReact } from '../../App';
+import { LoadingButton } from '@mui/lab';
+import { getBaseApi, getFee } from '../../background';
import LockIcon from '@mui/icons-material/Lock';
import NoEncryptionGmailerrorredIcon from '@mui/icons-material/NoEncryptionGmailerrorred';
-import { Spacer } from "../../common/Spacer";
+import { Spacer } from '../../common/Spacer';
const cache = new CellMeasurerCache({
fixedWidth: true,
defaultHeight: 50,
@@ -41,7 +41,7 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
const [popoverAnchor, setPopoverAnchor] = useState(null); // Track which list item the popover is anchored to
const [openPopoverIndex, setOpenPopoverIndex] = useState(null); // Track which list item has the popover open
const listRef = useRef();
- const [inputValue, setInputValue] = useState("");
+ const [inputValue, setInputValue] = useState('');
const [filteredItems, setFilteredItems] = useState(groups);
const [isLoading, setIsLoading] = useState(false);
@@ -72,9 +72,7 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
const getGroups = async () => {
try {
- const response = await fetch(
- `${getBaseApiReact()}/groups/?limit=0`
- );
+ const response = await fetch(`${getBaseApiReact()}/groups/?limit=0`);
const groupData = await response.json();
const filteredGroup = groupData.filter(
(item) => !memberGroups.find((group) => group.groupId === item.groupId)
@@ -103,23 +101,25 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
const handleJoinGroup = async (group, isOpen) => {
try {
const groupId = group.groupId;
- const fee = await getFee('JOIN_GROUP')
- await show({
- message: "Would you like to perform an JOIN_GROUP transaction?" ,
- publishFee: fee.fee + ' QORT'
- })
+ const fee = await getFee('JOIN_GROUP');
+ await show({
+ message: 'Would you like to perform an JOIN_GROUP transaction?',
+ publishFee: fee.fee + ' QORT',
+ });
setIsLoading(true);
await new Promise((res, rej) => {
- window.sendMessage("joinGroup", {
- groupId,
- })
+ window
+ .sendMessage('joinGroup', {
+ groupId,
+ })
.then((response) => {
if (!response?.error) {
setInfoSnack({
- type: "success",
- message: "Successfully requested to join group. It may take a couple of minutes for the changes to propagate",
+ type: 'success',
+ message:
+ 'Successfully requested to join group. It may take a couple of minutes for the changes to propagate',
});
-
+
if (isOpen) {
setTxList((prev) => [
{
@@ -145,14 +145,14 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
...prev,
]);
}
-
+
setOpenSnack(true);
handlePopoverClose();
res(response);
return;
} else {
setInfoSnack({
- type: "error",
+ type: 'error',
message: response?.error,
});
setOpenSnack(true);
@@ -161,18 +161,18 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
})
.catch((error) => {
setInfoSnack({
- type: "error",
- message: error.message || "An error occurred",
+ type: 'error',
+ message: error.message || 'An error occurred',
});
setOpenSnack(true);
rej(error);
});
-
});
setIsLoading(false);
- } catch (error) {} finally {
+ } catch (error) {
+ console.log(error);
+ } finally {
setIsLoading(false);
-
}
};
@@ -195,30 +195,30 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
anchorEl={popoverAnchor}
onClose={handlePopoverClose}
anchorOrigin={{
- vertical: "bottom",
- horizontal: "center",
+ vertical: 'bottom',
+ horizontal: 'center',
}}
transformOrigin={{
- vertical: "top",
- horizontal: "center",
+ vertical: 'top',
+ horizontal: 'center',
}}
- style={{ marginTop: "8px" }}
+ style={{ marginTop: '8px' }}
>
Join {group?.groupName}
{group?.isOpen === false &&
- "This is a closed/private group, so you will need to wait until an admin accepts your request"}
+ 'This is a closed/private group, so you will need to wait until an admin accepts your request'}
{
onClick={(event) => handlePopoverOpen(event, index)}
>
{group?.isOpen === false && (
- {
};
return (
-
+
{
/>
{replyMessage && (
@@ -735,7 +740,6 @@ export const ChatDirect = ({
onClick={() => {
setReplyMessage(null);
setOnEditMessage(null);
-
clearEditorContent();
}}
>
@@ -756,9 +760,9 @@ export const ChatDirect = ({
{isSending && (
+
- {parsedType === "POLL" && (
+ {parsedType === 'POLL' && (
{
errorMsg={errorMsg}
/>
)}
- {parsedType === "IMAGE" && (
+ {parsedType === 'IMAGE' && (
{
)}
{parsedType === 'ATTACHMENT' && (
{
);
};
-
-
-
-
-
-
-
-
diff --git a/src/components/Embeds/PollEmbed.tsx b/src/components/Embeds/PollEmbed.tsx
index 3da02c3..65e5983 100644
--- a/src/components/Embeds/PollEmbed.tsx
+++ b/src/components/Embeds/PollEmbed.tsx
@@ -1,5 +1,5 @@
-import React, { useContext, useEffect, useState } from "react";
-import { MyContext } from "../../App";
+import React, { useContext, useEffect, useState } from 'react';
+import { MyContext } from '../../App';
import {
Card,
CardContent,
@@ -12,384 +12,389 @@ import {
Box,
ButtonBase,
Divider,
-
-} from "@mui/material";
-import { getNameInfo } from "../Group/Group";
-import PollIcon from "@mui/icons-material/Poll";
-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";
-
+} from '@mui/material';
+import { getNameInfo } from '../Group/Group';
+import PollIcon from '@mui/icons-material/Poll';
+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 = ({
- poll,
- setInfoSnack,
- setOpenSnack,
- refresh,
- openExternal,
- external,
- isLoadingParent,
- errorMsg,
- }) => {
- const [selectedOption, setSelectedOption] = useState("");
- const [ownerName, setOwnerName] = useState("");
- const [showResults, setShowResults] = useState(false);
- const [isOpen, setIsOpen] = useState(false);
- const { show, userInfo } = useContext(MyContext);
- const [isLoadingSubmit, setIsLoadingSubmit] = useState(false);
- const handleVote = async () => {
- const fee = await getFee("VOTE_ON_POLL");
-
- await show({
- message: `Do you accept this VOTE_ON_POLL transaction? POLLS are public!`,
- publishFee: fee.fee + " QORT",
- });
- setIsLoadingSubmit(true);
-
- window
- .sendMessage(
- "voteOnPoll",
- {
- pollName: poll?.info?.pollName,
- optionIndex: +selectedOption,
- },
- 60000
- )
- .then((response) => {
- setIsLoadingSubmit(false);
- if (response.error) {
- setInfoSnack({
- type: "error",
- message: response?.error || "Unable to vote.",
- });
- setOpenSnack(true);
- return;
- } else {
- setInfoSnack({
- type: "success",
- message:
- "Successfully voted. Please wait a couple minutes for the network to propogate the changes.",
- });
- setOpenSnack(true);
- }
- })
- .catch((error) => {
- setIsLoadingSubmit(false);
+ poll,
+ setInfoSnack,
+ setOpenSnack,
+ refresh,
+ openExternal,
+ external,
+ isLoadingParent,
+ errorMsg,
+}) => {
+ const [selectedOption, setSelectedOption] = useState('');
+ const [ownerName, setOwnerName] = useState('');
+ const [showResults, setShowResults] = useState(false);
+ const [isOpen, setIsOpen] = useState(false);
+ const { show, userInfo } = useContext(MyContext);
+ const [isLoadingSubmit, setIsLoadingSubmit] = useState(false);
+ const handleVote = async () => {
+ const fee = await getFee('VOTE_ON_POLL');
+
+ await show({
+ message: `Do you accept this VOTE_ON_POLL transaction? POLLS are public!`,
+ publishFee: fee.fee + ' QORT',
+ });
+ setIsLoadingSubmit(true);
+
+ window
+ .sendMessage(
+ 'voteOnPoll',
+ {
+ pollName: poll?.info?.pollName,
+ optionIndex: +selectedOption,
+ },
+ 60000
+ )
+ .then((response) => {
+ setIsLoadingSubmit(false);
+ if (response.error) {
setInfoSnack({
- type: "error",
- message: error?.message || "Unable to vote.",
+ type: 'error',
+ message: response?.error || 'Unable to vote.',
+ });
+ setOpenSnack(true);
+ return;
+ } else {
+ setInfoSnack({
+ type: 'success',
+ message:
+ 'Successfully voted. Please wait a couple minutes for the network to propogate the changes.',
});
setOpenSnack(true);
- });
- };
-
- const getName = async (owner) => {
- try {
- const res = await getNameInfo(owner);
- if (res) {
- setOwnerName(res);
}
- } catch (error) {}
- };
-
- useEffect(() => {
- if (poll?.info?.owner) {
- getName(poll.info.owner);
+ })
+ .catch((error) => {
+ setIsLoadingSubmit(false);
+ setInfoSnack({
+ type: 'error',
+ message: error?.message || 'Unable to vote.',
+ });
+ setOpenSnack(true);
+ });
+ };
+
+ const getName = async (owner) => {
+ try {
+ const res = await getNameInfo(owner);
+ if (res) {
+ setOwnerName(res);
}
- }, [poll?.info?.owner]);
-
- return (
- Groups list
diff --git a/src/components/Group/Forum/GroupMail.tsx b/src/components/Group/Forum/GroupMail.tsx
index 38d93e9..bbb1f8d 100644
--- a/src/components/Group/Forum/GroupMail.tsx
+++ b/src/components/Group/Forum/GroupMail.tsx
@@ -5,10 +5,10 @@ import React, {
useMemo,
useRef,
useState,
-} from "react";
-import { Avatar, Box, Popover, Typography } from "@mui/material";
+} from 'react';
+import { Avatar, Box, Popover, Typography } from '@mui/material';
// import { MAIL_SERVICE_TYPE, THREAD_SERVICE_TYPE } from "../../constants/mail";
-import { Thread } from "./Thread";
+import { Thread } from './Thread';
import {
AllThreadP,
ArrowDownIcon,
@@ -38,61 +38,73 @@ import {
ThreadSingleLastMessageP,
ThreadSingleLastMessageSpanP,
ThreadSingleTitle,
-} from "./Mail-styles";
+} from './Mail-styles';
import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos';
-import { Spacer } from "../../../common/Spacer";
-import { formatDate, formatTimestamp } from "../../../utils/time";
-import LazyLoad from "../../../common/LazyLoad";
-import { delay } from "../../../utils/helpers";
-import { NewThread } from "./NewThread";
-import { getBaseApi } from "../../../background";
-import { decryptPublishes, getTempPublish, handleUnencryptedPublishes } from "../../Chat/GroupAnnouncements";
-import CheckSVG from "../../../assets/svgs/Check.svg";
-import SortSVG from "../../../assets/svgs/Sort.svg";
-import ArrowDownSVG from "../../../assets/svgs/ArrowDown.svg";
-import { LoadingSnackbar } from "../../Snackbar/LoadingSnackbar";
-import { executeEvent, subscribeToEvent, unsubscribeFromEvent } from "../../../utils/events";
+import { Spacer } from '../../../common/Spacer';
+import { formatDate, formatTimestamp } from '../../../utils/time';
+import LazyLoad from '../../../common/LazyLoad';
+import { delay } from '../../../utils/helpers';
+import { NewThread } from './NewThread';
+import { getBaseApi } from '../../../background';
+import {
+ decryptPublishes,
+ getTempPublish,
+ handleUnencryptedPublishes,
+} from '../../Chat/GroupAnnouncements';
+import CheckSVG from '../../../assets/svgs/Check.svg';
+import SortSVG from '../../../assets/svgs/Sort.svg';
+import ArrowDownSVG from '../../../assets/svgs/ArrowDown.svg';
+import { LoadingSnackbar } from '../../Snackbar/LoadingSnackbar';
+import {
+ executeEvent,
+ subscribeToEvent,
+ unsubscribeFromEvent,
+} from '../../../utils/events';
import RefreshIcon from '@mui/icons-material/Refresh';
-import { getArbitraryEndpointReact, getBaseApiReact, isMobile } from "../../../App";
-import { WrapperUserAction } from "../../WrapperUserAction";
-import { addDataPublishesFunc, getDataPublishesFunc } from "../Group";
-const filterOptions = ["Recently active", "Newest", "Oldest"];
+import {
+ getArbitraryEndpointReact,
+ getBaseApiReact,
+ isMobile,
+} from '../../../App';
+import { WrapperUserAction } from '../../WrapperUserAction';
+import { addDataPublishesFunc, getDataPublishesFunc } from '../Group';
+const filterOptions = ['Recently active', 'Newest', 'Oldest'];
-export const threadIdentifier = "DOCUMENT";
+export const threadIdentifier = 'DOCUMENT';
export const GroupMail = ({
selectedGroup,
userInfo,
getSecretKey,
secretKey,
- defaultThread,
+ defaultThread,
setDefaultThread,
hide,
- isPrivate
+ isPrivate,
}) => {
const [viewedThreads, setViewedThreads] = React.useState({});
- const [filterMode, setFilterMode] = useState("Recently active");
+ const [filterMode, setFilterMode] = useState('Recently active');
const [currentThread, setCurrentThread] = React.useState(null);
const [recentThreads, setRecentThreads] = useState([]);
const [allThreads, setAllThreads] = useState([]);
const [members, setMembers] = useState(null);
const [isOpenFilterList, setIsOpenFilterList] = useState(false);
const anchorElInstanceFilter = useRef(null);
- const [tempPublishedList, setTempPublishedList] = useState([])
- const dataPublishes = useRef({})
+ const [tempPublishedList, setTempPublishedList] = useState([]);
+ const dataPublishes = useRef({});
- const [isLoading, setIsLoading] = useState(false)
+ const [isLoading, setIsLoading] = useState(false);
const groupIdRef = useRef(null);
const groupId = useMemo(() => {
return selectedGroup?.groupId;
}, [selectedGroup]);
- useEffect(()=> {
- if(!groupId) return
- (async ()=> {
- const res = await getDataPublishesFunc(groupId, 'thread')
- dataPublishes.current = res || {}
- })()
- }, [groupId])
+ useEffect(() => {
+ if (!groupId) return;
+ (async () => {
+ const res = await getDataPublishesFunc(groupId, 'thread');
+ dataPublishes.current = res || {};
+ })();
+ }, [groupId]);
useEffect(() => {
if (groupId !== groupIdRef?.current) {
@@ -103,55 +115,66 @@ export const GroupMail = ({
}
}, [groupId]);
- const setTempData = async ()=> {
+ const setTempData = async () => {
try {
- const getTempAnnouncements = await getTempPublish()
-
- if(getTempAnnouncements?.thread){
- let tempData = []
- Object.keys(getTempAnnouncements?.thread || {}).map((key)=> {
- const value = getTempAnnouncements?.thread[key]
- if(value?.data?.groupId === groupIdRef?.current){
- tempData.push(value.data)
+ const getTempAnnouncements = await getTempPublish();
+
+ if (getTempAnnouncements?.thread) {
+ let tempData = [];
+ Object.keys(getTempAnnouncements?.thread || {}).map((key) => {
+ const value = getTempAnnouncements?.thread[key];
+ if (value?.data?.groupId === groupIdRef?.current) {
+ tempData.push(value.data);
+ }
+ });
+ setTempPublishedList(tempData);
}
-
- })
- setTempPublishedList(tempData)
- }
- } catch (error) {
-
- }
-
- }
-
- const getEncryptedResource = async ({ name, identifier, resource }, isPrivate) => {
- let data = dataPublishes.current[`${name}-${identifier}`]
- if(!data || (data?.update || data?.created !== (resource?.updated || resource?.created))){
- const res = await fetch(
- `${getBaseApiReact()}/arbitrary/DOCUMENT/${name}/${identifier}?encoding=base64`
- );
- if(!res?.ok) return
- data = await res.text();
- await addDataPublishesFunc({...resource, data}, groupId, 'thread')
+ } catch (error) {}
+ };
+ const getEncryptedResource = async (
+ { name, identifier, resource },
+ isPrivate
+ ) => {
+ let data = dataPublishes.current[`${name}-${identifier}`];
+ if (
+ !data ||
+ data?.update ||
+ data?.created !== (resource?.updated || resource?.created)
+ ) {
+ const res = await fetch(
+ `${getBaseApiReact()}/arbitrary/DOCUMENT/${name}/${identifier}?encoding=base64`
+ );
+ if (!res?.ok) return;
+ data = await res.text();
+ await addDataPublishesFunc({ ...resource, data }, groupId, 'thread');
} else {
- data = data.data
+ data = data.data;
}
- const response = isPrivate === false ? handleUnencryptedPublishes([data]) : await decryptPublishes([{ data }], secretKey);
+ const response =
+ isPrivate === false
+ ? handleUnencryptedPublishes([data])
+ : await decryptPublishes([{ data }], secretKey);
const messageData = response[0];
return messageData.decryptedData;
};
- const updateThreadActivity = async ({threadId, qortalName, groupId, thread}) => {
+ const updateThreadActivity = async ({
+ threadId,
+ qortalName,
+ groupId,
+ thread,
+ }) => {
try {
await new Promise((res, rej) => {
- window.sendMessage("updateThreadActivity", {
- threadId,
- qortalName,
- groupId,
- thread,
- })
+ window
+ .sendMessage('updateThreadActivity', {
+ threadId,
+ qortalName,
+ groupId,
+ thread,
+ })
.then((response) => {
if (!response?.error) {
res(response);
@@ -160,13 +183,10 @@ export const GroupMail = ({
rej(response.error);
})
.catch((error) => {
- rej(error.message || "An error occurred");
+ rej(error.message || 'An error occurred');
});
-
});
-
} catch (error) {
-
} finally {
}
};
@@ -174,9 +194,9 @@ export const GroupMail = ({
const getAllThreads = React.useCallback(
async (groupId: string, mode: string, isInitial?: boolean) => {
try {
- setIsLoading(true)
+ setIsLoading(true);
const offset = isInitial ? 0 : allThreads.length;
- const isReverse = mode === "Newest" ? true : false;
+ const isReverse = mode === 'Newest' ? true : false;
if (isInitial) {
// dispatch(setIsLoadingCustom("Loading threads"));
}
@@ -184,9 +204,9 @@ export const GroupMail = ({
const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=${threadIdentifier}&identifier=${identifier}&limit=${20}&includemetadata=false&offset=${offset}&reverse=${isReverse}&prefix=true`;
const response = await fetch(url, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
const responseData = await response.json();
@@ -209,21 +229,26 @@ export const GroupMail = ({
let threadRes = null;
try {
threadRes = await Promise.race([
- getEncryptedResource({
- name: message.name,
- identifier: message.identifier,
- resource: message
- }, isPrivate),
+ getEncryptedResource(
+ {
+ name: message.name,
+ identifier: message.identifier,
+ resource: message,
+ },
+ isPrivate
+ ),
delay(5000),
]);
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
if (threadRes?.title) {
fullObject = {
...message,
threadData: threadRes,
threadOwner: message?.name,
- threadId: message.identifier
+ threadId: message.identifier,
};
}
}
@@ -251,7 +276,7 @@ export const GroupMail = ({
console.log({ error });
} finally {
if (isInitial) {
- setIsLoading(false)
+ setIsLoading(false);
// dispatch(setIsLoadingCustom(null));
}
}
@@ -261,21 +286,21 @@ export const GroupMail = ({
const getMailMessages = React.useCallback(
async (groupId: string, members: any) => {
try {
- setIsLoading(true)
+ setIsLoading(true);
const identifier = `thmsg-grp-${groupId}-thread-`;
const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=${threadIdentifier}&identifier=${identifier}&limit=100&includemetadata=false&offset=${0}&reverse=true&prefix=true`;
const response = await fetch(url, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
const responseData = await response.json();
const messagesForThread: any = {};
for (const message of responseData) {
let str = message.identifier;
- const parts = str.split("-");
+ const parts = str.split('-');
// Get the second last element
const secondLastId = parts[parts.length - 2];
@@ -295,16 +320,16 @@ export const GroupMail = ({
})
.sort((a, b) => b.created - a.created)
.slice(0, 10);
-
+
let fullThreadArray: any = [];
const getMessageForThreads = newArray.map(async (message: any) => {
try {
const identifierQuery = message.threadId;
const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=${threadIdentifier}&identifier=${identifierQuery}&limit=1&includemetadata=false&offset=${0}&reverse=true&prefix=true`;
const response = await fetch(url, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
const responseData = await response.json();
@@ -324,11 +349,14 @@ export const GroupMail = ({
fullThreadArray.push(fullObject);
} else {
let threadRes = await Promise.race([
- getEncryptedResource({
- name: thread.name,
- identifier: message.threadId,
- resource: thread
- }, isPrivate),
+ getEncryptedResource(
+ {
+ name: thread.name,
+ identifier: message.threadId,
+ resource: thread,
+ },
+ isPrivate
+ ),
delay(10000),
]);
if (threadRes?.title) {
@@ -353,7 +381,7 @@ export const GroupMail = ({
setRecentThreads(sorted);
} catch (error) {
} finally {
- setIsLoading(false)
+ setIsLoading(false);
// dispatch(setIsLoadingCustom(null));
}
},
@@ -361,7 +389,6 @@ export const GroupMail = ({
);
const getMessages = React.useCallback(async () => {
-
// if ( !groupId || members?.length === 0) return;
if (!groupId || isPrivate === null) return;
@@ -371,23 +398,23 @@ export const GroupMail = ({
const interval = useRef(null);
const firstMount = useRef(false);
- const filterModeRef = useRef("");
+ const filterModeRef = useRef('');
useEffect(() => {
- if(hide) return
+ if (hide) return;
if (filterModeRef.current !== filterMode) {
firstMount.current = false;
}
// if (groupId && !firstMount.current && members.length > 0) {
if (groupId && !firstMount.current && isPrivate !== null) {
- if (filterMode === "Recently active") {
+ if (filterMode === 'Recently active') {
getMessages();
- } else if (filterMode === "Newest") {
- getAllThreads(groupId, "Newest", true);
- } else if (filterMode === "Oldest") {
- getAllThreads(groupId, "Oldest", true);
+ } else if (filterMode === 'Newest') {
+ getAllThreads(groupId, 'Newest', true);
+ } else if (filterMode === 'Oldest') {
+ getAllThreads(groupId, 'Oldest', true);
}
- setTempData()
+ setTempData();
firstMount.current = true;
}
}, [groupId, members, filterMode, hide, isPrivate]);
@@ -428,19 +455,16 @@ export const GroupMail = ({
}
}, []);
-
-
-
let listOfThreadsToDisplay = recentThreads;
- if (filterMode === "Newest" || filterMode === "Oldest") {
+ if (filterMode === 'Newest' || filterMode === 'Oldest') {
listOfThreadsToDisplay = allThreads;
}
const onSubmitNewThread = useCallback(
(val: any) => {
- if (filterMode === "Recently active") {
+ if (filterMode === 'Recently active') {
setRecentThreads((prev) => [val, ...prev]);
- } else if (filterMode === "Newest") {
+ } else if (filterMode === 'Newest') {
setAllThreads((prev) => [val, ...prev]);
}
},
@@ -461,72 +485,77 @@ export const GroupMail = ({
setIsOpenFilterList(false);
};
- const refetchThreadsLists = useCallback(()=> {
- if (filterMode === "Recently active") {
+ const refetchThreadsLists = useCallback(() => {
+ if (filterMode === 'Recently active') {
getMessages();
- } else if (filterMode === "Newest") {
- getAllThreads(groupId, "Newest", true);
- } else if (filterMode === "Oldest") {
- getAllThreads(groupId, "Oldest", true);
+ } else if (filterMode === 'Newest') {
+ getAllThreads(groupId, 'Newest', true);
+ } else if (filterMode === 'Oldest') {
+ getAllThreads(groupId, 'Oldest', true);
}
- }, [filterMode, isPrivate])
+ }, [filterMode, isPrivate]);
- const updateThreadActivityCurrentThread = ()=> {
- if(!currentThread) return
- const thread = currentThread
+ const updateThreadActivityCurrentThread = () => {
+ if (!currentThread) return;
+ const thread = currentThread;
updateThreadActivity({
- threadId: thread?.threadId, qortalName: thread?.threadData?.name, groupId: groupId, thread: thread
- })
- }
+ threadId: thread?.threadId,
+ qortalName: thread?.threadData?.name,
+ groupId: groupId,
+ thread: thread,
+ });
+ };
- const setThreadFunc = (data)=> {
- const thread = data
+ const setThreadFunc = (data) => {
+ const thread = data;
setCurrentThread(thread);
- if(thread?.threadId && thread?.threadData?.name){
- updateThreadActivity({
- threadId: thread?.threadId, qortalName: thread?.threadData?.name, groupId: groupId, thread: thread
- })
- }
+ if (thread?.threadId && thread?.threadData?.name) {
+ updateThreadActivity({
+ threadId: thread?.threadId,
+ qortalName: thread?.threadData?.name,
+ groupId: groupId,
+ thread: thread,
+ });
+ }
setTimeout(() => {
- executeEvent("threadFetchMode", {
- mode: "last-page"
+ executeEvent('threadFetchMode', {
+ mode: 'last-page',
});
}, 300);
- }
+ };
-
- useEffect(()=> {
- if(defaultThread){
- setThreadFunc(defaultThread)
- setDefaultThread(null)
+ useEffect(() => {
+ if (defaultThread) {
+ setThreadFunc(defaultThread);
+ setDefaultThread(null);
}
- }, [defaultThread])
+ }, [defaultThread]);
const combinedListTempAndReal = useMemo(() => {
// Combine the two lists
- const transformTempPublishedList = tempPublishedList.map((item)=> {
+ const transformTempPublishedList = tempPublishedList.map((item) => {
return {
...item,
threadData: item.tempData,
threadOwner: item?.name,
- threadId: item.identifier
- }
- })
+ threadId: item.identifier,
+ };
+ });
const combined = [...transformTempPublishedList, ...listOfThreadsToDisplay];
-
+
// Remove duplicates based on the "identifier"
const uniqueItems = new Map();
- combined.forEach(item => {
- uniqueItems.set(item.threadId, item); // This will overwrite duplicates, keeping the last occurrence
+ combined.forEach((item) => {
+ uniqueItems.set(item.threadId, item); // This will overwrite duplicates, keeping the last occurrence
});
-
+
// Convert the map back to an array and sort by "created" timestamp in descending order
const sortedList = Array.from(uniqueItems.values()).sort((a, b) =>
- filterMode === 'Oldest'
- ? a.threadData?.createdAt - b.threadData?.createdAt
- : b.threadData?.createdAt - a.threadData?.createdAt
-);
-
+ filterMode === 'Oldest'
+ ? a.threadData?.createdAt - b.threadData?.createdAt
+ : b.threadData?.createdAt - a.threadData?.createdAt
+ );
+
return sortedList;
}, [tempPublishedList, listOfThreadsToDisplay, filterMode]);
@@ -548,9 +577,9 @@ export const GroupMail = ({
return (
-
{selectedGroup && !currentThread && (
@@ -647,17 +675,22 @@ export const GroupMail = ({
- {filterMode}
+
+ {filterMode}
-
{
setCurrentThread(thread);
- if(thread?.threadId && thread?.threadData?.name){
+ if (thread?.threadId && thread?.threadData?.name) {
updateThreadActivity({
- threadId: thread?.threadId, qortalName: thread?.threadData?.name, groupId: groupId, thread: thread
- })
+ threadId: thread?.threadId,
+ qortalName: thread?.threadData?.name,
+ groupId: groupId,
+ thread: thread,
+ });
}
}}
>
-
{thread?.threadData?.name?.charAt(0)}
-
+
-
by
{thread?.threadData?.name}
-
+
{formatTimestamp(thread?.threadData?.createdAt)}
{thread?.threadData?.title}
- last message:{" "}
+ last message:{' '}
{formatDate(thread?.created)}
)}
-
- {
- setTimeout(() => {
- executeEvent("threadFetchMode", {
- mode: "last-page"
- });
- }, 300);
-
-
- }} sx={{
- position: 'absolute',
- bottom: '2px',
- right: '2px',
- borderRadius: '5px',
- backgroundColor: '#27282c',
- display: 'flex',
- gap: '10px',
- alignItems: 'center',
- padding: '5px',
- cursor: 'pointer',
- '&:hover': {
- background: 'rgba(255, 255, 255, 0.60)'
- }
- }}>
- Last page
- {
+ setTimeout(() => {
+ executeEvent('threadFetchMode', {
+ mode: 'last-page',
+ });
+ }, 300);
+ }}
+ sx={{
+ position: 'absolute',
+ bottom: '2px',
+ right: '2px',
+ borderRadius: '5px',
+ backgroundColor: '#27282c',
+ display: 'flex',
+ gap: '10px',
+ alignItems: 'center',
+ padding: '5px',
+ cursor: 'pointer',
+ '&:hover': {
+ background: 'rgba(255, 255, 255, 0.60)',
+ },
+ }}
+ >
+
+ Last page
+
+
);
@@ -781,12 +821,12 @@ export const GroupMail = ({
{listOfThreadsToDisplay.length >= 20 &&
- filterMode !== "Recently active" && (
+ filterMode !== 'Recently active' && (
getAllThreads(groupId, filterMode, false)}
>
@@ -797,7 +837,7 @@ export const GroupMail = ({
diff --git a/src/components/Group/Forum/NewThread.tsx b/src/components/Group/Forum/NewThread.tsx
index 4c237ec..dd4c83a 100644
--- a/src/components/Group/Forum/NewThread.tsx
+++ b/src/components/Group/Forum/NewThread.tsx
@@ -1,11 +1,17 @@
-import React, { useEffect, useRef, useState } from "react";
-import { Box, Button, CircularProgress, Input, Typography } from "@mui/material";
-import ShortUniqueId from "short-unique-id";
-import CloseIcon from "@mui/icons-material/Close";
+import React, { useEffect, useRef, useState } from 'react';
+import {
+ Box,
+ Button,
+ CircularProgress,
+ Input,
+ Typography,
+} from '@mui/material';
+import ShortUniqueId from 'short-unique-id';
+import CloseIcon from '@mui/icons-material/Close';
-import ModalCloseSVG from "../../../assets/svgs/ModalClose.svg";
+import ModalCloseSVG from '../../../assets/svgs/ModalClose.svg';
-import ComposeIconSVG from "../../../assets/svgs/ComposeIcon.svg";
+import ComposeIconSVG from '../../../assets/svgs/ComposeIcon.svg';
import {
AttachmentContainer,
@@ -22,20 +28,25 @@ import {
NewMessageInputRow,
NewMessageSendButton,
NewMessageSendP,
-} from "./Mail-styles";
+} from './Mail-styles';
-import { ReusableModal } from "./ReusableModal";
-import { Spacer } from "../../../common/Spacer";
-import { formatBytes } from "../../../utils/Size";
-import { CreateThreadIcon } from "../../../assets/svgs/CreateThreadIcon";
-import { SendNewMessage } from "../../../assets/svgs/SendNewMessage";
-import { TextEditor } from "./TextEditor";
-import { MyContext, isMobile, pauseAllQueues, resumeAllQueues } from "../../../App";
-import { getFee } from "../../../background";
-import TipTap from "../../Chat/TipTap";
-import { MessageDisplay } from "../../Chat/MessageDisplay";
-import { CustomizedSnackbars } from "../../Snackbar/Snackbar";
-import { saveTempPublish } from "../../Chat/GroupAnnouncements";
+import { ReusableModal } from './ReusableModal';
+import { Spacer } from '../../../common/Spacer';
+import { formatBytes } from '../../../utils/Size';
+import { CreateThreadIcon } from '../../../assets/svgs/CreateThreadIcon';
+import { SendNewMessage } from '../../../assets/svgs/SendNewMessage';
+import { TextEditor } from './TextEditor';
+import {
+ MyContext,
+ isMobile,
+ pauseAllQueues,
+ resumeAllQueues,
+} from '../../../App';
+import { getFee } from '../../../background';
+import TipTap from '../../Chat/TipTap';
+import { MessageDisplay } from '../../Chat/MessageDisplay';
+import { CustomizedSnackbars } from '../../Snackbar/Snackbar';
+import { saveTempPublish } from '../../Chat/GroupAnnouncements';
const uid = new ShortUniqueId({ length: 8 });
@@ -54,21 +65,21 @@ export function objectToBase64(obj: any) {
const jsonString = JSON.stringify(obj);
// Step 2: Create a Blob from the JSON string
- const blob = new Blob([jsonString], { type: "application/json" });
+ const blob = new Blob([jsonString], { type: 'application/json' });
// Step 3: Create a FileReader to read the Blob as a base64-encoded string
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onloadend = () => {
- if (typeof reader.result === "string") {
+ if (typeof reader.result === 'string') {
// Remove 'data:application/json;base64,' prefix
const base64 = reader.result.replace(
- "data:application/json;base64,",
- ""
+ 'data:application/json;base64,',
+ ''
);
resolve(base64);
} else {
- reject(new Error("Failed to read the Blob as a base64-encoded string"));
+ reject(new Error('Failed to read the Blob as a base64-encoded string'));
}
};
reader.onerror = () => {
@@ -94,10 +105,11 @@ export const publishGroupEncryptedResource = async ({
identifier,
}) => {
return new Promise((res, rej) => {
- window.sendMessage("publishGroupEncryptedResource", {
- encryptedData,
- identifier,
- })
+ window
+ .sendMessage('publishGroupEncryptedResource', {
+ encryptedData,
+ identifier,
+ })
.then((response) => {
if (!response?.error) {
res(response);
@@ -106,19 +118,19 @@ export const publishGroupEncryptedResource = async ({
rej(response.error);
})
.catch((error) => {
- rej(error.message || "An error occurred");
+ rej(error.message || 'An error occurred');
});
-
});
};
export const encryptSingleFunc = async (data: string, secretKeyObject: any) => {
try {
return new Promise((res, rej) => {
- window.sendMessage("encryptSingle", {
- data,
- secretKeyObject,
- })
+ window
+ .sendMessage('encryptSingle', {
+ data,
+ secretKeyObject,
+ })
.then((response) => {
if (!response?.error) {
res(response);
@@ -127,11 +139,12 @@ export const encryptSingleFunc = async (data: string, secretKeyObject: any) => {
rej(response.error);
})
.catch((error) => {
- rej(error.message || "An error occurred");
+ rej(error.message || 'An error occurred');
});
-
});
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
export const NewThread = ({
groupInfo,
@@ -145,14 +158,14 @@ export const NewThread = ({
postReply,
myName,
setPostReply,
- isPrivate
+ isPrivate,
}: NewMessageProps) => {
const { show } = React.useContext(MyContext);
const [isOpen, setIsOpen] = useState(false);
- const [value, setValue] = useState("");
+ const [value, setValue] = useState('');
const [isSending, setIsSending] = useState(false);
- const [threadTitle, setThreadTitle] = useState("");
+ const [threadTitle, setThreadTitle] = useState('');
const [openSnack, setOpenSnack] = React.useState(false);
const [infoSnack, setInfoSnack] = React.useState(null);
const editorRef = useRef(null);
@@ -168,44 +181,42 @@ export const NewThread = ({
const closeModal = () => {
setIsOpen(false);
- setValue("");
- if(setPostReply){
- setPostReply(null)
+ setValue('');
+ if (setPostReply) {
+ setPostReply(null);
}
-
};
async function publishQDNResource() {
try {
- pauseAllQueues()
- if(isSending) return
- setIsSending(true)
- let name: string = "";
- let errorMsg = "";
+ pauseAllQueues();
+ if (isSending) return;
+ setIsSending(true);
+ let name: string = '';
+ let errorMsg = '';
- name = userInfo?.name || "";
+ name = userInfo?.name || '';
const missingFields: string[] = [];
if (!isMessage && !threadTitle) {
- errorMsg = "Please provide a thread title";
+ errorMsg = 'Please provide a thread title';
}
if (!name) {
- errorMsg = "Cannot send a message without a access to your name";
+ errorMsg = 'Cannot send a message without a access to your name';
}
if (!groupInfo) {
- errorMsg = "Cannot access group information";
+ errorMsg = 'Cannot access group information';
}
// if (!description) missingFields.push('subject')
if (missingFields.length > 0) {
- const missingFieldsString = missingFields.join(", ");
+ const missingFieldsString = missingFields.join(', ');
const errMsg = `Missing: ${missingFieldsString}`;
errorMsg = errMsg;
}
-
if (errorMsg) {
// dispatch(
// setNotification({
@@ -217,17 +228,17 @@ export const NewThread = ({
}
const htmlContent = editorRef.current.getHTML();
-
- if (!htmlContent?.trim() || htmlContent?.trim() === "")
- throw new Error("Please provide a first message to the thread");
- const fee = await getFee("ARBITRARY");
+
+ if (!htmlContent?.trim() || htmlContent?.trim() === '')
+ throw new Error('Please provide a first message to the thread');
+ const fee = await getFee('ARBITRARY');
let feeToShow = fee.fee;
if (!isMessage) {
feeToShow = +feeToShow * 2;
}
await show({
- message: "Would you like to perform a ARBITRARY transaction?",
- publishFee: feeToShow + " QORT",
+ message: 'Would you like to perform a ARBITRARY transaction?',
+ publishFee: feeToShow + ' QORT',
});
let reply = null;
@@ -245,20 +256,21 @@ export const NewThread = ({
threadOwner: currentThread?.threadData?.name || name,
reply,
};
-
- const secretKey = isPrivate === false ? null : await getSecretKey(false, true);
+
+ const secretKey =
+ isPrivate === false ? null : await getSecretKey(false, true);
if (!secretKey && isPrivate) {
- throw new Error("Cannot get group secret key");
+ throw new Error('Cannot get group secret key');
}
-
+
if (!isMessage) {
const idThread = uid.rnd();
const idMsg = uid.rnd();
const messageToBase64 = await objectToBase64(mailObject);
- const encryptSingleFirstPost = isPrivate === false ? messageToBase64 : await encryptSingleFunc(
- messageToBase64,
- secretKey
- );
+ const encryptSingleFirstPost =
+ isPrivate === false
+ ? messageToBase64
+ : await encryptSingleFunc(messageToBase64, secretKey);
const threadObject = {
title: threadTitle,
groupId: groupInfo.id,
@@ -267,10 +279,10 @@ export const NewThread = ({
};
const threadToBase64 = await objectToBase64(threadObject);
- const encryptSingleThread = isPrivate === false ? threadToBase64 : await encryptSingleFunc(
- threadToBase64,
- secretKey
- );
+ const encryptSingleThread =
+ isPrivate === false
+ ? threadToBase64
+ : await encryptSingleFunc(threadToBase64, secretKey);
let identifierThread = `grp-${groupInfo.groupId}-thread-${idThread}`;
await publishGroupEncryptedResource({
identifier: identifierThread,
@@ -288,23 +300,27 @@ export const NewThread = ({
service: 'DOCUMENT',
tempData: threadObject,
created: Date.now(),
- groupId: groupInfo.groupId
- }
+ groupId: groupInfo.groupId,
+ };
const dataToSaveToStoragePost = {
name: myName,
identifier: identifierPost,
service: 'DOCUMENT',
tempData: mailObject,
created: Date.now(),
- threadId: identifierThread
- }
- await saveTempPublish({data: dataToSaveToStorage, key: 'thread'})
- await saveTempPublish({data: dataToSaveToStoragePost, key: 'thread-post'})
- setInfoSnack({
- type: "success",
- message: "Successfully created thread. It may take some time for the publish to propagate",
+ threadId: identifierThread,
+ };
+ await saveTempPublish({ data: dataToSaveToStorage, key: 'thread' });
+ await saveTempPublish({
+ data: dataToSaveToStoragePost,
+ key: 'thread-post',
});
- setOpenSnack(true)
+ setInfoSnack({
+ type: 'success',
+ message:
+ 'Successfully created thread. It may take some time for the publish to propagate',
+ });
+ setOpenSnack(true);
// dispatch(
// setNotification({
@@ -313,35 +329,36 @@ export const NewThread = ({
// })
// );
if (publishCallback) {
- publishCallback()
-
+ publishCallback();
}
closeModal();
} else {
-
- if (!currentThread) throw new Error("unable to locate thread Id");
+ if (!currentThread) throw new Error('unable to locate thread Id');
const idThread = currentThread.threadId;
const messageToBase64 = await objectToBase64(mailObject);
- const encryptSinglePost = isPrivate === false ? messageToBase64 : await encryptSingleFunc(
- messageToBase64,
- secretKey
- );
+ const encryptSinglePost =
+ isPrivate === false
+ ? messageToBase64
+ : await encryptSingleFunc(messageToBase64, secretKey);
const idMsg = uid.rnd();
let identifier = `thmsg-${idThread}-${idMsg}`;
const res = await publishGroupEncryptedResource({
identifier: identifier,
encryptedData: encryptSinglePost,
});
-
+
const dataToSaveToStoragePost = {
threadId: idThread,
name: myName,
identifier: identifier,
service: 'DOCUMENT',
tempData: mailObject,
- created: Date.now()
- }
- await saveTempPublish({data: dataToSaveToStoragePost, key: 'thread-post'})
+ created: Date.now(),
+ };
+ await saveTempPublish({
+ data: dataToSaveToStoragePost,
+ key: 'thread-post',
+ });
// await qortalRequest(multiplePublishMsg);
// dispatch(
// setNotification({
@@ -350,12 +367,13 @@ export const NewThread = ({
// })
// );
setInfoSnack({
- type: "success",
- message: "Successfully created post. It may take some time for the publish to propagate",
+ type: 'success',
+ message:
+ 'Successfully created post. It may take some time for the publish to propagate',
});
- setOpenSnack(true)
- if(publishCallback){
- publishCallback()
+ setOpenSnack(true);
+ if (publishCallback) {
+ publishCallback();
}
// messageCallback({
// identifier,
@@ -369,17 +387,16 @@ export const NewThread = ({
closeModal();
} catch (error: any) {
- if(error?.message){
+ if (error?.message) {
setInfoSnack({
- type: "error",
+ type: 'error',
message: error?.message,
});
- setOpenSnack(true)
+ setOpenSnack(true);
}
-
} finally {
setIsSending(false);
- resumeAllQueues()
+ resumeAllQueues();
}
}
@@ -389,56 +406,59 @@ export const NewThread = ({
return (
setIsOpen(true)}
>
{currentThread ? "New Post" : "New Thread"}
+ {currentThread ? 'New Post' : 'New Thread'}
- {isMessage ? "Post Message" : "New Thread"}
+ {isMessage ? 'Post Message' : 'New Thread'}
-
+
@@ -457,19 +477,19 @@ export const NewThread = ({
autoComplete="off"
autoCorrect="off"
sx={{
- width: "100%",
- color: "white",
- "& .MuiInput-input::placeholder": {
- color: "rgba(255,255,255, 0.70) !important",
- fontSize: isMobile ? '14px' : "20px",
- fontStyle: "normal",
+ width: '100%',
+ color: 'white',
+ '& .MuiInput-input::placeholder': {
+ color: 'rgba(255,255,255, 0.70) !important',
+ fontSize: isMobile ? '14px' : '20px',
+ fontStyle: 'normal',
fontWeight: 400,
- lineHeight: "120%", // 24px
- letterSpacing: "0.15px",
+ lineHeight: '120%', // 24px
+ letterSpacing: '0.15px',
opacity: 1,
},
- "&:focus": {
- outline: "none",
+ '&:focus': {
+ outline: 'none',
},
// Add any additional styles for the input here
}}
@@ -481,21 +501,18 @@ export const NewThread = ({
{postReply && postReply.textContentV2 && (
)}
- {!isMobile && (
-
{isSending && (
-
-
+
)}
- {isMessage ? "Post" : "Create Thread"}
+ {isMessage ? 'Post' : 'Create Thread'}
{isMessage ? (
-
-
-
);
};
diff --git a/src/components/Group/Forum/Thread.tsx b/src/components/Group/Forum/Thread.tsx
index a0940c8..c7a83a3 100644
--- a/src/components/Group/Forum/Thread.tsx
+++ b/src/components/Group/Forum/Thread.tsx
@@ -195,7 +195,9 @@ export const Thread = ({
[message.identifier]: fullObject,
};
});
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
const setTempData = async () => {
@@ -216,7 +218,9 @@ export const Thread = ({
});
setTempPublishedList(tempData);
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
};
const getMailMessages = React.useCallback(
@@ -461,7 +465,9 @@ export const Thread = ({
} else {
fullArrayMsg.unshift(fullObject);
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
}
setMessages(fullArrayMsg);
} catch (error) {
diff --git a/src/components/Group/InviteMember.tsx b/src/components/Group/InviteMember.tsx
index 147c9bb..40b44ac 100644
--- a/src/components/Group/InviteMember.tsx
+++ b/src/components/Group/InviteMember.tsx
@@ -1,4 +1,4 @@
-import { LoadingButton } from "@mui/lab";
+import { LoadingButton } from '@mui/lab';
import {
Box,
Button,
@@ -6,45 +6,46 @@ import {
MenuItem,
Select,
SelectChangeEvent,
-} from "@mui/material";
-import React, { useState } from "react";
-import { Spacer } from "../../common/Spacer";
-import { Label } from "./AddGroup";
-import { getFee } from "../../background";
+} from '@mui/material';
+import React, { useState } from 'react';
+import { Spacer } from '../../common/Spacer';
+import { Label } from './AddGroup';
+import { getFee } from '../../background';
export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
- const [value, setValue] = useState("");
+ const [value, setValue] = useState('');
const [expiryTime, setExpiryTime] = useState('259200');
- const [isLoadingInvite, setIsLoadingInvite] = useState(false)
+ const [isLoadingInvite, setIsLoadingInvite] = useState(false);
const inviteMember = async () => {
try {
- const fee = await getFee('GROUP_INVITE')
+ const fee = await getFee('GROUP_INVITE');
await show({
- message: "Would you like to perform a GROUP_INVITE transaction?" ,
- publishFee: fee.fee + ' QORT'
- })
- setIsLoadingInvite(true)
+ message: 'Would you like to perform a GROUP_INVITE transaction?',
+ publishFee: fee.fee + ' QORT',
+ });
+ setIsLoadingInvite(true);
if (!expiryTime || !value) return;
new Promise((res, rej) => {
- window.sendMessage("inviteToGroup", {
- groupId,
- qortalAddress: value,
- inviteTime: +expiryTime,
- })
+ window
+ .sendMessage('inviteToGroup', {
+ groupId,
+ qortalAddress: value,
+ inviteTime: +expiryTime,
+ })
.then((response) => {
if (!response?.error) {
setInfoSnack({
- type: "success",
+ type: 'success',
message: `Successfully invited ${value}. It may take a couple of minutes for the changes to propagate`,
});
setOpenSnack(true);
res(response);
-
- setValue("");
+
+ setValue('');
return;
}
setInfoSnack({
- type: "error",
+ type: 'error',
message: response?.error,
});
setOpenSnack(true);
@@ -52,16 +53,17 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
})
.catch((error) => {
setInfoSnack({
- type: "error",
- message: error?.message || "An error occurred",
+ type: 'error',
+ message: error?.message || 'An error occurred',
});
setOpenSnack(true);
rej(error);
});
-
});
- } catch (error) {} finally {
- setIsLoadingInvite(false)
+ } catch (error) {
+ console.log(error);
+ } finally {
+ setIsLoadingInvite(false);
}
};
@@ -72,8 +74,8 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
return (
Invite member
@@ -83,8 +85,7 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
placeholder="Name or address"
onChange={(e) => setValue(e.target.value)}
/>
- Invite
+
+ Invite
+
);
};
diff --git a/src/components/Group/ListOfGroupPromotions.tsx b/src/components/Group/ListOfGroupPromotions.tsx
index afeff14..9f29a8a 100644
--- a/src/components/Group/ListOfGroupPromotions.tsx
+++ b/src/components/Group/ListOfGroupPromotions.tsx
@@ -4,7 +4,7 @@ import React, {
useEffect,
useRef,
useState,
-} from "react";
+} from 'react';
import {
Avatar,
Box,
@@ -25,44 +25,44 @@ import {
Select,
TextField,
Typography,
-} from "@mui/material";
+} from '@mui/material';
-import { getNameInfo } from "./Group";
-import { getBaseApi, getFee } from "../../background";
-import { LoadingButton } from "@mui/lab";
-import LockIcon from "@mui/icons-material/Lock";
-import NoEncryptionGmailerrorredIcon from "@mui/icons-material/NoEncryptionGmailerrorred";
+import { getNameInfo } from './Group';
+import { getBaseApi, getFee } from '../../background';
+import { LoadingButton } from '@mui/lab';
+import LockIcon from '@mui/icons-material/Lock';
+import NoEncryptionGmailerrorredIcon from '@mui/icons-material/NoEncryptionGmailerrorred';
import {
MyContext,
getArbitraryEndpointReact,
getBaseApiReact,
isMobile,
-} from "../../App";
-import { Spacer } from "../../common/Spacer";
-import { CustomLoader } from "../../common/CustomLoader";
-import { RequestQueueWithPromise } from "../../utils/queue/queue";
-import { useRecoilState } from "recoil";
+} from '../../App';
+import { Spacer } from '../../common/Spacer';
+import { CustomLoader } from '../../common/CustomLoader';
+import { RequestQueueWithPromise } from '../../utils/queue/queue';
+import { useRecoilState } from 'recoil';
import {
myGroupsWhereIAmAdminAtom,
promotionTimeIntervalAtom,
promotionsAtom,
-} from "../../atoms/global";
-import { Label } from "./AddGroup";
-import ShortUniqueId from "short-unique-id";
-import { CustomizedSnackbars } from "../Snackbar/Snackbar";
-import { getGroupNames } from "./UserListOfInvites";
-import { WrapperUserAction } from "../WrapperUserAction";
-import { useVirtualizer } from "@tanstack/react-virtual";
-import ErrorBoundary from "../../common/ErrorBoundary";
-import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import ExpandLessIcon from "@mui/icons-material/ExpandLess";
+} from '../../atoms/global';
+import { Label } from './AddGroup';
+import ShortUniqueId from 'short-unique-id';
+import { CustomizedSnackbars } from '../Snackbar/Snackbar';
+import { getGroupNames } from './UserListOfInvites';
+import { WrapperUserAction } from '../WrapperUserAction';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import ErrorBoundary from '../../common/ErrorBoundary';
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
+import ExpandLessIcon from '@mui/icons-material/ExpandLess';
export const requestQueuePromos = new RequestQueueWithPromise(20);
export function utf8ToBase64(inputString: string): string {
// Encode the string as UTF-8
const utf8String = encodeURIComponent(inputString).replace(
/%([0-9A-F]{2})/g,
- (match, p1) => String.fromCharCode(Number("0x" + p1))
+ (match, p1) => String.fromCharCode(Number('0x' + p1))
);
// Convert the UTF-8 encoded string to base64
@@ -83,7 +83,7 @@ export const ListOfGroupPromotions = () => {
const [selectedGroup, setSelectedGroup] = useState(null);
const [loading, setLoading] = useState(false);
const [isShowModal, setIsShowModal] = useState(false);
- const [text, setText] = useState("");
+ const [text, setText] = useState('');
const [myGroupsWhereIAmAdmin, setMyGroupsWhereIAmAdmin] = useRecoilState(
myGroupsWhereIAmAdminAtom
);
@@ -115,10 +115,12 @@ export const ListOfGroupPromotions = () => {
useEffect(() => {
try {
(async () => {
- const feeRes = await getFee("ARBITRARY");
+ const feeRes = await getFee('ARBITRARY');
setFee(feeRes?.fee);
})();
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
}, []);
const getPromotions = useCallback(async () => {
try {
@@ -126,9 +128,9 @@ export const ListOfGroupPromotions = () => {
const identifier = `group-promotions-ui24-`;
const url = `${getBaseApiReact()}${getArbitraryEndpointReact()}?mode=ALL&service=DOCUMENT&identifier=${identifier}&limit=100&includemetadata=false&reverse=true&prefix=true`;
const response = await fetch(url, {
- method: "GET",
+ method: 'GET',
headers: {
- "Content-Type": "application/json",
+ 'Content-Type': 'application/json',
},
});
const responseData = await response.json();
@@ -142,7 +144,7 @@ export const ListOfGroupPromotions = () => {
promo.name
}/${promo.identifier}`;
const response = await fetch(url, {
- method: "GET",
+ method: 'GET',
});
try {
@@ -164,7 +166,7 @@ export const ListOfGroupPromotions = () => {
}
}
} catch (error) {
- console.error("Error fetching promo:", error);
+ console.error('Error fetching promo:', error);
}
});
}
@@ -222,10 +224,10 @@ export const ListOfGroupPromotions = () => {
await new Promise((res, rej) => {
window
- .sendMessage("publishOnQDN", {
+ .sendMessage('publishOnQDN', {
data: data,
identifier: identifier,
- service: "DOCUMENT",
+ service: 'DOCUMENT',
})
.then((response) => {
if (!response?.error) {
@@ -235,23 +237,23 @@ export const ListOfGroupPromotions = () => {
rej(response.error);
})
.catch((error) => {
- rej(error.message || "An error occurred");
+ rej(error.message || 'An error occurred');
});
});
setInfoSnack({
- type: "success",
+ type: 'success',
message:
- "Successfully published promotion. It may take a couple of minutes for the promotion to appear",
+ 'Successfully published promotion. It may take a couple of minutes for the promotion to appear',
});
setOpenSnack(true);
- setText("");
+ setText('');
setSelectedGroup(null);
setIsShowModal(false);
} catch (error) {
setInfoSnack({
- type: "error",
+ type: 'error',
message:
- error?.message || "Error publishing the promotion. Please try again",
+ error?.message || 'Error publishing the promotion. Please try again',
});
setOpenSnack(true);
} finally {
@@ -262,30 +264,30 @@ export const ListOfGroupPromotions = () => {
const handleJoinGroup = async (group, isOpen) => {
try {
const groupId = group.groupId;
- const fee = await getFee("JOIN_GROUP");
+ const fee = await getFee('JOIN_GROUP');
await show({
- message: "Would you like to perform an JOIN_GROUP transaction?",
- publishFee: fee.fee + " QORT",
+ message: 'Would you like to perform an JOIN_GROUP transaction?',
+ publishFee: fee.fee + ' QORT',
});
setIsLoadingJoinGroup(true);
await new Promise((res, rej) => {
window
- .sendMessage("joinGroup", {
+ .sendMessage('joinGroup', {
groupId,
})
.then((response) => {
if (!response?.error) {
setInfoSnack({
- type: "success",
+ type: 'success',
message:
- "Successfully requested to join group. It may take a couple of minutes for the changes to propagate",
+ 'Successfully requested to join group. It may take a couple of minutes for the changes to propagate',
});
if (isOpen) {
setTxList((prev) => [
{
...response,
- type: "joined-group",
+ type: 'joined-group',
label: `Joined Group ${group?.groupName}: awaiting confirmation`,
labelDone: `Joined Group ${group?.groupName}: success!`,
done: false,
@@ -297,7 +299,7 @@ export const ListOfGroupPromotions = () => {
setTxList((prev) => [
{
...response,
- type: "joined-group-request",
+ type: 'joined-group-request',
label: `Requested to join Group ${group?.groupName}: awaiting confirmation`,
labelDone: `Requested to join Group ${group?.groupName}: success!`,
done: false,
@@ -313,7 +315,7 @@ export const ListOfGroupPromotions = () => {
return;
} else {
setInfoSnack({
- type: "error",
+ type: 'error',
message: response?.error,
});
setOpenSnack(true);
@@ -322,8 +324,8 @@ export const ListOfGroupPromotions = () => {
})
.catch((error) => {
setInfoSnack({
- type: "error",
- message: error.message || "An error occurred",
+ type: 'error',
+ message: error.message || 'An error occurred',
});
setOpenSnack(true);
rej(error);
@@ -339,55 +341,58 @@ export const ListOfGroupPromotions = () => {
return (
-
+
setIsExpanded((prev) => !prev)}
>
- Group promotions {promotions.length > 0 && ` (${promotions.length})`}
+ Group promotions{' '}
+ {promotions.length > 0 && ` (${promotions.length})`}
{isExpanded ? (
@@ -396,24 +401,24 @@ export const ListOfGroupPromotions = () => {
<>
{loading && promotions.length === 0 && (
Nothing to display
@@ -475,11 +480,11 @@ export const ListOfGroupPromotions = () => {
)}
{
className="scrollable-container"
style={{
flexGrow: 1,
- overflow: "auto",
- position: "relative",
- display: "flex",
- height: "0px",
+ overflow: 'auto',
+ position: 'relative',
+ display: 'flex',
+ height: '0px',
}}
>
{rowVirtualizer.getVirtualItems().map((virtualRow) => {
@@ -516,17 +521,17 @@ export const ListOfGroupPromotions = () => {
ref={rowVirtualizer.measureElement} //measure dynamic row height
key={promotion?.identifier}
style={{
- position: "absolute",
+ position: 'absolute',
top: 0,
- left: "50%", // Move to the center horizontally
+ left: '50%', // Move to the center horizontally
transform: `translateY(${virtualRow.start}px) translateX(-50%)`, // Adjust for centering
- width: "100%", // Control width (90% of the parent)
- padding: "10px 0",
- display: "flex",
- alignItems: "center",
- overscrollBehavior: "none",
- flexDirection: "column",
- gap: "5px",
+ width: '100%', // Control width (90% of the parent)
+ padding: '10px 0',
+ display: 'flex',
+ alignItems: 'center',
+ overscrollBehavior: 'none',
+ flexDirection: 'column',
+ gap: '5px',
}}
>
{
>
{
- if (reason === "backdropClick") {
+ if (reason === 'backdropClick') {
// Prevent closing on backdrop click
return;
}
handlePopoverClose(); // Close only on other events like Esc key press
}}
anchorOrigin={{
- vertical: "top",
- horizontal: "center",
+ vertical: 'top',
+ horizontal: 'center',
}}
transformOrigin={{
- vertical: "bottom",
- horizontal: "center",
+ vertical: 'bottom',
+ horizontal: 'center',
}}
- style={{ marginTop: "8px" }}
+ style={{ marginTop: '8px' }}
>
@@ -586,17 +591,17 @@ export const ListOfGroupPromotions = () => {
- Number of members:{" "}
+ Number of members:{' '}
{` ${promotion?.memberCount}`}
{promotion?.description && (
@@ -606,7 +611,7 @@ export const ListOfGroupPromotions = () => {
{promotion?.isOpen === false && (
@@ -618,11 +623,11 @@ export const ListOfGroupPromotions = () => {
{
{
{promotion?.name}
@@ -690,8 +695,8 @@ export const ListOfGroupPromotions = () => {
{promotion?.groupName}
@@ -700,42 +705,42 @@ export const ListOfGroupPromotions = () => {
{promotion?.isOpen === false && (
{promotion?.isOpen
- ? "Public group"
- : "Private group"}
+ ? 'Public group'
+ : 'Private group'}
{promotion?.data}
@@ -743,9 +748,9 @@ export const ListOfGroupPromotions = () => {
+
+
change avatar
-
set avatar
- {
+ return (
+
-
+
- (500 KB max. for GIFS){" "}
+ (500 KB max. for GIFS){' '}
setAvatarFile(file)}>
@@ -203,23 +251,34 @@ const PopoverComp = ({avatarFile, setAvatarFile, id, open, anchorEl, handleClose
{avatarFile?.name}
- A registered name is required to set an avatar
+ alignItems: 'center',
+ }}
+ >
+
+ A registered name is required to set an avatar
+
)}
-
-
+
+
Publish avatar
- )
- };
\ No newline at end of file
+ );
+};
diff --git a/src/components/Minting/Minting.tsx b/src/components/Minting/Minting.tsx
index 4a9eeb3..de16e09 100644
--- a/src/components/Minting/Minting.tsx
+++ b/src/components/Minting/Minting.tsx
@@ -74,7 +74,9 @@ export const Minting = ({
}
const data = await response.json();
setMintingAccounts(data);
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
}, []);
const accountIsMinting = useMemo(() => {
@@ -199,7 +201,9 @@ export const Minting = ({
const data = await response.json();
setRewardShares(data);
return data;
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
}, []);
const addMintingAccount = useCallback(async (val) => {
diff --git a/src/components/TaskManager/TaskManager.tsx b/src/components/TaskManager/TaskManager.tsx
index f9f728e..f1f075b 100644
--- a/src/components/TaskManager/TaskManager.tsx
+++ b/src/components/TaskManager/TaskManager.tsx
@@ -60,7 +60,9 @@ export const TaskManager = ({ getUserInfo }) => {
}
clearInterval(intervals.current[signature]);
}
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
stop = false;
}
};
diff --git a/src/styles/App-styles.ts b/src/styles/App-styles.ts
index eba266f..9b385bc 100644
--- a/src/styles/App-styles.ts
+++ b/src/styles/App-styles.ts
@@ -187,7 +187,7 @@ export const CustomInput = styled(TextField)(({ theme }) => ({
outline: 'none',
width: '183px', // Adjust the width as needed
input: {
- fontSize: 10,
+ fontSize: '12px',
fontFamily: 'Inter',
fontWeight: 400,
color: theme.palette.text.primary,
@@ -230,7 +230,7 @@ export const CustomLabel = styled(InputLabel)(({ theme }) => ({
backgroundColor: theme.palette.background.default,
color: theme.palette.text.primary,
fontFamily: 'Inter',
- fontSize: '10px',
+ fontSize: '15px',
fontWeight: 400,
lineHeight: '12px',
}));
diff --git a/src/useQortalGetSaveSettings.tsx b/src/useQortalGetSaveSettings.tsx
index e4e2945..9e31853 100644
--- a/src/useQortalGetSaveSettings.tsx
+++ b/src/useQortalGetSaveSettings.tsx
@@ -106,7 +106,9 @@ export const useQortalGetSaveSettings = (myName, isAuthenticated) => {
setSettingsQDNLastUpdated(0);
}
setCanSave(true);
- } catch (error) {}
+ } catch (error) {
+ console.log(error);
+ }
},
[]
);