+
Invite list
-
+
{({ height, width }) => (
{
)}
-
);
}
diff --git a/src/components/Group/WebsocketActive.tsx b/src/components/Group/WebsocketActive.tsx
index 294e196..b9da4d2 100644
--- a/src/components/Group/WebsocketActive.tsx
+++ b/src/components/Group/WebsocketActive.tsx
@@ -78,12 +78,20 @@ export const WebSocketActive = ({ myAddress, setIsLoadingGroups }) => {
}
const data = JSON.parse(e.data);
- const filteredGroups = data.groups?.filter(item => item?.groupId !== 0) || [];
+ const copyGroups = [...(data?.groups || [])]
+ const findIndex = copyGroups?.findIndex(item => item?.groupId === 0)
+ if(findIndex !== -1){
+ copyGroups[findIndex] = {
+ ...(copyGroups[findIndex] || {}),
+ groupId: "0"
+ }
+ }
+ const filteredGroups = copyGroups
const sortedGroups = filteredGroups.sort((a, b) => (b.timestamp || 0) - (a.timestamp || 0));
const sortedDirects = (data?.direct || []).filter(item =>
item?.name !== 'extension-proxy' && item?.address !== 'QSMMGSgysEuqDCuLw3S4cHrQkBrh3vP3VH'
).sort((a, b) => (b.timestamp || 0) - (a.timestamp || 0));
-
+
window.sendMessage("handleActiveGroupDataFromSocket", {
groups: sortedGroups,
directs: sortedDirects,
diff --git a/src/components/Group/useBlockUsers.tsx b/src/components/Group/useBlockUsers.tsx
new file mode 100644
index 0000000..05cbe90
--- /dev/null
+++ b/src/components/Group/useBlockUsers.tsx
@@ -0,0 +1,192 @@
+import React, { useCallback, useEffect, useRef } from "react";
+import { getBaseApiReact } from "../../App";
+import { truncate } from "lodash";
+
+
+
+export const useBlockedAddresses = () => {
+ const userBlockedRef = useRef({})
+ const userNamesBlockedRef = useRef({})
+
+ const getAllBlockedUsers = useCallback(()=> {
+
+ return {
+ names: userNamesBlockedRef.current,
+ addresses: userBlockedRef.current
+ }
+ }, [])
+
+ const isUserBlocked = useCallback((address, name)=> {
+ try {
+ if(!address) return false
+ if(userBlockedRef.current[address] || userNamesBlockedRef.current[name]) return true
+ return false
+
+
+ } catch (error) {
+ //error
+ }
+ }, [])
+
+ useEffect(()=> {
+ const fetchBlockedList = async ()=> {
+ try {
+ const response = await new Promise((res, rej) => {
+ window.sendMessage("listActions", {
+
+ type: 'get',
+ listName: `blockedAddresses`,
+
+ })
+ .then((response) => {
+ if (response.error) {
+ rej(response?.message);
+ return;
+ } else {
+ res(response);
+ }
+ })
+ .catch((error) => {
+ console.error("Failed qortalRequest", error);
+ });
+ })
+ const blockedUsers = {}
+ response?.forEach((item)=> {
+ blockedUsers[item] = true
+ })
+ userBlockedRef.current = blockedUsers
+
+ const response2 = await new Promise((res, rej) => {
+ window.sendMessage("listActions", {
+
+ type: 'get',
+ listName: `blockedNames`,
+
+ })
+ .then((response) => {
+ if (response.error) {
+ rej(response?.message);
+ return;
+ } else {
+ res(response);
+ }
+ })
+ .catch((error) => {
+ console.error("Failed qortalRequest", error);
+ });
+ })
+ const blockedUsers2 = {}
+ response2?.forEach((item)=> {
+ blockedUsers2[item] = true
+ })
+ userNamesBlockedRef.current = blockedUsers2
+
+
+ } catch (error) {
+ console.error(error)
+ }
+ }
+ fetchBlockedList()
+ }, [])
+
+ const removeBlockFromList = useCallback(async (address, name)=> {
+ await new Promise((res, rej) => {
+ window.sendMessage("listActions", {
+
+ type: 'remove',
+ items: name ? [name] : [address],
+ listName: name ? 'blockedNames' : 'blockedAddresses'
+
+ })
+ .then((response) => {
+ if (response.error) {
+ rej(response?.message);
+ return;
+ } else {
+ if(!name){
+ const copyObject = {...userBlockedRef.current}
+ delete copyObject[address]
+ userBlockedRef.current = copyObject
+ } else {
+ const copyObject = {...userNamesBlockedRef.current}
+ delete copyObject[name]
+ userNamesBlockedRef.current = copyObject
+ }
+
+ res(response);
+ }
+ })
+ .catch((error) => {
+ console.error("Failed qortalRequest", error);
+ });
+ })
+ if(name && userBlockedRef.current[address]){
+ await new Promise((res, rej) => {
+ window.sendMessage("listActions", {
+
+ type: 'remove',
+ items: !name ? [name] : [address],
+ listName: !name ? 'blockedNames' : 'blockedAddresses'
+
+ })
+ .then((response) => {
+ if (response.error) {
+ rej(response?.message);
+ return;
+ } else {
+ const copyObject = {...userBlockedRef.current}
+ delete copyObject[address]
+ userBlockedRef.current = copyObject
+ res(response);
+ }
+ })
+ .catch((error) => {
+ console.error("Failed qortalRequest", error);
+ });
+ })
+ }
+
+ }, [])
+
+ const addToBlockList = useCallback(async (address, name)=> {
+ await new Promise((res, rej) => {
+ window.sendMessage("listActions", {
+
+ type: 'add',
+ items: name ? [name] : [address],
+ listName: name ? 'blockedNames' : 'blockedAddresses'
+
+ })
+ .then((response) => {
+ if (response.error) {
+ rej(response?.message);
+ return;
+ } else {
+ if(name){
+
+ const copyObject = {...userNamesBlockedRef.current}
+ copyObject[name] = true
+ userNamesBlockedRef.current = copyObject
+ }else {
+ const copyObject = {...userBlockedRef.current}
+ copyObject[address] = true
+ userBlockedRef.current = copyObject
+
+ }
+
+ res(response);
+ }
+ })
+ .catch((error) => {
+ console.error("Failed qortalRequest", error);
+ });
+ })
+ }, [])
+
+ return {
+ isUserBlocked,
+ addToBlockList,
+ removeBlockFromList,
+ getAllBlockedUsers
+ };
+};
diff --git a/src/components/Group/useHandleUserInfo.tsx b/src/components/Group/useHandleUserInfo.tsx
new file mode 100644
index 0000000..a497259
--- /dev/null
+++ b/src/components/Group/useHandleUserInfo.tsx
@@ -0,0 +1,34 @@
+import React, { useCallback, useRef } from "react";
+import { getBaseApiReact } from "../../App";
+
+
+
+export const useHandleUserInfo = () => {
+ const userInfoRef = useRef({})
+
+
+ const getIndividualUserInfo = useCallback(async (address)=> {
+ try {
+ if(!address) return null
+ if(userInfoRef.current[address] !== undefined) return userInfoRef.current[address]
+
+ const url = `${getBaseApiReact()}/addresses/${address}`;
+ const response = await fetch(url);
+ if (!response.ok) {
+ throw new Error("network error");
+ }
+ const data = await response.json();
+ userInfoRef.current = {
+ ...userInfoRef.current,
+ [address]: data?.level
+ }
+ return data?.level
+ } catch (error) {
+ //error
+ }
+ }, [])
+
+ return {
+ getIndividualUserInfo,
+ };
+};
diff --git a/src/components/Home/NewUsersCTA.tsx b/src/components/Home/NewUsersCTA.tsx
new file mode 100644
index 0000000..4ad5c79
--- /dev/null
+++ b/src/components/Home/NewUsersCTA.tsx
@@ -0,0 +1,91 @@
+import { Box, ButtonBase, Typography } from "@mui/material";
+import React from "react";
+import { Spacer } from "../../common/Spacer";
+
+export const NewUsersCTA = ({ balance }) => {
+ if (balance === undefined || +balance > 0) return null;
+ return (
+
+
+
+
+
+ Are you a new user?
+
+
+
+ Please message us on Telegram or Discord if you need 4 QORT to start
+ chatting without any limitations
+
+
+
+ {
+ if (window?.electronAPI?.openExternal) {
+ window.electronAPI.openExternal(
+ "https://link.qortal.dev/telegram-invite"
+ );
+ } else {
+ window.open(
+ "https://link.qortal.dev/telegram-invite",
+ "_blank"
+ );
+ }
+ }}
+ >
+ Telegram
+
+ {
+ if (window?.electronAPI?.openExternal) {
+ window.electronAPI.openExternal(
+ "https://link.qortal.dev/discord-invite"
+ );
+ } else {
+ window.open("https://link.qortal.dev/discord-invite", "_blank");
+ }
+ }}
+ >
+ Discord
+
+
+
+
+ );
+};
diff --git a/src/components/Home/QortPrice.tsx b/src/components/Home/QortPrice.tsx
new file mode 100644
index 0000000..3d54a04
--- /dev/null
+++ b/src/components/Home/QortPrice.tsx
@@ -0,0 +1,209 @@
+import React, { useCallback, useEffect, useState } from 'react'
+import { getBaseApiReact } from '../../App';
+import { Box, Tooltip, Typography } from '@mui/material';
+import { BarSpinner } from '../../common/Spinners/BarSpinner/BarSpinner';
+
+function getAverageLtcPerQort(trades) {
+ let totalQort = 0;
+ let totalLtc = 0;
+
+ trades.forEach((trade) => {
+ const qort = parseFloat(trade.qortAmount);
+ const ltc = parseFloat(trade.foreignAmount);
+
+ totalQort += qort;
+ totalLtc += ltc;
+ });
+
+ // Avoid division by zero
+ if (totalQort === 0) return 0;
+
+ // Weighted average price
+ return parseFloat((totalLtc / totalQort).toFixed(8));
+ }
+
+ function getTwoWeeksAgoTimestamp() {
+ const now = new Date();
+ now.setDate(now.getDate() - 14); // Subtract 14 days
+ return now.getTime(); // Get timestamp in milliseconds
+ }
+
+ function formatWithCommasAndDecimals(number) {
+
+ return Number(number).toLocaleString();
+ }
+
+
+export const QortPrice = () => {
+ const [ltcPerQort, setLtcPerQort] = useState(null)
+ const [supply, setSupply] = useState(null)
+ const [lastBlock, setLastBlock] = useState(null)
+ const [loading, setLoading] = useState(true)
+
+ const getPrice = useCallback(async () => {
+ try {
+ setLoading(true)
+
+ const response = await fetch(`${getBaseApiReact()}/crosschain/trades?foreignBlockchain=LITECOIN&minimumTimestamp=${getTwoWeeksAgoTimestamp()}&limit=20&reverse=true`);
+ const data = await response.json();
+
+
+ setLtcPerQort(getAverageLtcPerQort(data));
+ } catch (error) {
+ console.error(error);
+ } finally {
+ setLoading(false)
+
+ }
+ }, [])
+
+ const getLastBlock = useCallback(async () => {
+ try {
+ setLoading(true)
+
+ const response = await fetch(`${getBaseApiReact()}/blocks/last`);
+ const data = await response.json();
+
+ setLastBlock(data);
+ } catch (error) {
+ console.error(error);
+ } finally {
+ setLoading(false)
+
+ }
+ }, [])
+
+ const getSupplyInCirculation = useCallback(async () => {
+ try {
+ setLoading(true)
+
+ const response = await fetch(`${getBaseApiReact()}/stats/supply/circulating`);
+ const data = await response.text();
+ formatWithCommasAndDecimals(data)
+ setSupply(formatWithCommasAndDecimals(data));
+ } catch (error) {
+ console.error(error);
+ } finally {
+ setLoading(false)
+
+ }
+ }, [])
+
+
+
+
+ useEffect(() => {
+
+ getPrice();
+ getSupplyInCirculation()
+ getLastBlock()
+ const interval = setInterval(() => {
+ getPrice();
+ getSupplyInCirculation()
+ getLastBlock()
+ }, 900000);
+
+ return () => clearInterval(interval);
+
+ }, [getPrice]);
+
+ console.log('supply', supply)
+
+ return (
+
+ Based on the latest 20 trades}
+ placement="bottom"
+ arrow
+ sx={{ fontSize: "24" }}
+ slotProps={{
+ tooltip: {
+ sx: {
+ color: "#ffffff",
+ backgroundColor: "#444444",
+ },
+ },
+ arrow: {
+ sx: {
+ color: "#444444",
+ },
+ },
+ }}
+ >
+
+ Price
+ {!ltcPerQort ? (
+
+ ): (
+ {ltcPerQort} LTC/QORT
+ )}
+
+
+
+
+
+ Supply
+ {!supply ? (
+
+ ): (
+ {supply} QORT
+ )}
+
+
+
+ Last height
+ {!lastBlock?.height ? (
+
+ ): (
+ {lastBlock?.height}
+
+ )}
+
+
+
+ )
+}
diff --git a/src/components/Minting/Minting.tsx b/src/components/Minting/Minting.tsx
new file mode 100644
index 0000000..af63ece
--- /dev/null
+++ b/src/components/Minting/Minting.tsx
@@ -0,0 +1,856 @@
+import {
+ Alert,
+ Box,
+ Button,
+ Card,
+ Dialog,
+ DialogActions,
+ DialogContent,
+ DialogTitle,
+ Divider,
+ IconButton,
+ InputBase,
+ InputLabel,
+ Snackbar,
+ Typography,
+} from "@mui/material";
+import React, {
+ useCallback,
+ useContext,
+ useEffect,
+ useMemo,
+ useState,
+} from "react";
+import CloseIcon from "@mui/icons-material/Close";
+import { MyContext, getBaseApiReact } from "../../App";
+import {
+ executeEvent,
+ subscribeToEvent,
+ unsubscribeFromEvent,
+} from "../../utils/events";
+import { getFee, getNameOrAddress } from "../../background";
+import CopyToClipboard from "react-copy-to-clipboard";
+import { AddressBox } from "../../App-styles";
+import { Spacer } from "../../common/Spacer";
+import Copy from "../../assets/svgs/Copy.svg";
+import { Loader } from "../Loader";
+import { FidgetSpinner } from "react-loader-spinner";
+import { useModal } from "../../common/useModal";
+
+export const Minting = ({
+ setIsOpenMinting,
+ myAddress,
+ groups,
+ show,
+ setTxList,
+ txList,
+}) => {
+ const [mintingAccounts, setMintingAccounts] = useState([]);
+ const [accountInfo, setAccountInfo] = useState(null);
+ const [rewardSharePublicKey, setRewardSharePublicKey] = useState("");
+ const [mintingKey, setMintingKey] = useState("");
+ const [rewardsharekey, setRewardsharekey] = useState("");
+ const [rewardShares, setRewardShares] = useState([]);
+ const [nodeInfos, setNodeInfos] = useState({});
+ const [openSnack, setOpenSnack] = useState(false);
+ const [isLoading, setIsLoading] = useState(false);
+ const { show: showKey, message } = useModal();
+ const { isShow: isShowNext, onOk, show: showNext } = useModal();
+
+ const [info, setInfo] = useState(null);
+ const [names, setNames] = useState({});
+ const [accountInfos, setAccountInfos] = useState({});
+ const [showWaitDialog, setShowWaitDialog] = useState(false)
+ const isPartOfMintingGroup = useMemo(() => {
+ if (groups?.length === 0) return false;
+ return !!groups?.find((item) => item?.groupId?.toString() === "694");
+ }, [groups]);
+ const getMintingAccounts = useCallback(async () => {
+ try {
+ const url = `${getBaseApiReact()}/admin/mintingaccounts`;
+ const response = await fetch(url);
+ if (!response.ok) {
+ throw new Error("network error");
+ }
+ const data = await response.json();
+ setMintingAccounts(data);
+ } catch (error) {}
+ }, []);
+
+ const accountIsMinting = useMemo(() => {
+ return !!mintingAccounts?.find(
+ (item) => item?.recipientAccount === myAddress
+ );
+ }, [mintingAccounts, myAddress]);
+
+ const getName = async (address) => {
+ try {
+ const response = await fetch(
+ `${getBaseApiReact()}/names/address/${address}`
+ );
+ const nameData = await response.json();
+ if (nameData?.length > 0) {
+ setNames((prev) => {
+ return {
+ ...prev,
+ [address]: nameData[0].name,
+ };
+ });
+ } else {
+ setNames((prev) => {
+ return {
+ ...prev,
+ [address]: null,
+ };
+ });
+ }
+ } catch (error) {
+ // error
+ }
+ };
+
+ const getAccountInfo = async (address: string, others?: boolean) => {
+ try {
+ if (!others) {
+ setIsLoading(true);
+ }
+ const url = `${getBaseApiReact()}/addresses/${address}`;
+ const response = await fetch(url);
+ if (!response.ok) {
+ throw new Error("network error");
+ }
+ const data = await response.json();
+ if (others) {
+ setAccountInfos((prev) => {
+ return {
+ ...prev,
+ [address]: data,
+ };
+ });
+ } else {
+ setAccountInfo(data);
+ }
+ } catch (error) {
+ } finally {
+ if (!others) {
+ setIsLoading(false);
+ }
+ }
+ };
+
+ const refreshRewardShare = () => {
+ if (!myAddress) return;
+ getRewardShares(myAddress);
+ };
+
+ useEffect(() => {
+ subscribeToEvent("refresh-rewardshare-list", refreshRewardShare);
+
+ return () => {
+ unsubscribeFromEvent("refresh-rewardshare-list", refreshRewardShare);
+ };
+ }, [myAddress]);
+
+ const handleNames = (address) => {
+ if (!address) return undefined;
+ if (names[address]) return names[address];
+ if (names[address] === null) return address;
+ getName(address);
+ return address;
+ };
+
+ const handleAccountInfos = (address, field) => {
+ if (!address) return undefined;
+ if (accountInfos[address]) return accountInfos[address]?.[field];
+ if (accountInfos[address] === null) return undefined;
+ getAccountInfo(address, true);
+ return undefined;
+ };
+
+ const calculateBlocksRemainingToLevel1 = (address) => {
+ if (!address) return undefined;
+ if (!accountInfos[address]) return undefined;
+ return 7200 - accountInfos[address]?.blocksMinted || 0;
+ };
+
+ const getNodeInfos = async () => {
+ try {
+ const url = `${getBaseApiReact()}/admin/status`;
+ const response = await fetch(url, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ });
+ const data = await response.json();
+ setNodeInfos(data);
+ } catch (error) {
+ console.error("Request failed", error);
+ }
+ };
+
+ const getRewardShares = useCallback(async (address) => {
+ try {
+ const url = `${getBaseApiReact()}/addresses/rewardshares?involving=${address}`;
+ const response = await fetch(url);
+ if (!response.ok) {
+ throw new Error("network error");
+ }
+ const data = await response.json();
+ setRewardShares(data);
+ return data
+ } catch (error) {}
+ }, []);
+
+ const addMintingAccount = useCallback(async (val) => {
+ try {
+ setIsLoading(true);
+ return await new Promise((res, rej) => {
+ window
+ .sendMessage(
+ "ADMIN_ACTION",
+
+ {
+ type: "addmintingaccount",
+ value: val,
+ },
+ 180000,
+ true
+ )
+ .then((response) => {
+ if (!response?.error) {
+ res(response);
+ setMintingKey("");
+ setTimeout(() => {
+ getMintingAccounts();
+ }, 300);
+ return;
+ }
+ rej({ message: response.error });
+ })
+ .catch((error) => {
+ rej({ message: error.message || "An error occurred" });
+ });
+ });
+ } catch (error) {
+ setInfo({
+ type: "error",
+ message: error?.message || "Unable to add minting account",
+ });
+ setOpenSnack(true);
+ } finally {
+ setIsLoading(false);
+ }
+ }, []);
+
+ const removeMintingAccount = useCallback(async (val, acct) => {
+ try {
+ setIsLoading(true);
+ return await new Promise((res, rej) => {
+ window
+ .sendMessage(
+ "ADMIN_ACTION",
+
+ {
+ type: "removemintingaccount",
+ value: val,
+ },
+ 180000,
+ true
+ )
+ .then((response) => {
+ if (!response?.error) {
+ res(response);
+
+ setTimeout(() => {
+ getMintingAccounts();
+ }, 300);
+ return;
+ }
+ rej({ message: response.error });
+ })
+ .catch((error) => {
+ rej({ message: error.message || "An error occurred" });
+ });
+ });
+ } catch (error) {
+ setInfo({
+ type: "error",
+ message: error?.message || "Unable to remove minting account",
+ });
+ setOpenSnack(true);
+ } finally {
+ setIsLoading(false);
+ }
+ }, []);
+
+ const createRewardShare = useCallback(async (publicKey, recipient) => {
+ const fee = await getFee("REWARD_SHARE");
+ await show({
+ message: "Would you like to perform an REWARD_SHARE transaction?",
+ publishFee: fee.fee + " QORT",
+ });
+ return await new Promise((res, rej) => {
+ window
+ .sendMessage("createRewardShare", {
+ recipientPublicKey: publicKey,
+ })
+ .then((response) => {
+ if (!response?.error) {
+ setTxList((prev) => [
+ {
+ recipient,
+ ...response,
+ type: "add-rewardShare",
+ label: `Add rewardshare: awaiting confirmation`,
+ labelDone: `Add rewardshare: success!`,
+ done: false,
+ },
+ ...prev,
+ ]);
+ res(response);
+ return;
+ }
+ rej({ message: response.error });
+ })
+ .catch((error) => {
+ rej({ message: error.message || "An error occurred" });
+ });
+ });
+ }, []);
+
+ const getRewardSharePrivateKey = useCallback(async (publicKey) => {
+ return await new Promise((res, rej) => {
+ window
+ .sendMessage("getRewardSharePrivateKey", {
+ recipientPublicKey: publicKey,
+ })
+ .then((response) => {
+ if (!response?.error) {
+ res(response);
+ return;
+ }
+ rej({ message: response.error });
+ })
+ .catch((error) => {
+ rej({ message: error.message || "An error occurred" });
+ });
+ });
+ }, []);
+
+ const waitUntilRewardShareIsConfirmed = async (timeoutMs = 600000) => {
+ const pollingInterval = 30000;
+ const startTime = Date.now();
+
+ const sleep = (ms) => new Promise((res) => setTimeout(res, ms));
+
+ while (Date.now() - startTime < timeoutMs) {
+
+ const rewardShares = await getRewardShares(myAddress);
+ const findRewardShare = rewardShares?.find(
+ (item) =>
+ item?.recipient === myAddress && item?.mintingAccount === myAddress
+ );
+
+ if (findRewardShare) {
+ return true; // Exit early if found
+ }
+
+
+ await sleep(pollingInterval); // Wait before the next poll
+ }
+
+ throw new Error("Timeout waiting for reward share confirmation");
+ };
+
+ const startMinting = async () => {
+ try {
+ setIsLoading(true);
+ const findRewardShare = rewardShares?.find(
+ (item) =>
+ item?.recipient === myAddress && item?.mintingAccount === myAddress
+ );
+ if (findRewardShare) {
+ const privateRewardShare = await getRewardSharePrivateKey(
+ accountInfo?.publicKey
+ );
+ addMintingAccount(privateRewardShare);
+ } else {
+ await createRewardShare(accountInfo?.publicKey, myAddress);
+ setShowWaitDialog(true)
+ await waitUntilRewardShareIsConfirmed()
+ await showNext({
+ message: ''
+ })
+ const privateRewardShare = await getRewardSharePrivateKey(
+ accountInfo?.publicKey
+ );
+ setShowWaitDialog(false)
+ addMintingAccount(privateRewardShare);
+
+ }
+ } catch (error) {
+ setShowWaitDialog(false)
+ setInfo({
+ type: "error",
+ message: error?.message || "Unable to start minting",
+ });
+ setOpenSnack(true);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ const getPublicKeyFromAddress = async (address) => {
+ const url = `${getBaseApiReact()}/addresses/publickey/${address}`;
+ const response = await fetch(url);
+ const data = await response.text();
+ return data;
+ };
+
+ const checkIfMinterGroup = async (address) => {
+ const url = `${getBaseApiReact()}/groups/member/${address}`;
+ const response = await fetch(url);
+ const data = await response.json();
+ return !!data?.find((grp) => grp?.groupId?.toString() === "694");
+ };
+
+ const removeRewardShare = useCallback(async (rewardShare) => {
+ return await new Promise((res, rej) => {
+ window
+ .sendMessage("removeRewardShare", {
+ rewardShareKeyPairPublicKey: rewardShare.rewardSharePublicKey,
+ recipient: rewardShare.recipient,
+ percentageShare: -1,
+ })
+ .then((response) => {
+ if (!response?.error) {
+ res(response);
+ setTxList((prev) => [
+ {
+ ...rewardShare,
+ ...response,
+ type: "remove-rewardShare",
+ label: `Remove rewardshare: awaiting confirmation`,
+ labelDone: `Remove rewardshare: success!`,
+ done: false,
+ },
+ ...prev,
+ ]);
+ return;
+ }
+ rej({ message: response.error });
+ })
+ .catch((error) => {
+ rej({ message: error.message || "An error occurred" });
+ });
+ });
+ }, []);
+
+ const handleRemoveRewardShare = async (rewardShare) => {
+ try {
+ setIsLoading(true);
+
+ const privateRewardShare = await removeRewardShare(rewardShare);
+ } catch (error) {
+ setInfo({
+ type: "error",
+ message: error?.message || "Unable to remove reward share",
+ });
+ setOpenSnack(true);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ const createRewardShareForPotentialMinter = async (receiver) => {
+ try {
+ setIsLoading(true);
+ const confirmReceiver = await getNameOrAddress(receiver);
+ if (confirmReceiver.error)
+ throw new Error("Invalid receiver address or name");
+ const isInMinterGroup = await checkIfMinterGroup(confirmReceiver);
+ if (!isInMinterGroup) throw new Error("Account not in Minter Group");
+ const publicKey = await getPublicKeyFromAddress(confirmReceiver);
+ const findRewardShare = rewardShares?.find(
+ (item) =>
+ item?.recipient === confirmReceiver &&
+ item?.mintingAccount === myAddress
+ );
+ if (findRewardShare) {
+ const privateRewardShare = await getRewardSharePrivateKey(publicKey);
+ setRewardsharekey(privateRewardShare);
+ } else {
+ await createRewardShare(publicKey, confirmReceiver);
+ const privateRewardShare = await getRewardSharePrivateKey(publicKey);
+ setRewardsharekey(privateRewardShare);
+ }
+ } catch (error) {
+ setInfo({
+ type: "error",
+ message: error?.message || "Unable to create reward share",
+ });
+ setOpenSnack(true);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ useEffect(() => {
+ getNodeInfos();
+ getMintingAccounts();
+ }, []);
+
+ useEffect(() => {
+ if (!myAddress) return;
+ getRewardShares(myAddress);
+
+ getAccountInfo(myAddress);
+ }, [myAddress]);
+
+ const _blocksNeed = () => {
+ if (accountInfo?.level === 0) {
+ return 7200;
+ } else if (accountInfo?.level === 1) {
+ return 72000;
+ } else if (accountInfo?.level === 2) {
+ return 201600;
+ } else if (accountInfo?.level === 3) {
+ return 374400;
+ } else if (accountInfo?.level === 4) {
+ return 618400;
+ } else if (accountInfo?.level === 5) {
+ return 964000;
+ } else if (accountInfo?.level === 6) {
+ return 1482400;
+ } else if (accountInfo?.level === 7) {
+ return 2173600;
+ } else if (accountInfo?.level === 8) {
+ return 3037600;
+ } else if (accountInfo?.level === 9) {
+ return 4074400;
+ }
+ };
+
+ const handleClose = () => {
+ setOpenSnack(false);
+ setTimeout(() => {
+ setInfo(null);
+ }, 250);
+ };
+
+ const _levelUpBlocks = () => {
+ if (
+ accountInfo?.blocksMinted === undefined ||
+ nodeInfos?.height === undefined
+ )
+ return null;
+ let countBlocks =
+ _blocksNeed() -
+ (accountInfo?.blocksMinted + accountInfo?.blocksMintedAdjustment);
+
+ let countBlocksString = countBlocks.toString();
+ return "" + countBlocksString;
+ };
+
+
+
+ return (
+
+ );
+};
diff --git a/src/components/Mobile/MobileFooter.tsx b/src/components/Mobile/MobileFooter.tsx
index 7179f6e..52e5c7c 100644
--- a/src/components/Mobile/MobileFooter.tsx
+++ b/src/components/Mobile/MobileFooter.tsx
@@ -108,7 +108,7 @@ export const MobileFooter = ({
}}
icon={
-
+
}
sx={{
@@ -175,7 +175,7 @@ export const MobileFooter = ({
}}
icon={
-
+
}
sx={{
diff --git a/src/components/Mobile/MobileHeader.tsx b/src/components/Mobile/MobileHeader.tsx
index 9902a28..cd98ba9 100644
--- a/src/components/Mobile/MobileHeader.tsx
+++ b/src/components/Mobile/MobileHeader.tsx
@@ -92,7 +92,7 @@ const Header = ({
onClick={handleClick}
>
-
+
{fullScreen && (
{
@@ -135,7 +135,7 @@ const Header = ({
setMobileViewModeKeepOpen("messaging");
}}
>
-
@@ -197,13 +197,13 @@ const Header = ({
minWidth: '24px !important'
}}>
-
+
@@ -218,13 +218,13 @@ const Header = ({
minWidth: '24px !important'
}}>
-
+
@@ -358,7 +358,7 @@ const Header = ({
}}
>
-
+
@@ -433,13 +433,13 @@ const Header = ({
minWidth: '24px !important'
}}>
-
+
@@ -454,13 +454,13 @@ const Header = ({
minWidth: '24px !important'
}}>
-
+
diff --git a/src/components/QMailStatus.tsx b/src/components/QMailStatus.tsx
new file mode 100644
index 0000000..cb1642a
--- /dev/null
+++ b/src/components/QMailStatus.tsx
@@ -0,0 +1,63 @@
+import React, { useMemo } from 'react'
+import QMailLogo from '../assets/QMailLogo.png'
+import { useRecoilState } from 'recoil'
+import { mailsAtom, qMailLastEnteredTimestampAtom } from '../atoms/global'
+import { isLessThanOneWeekOld } from './Group/QMailMessages'
+import { ButtonBase, Tooltip } from '@mui/material'
+import { executeEvent } from '../utils/events'
+export const QMailStatus = () => {
+ const [lastEnteredTimestamp, setLastEnteredTimestamp] = useRecoilState(qMailLastEnteredTimestampAtom)
+ const [mails, setMails] = useRecoilState(mailsAtom)
+
+ const hasNewMail = useMemo(()=> {
+ if(mails?.length === 0) return false
+ const latestMail = mails[0]
+ if(!lastEnteredTimestamp && isLessThanOneWeekOld(latestMail?.created)) return true
+ if((lastEnteredTimestamp < latestMail?.created) && isLessThanOneWeekOld(latestMail?.created)) return true
+ return false
+ }, [lastEnteredTimestamp, mails])
+ return (
+
{
+ executeEvent("addTab", { data: { service: 'APP', name: 'q-mail' } });
+ executeEvent("open-apps-mode", { });
+ setLastEnteredTimestamp(Date.now())
+ }} style={{
+ position: 'relative'
+ }}>
+ {hasNewMail && (
+
+ )}
+ Q-MAIL}
+ placement="left"
+ arrow
+ sx={{ fontSize: "24" }}
+ slotProps={{
+ tooltip: {
+ sx: {
+ color: "#ffffff",
+ backgroundColor: "#444444",
+ },
+ },
+ arrow: {
+ sx: {
+ color: "#444444",
+ },
+ },
+ }}
+ >
+ 
+
+
+ )
+}
diff --git a/src/components/Save/Save.tsx b/src/components/Save/Save.tsx
index 1129cee..0c01315 100644
--- a/src/components/Save/Save.tsx
+++ b/src/components/Save/Save.tsx
@@ -4,19 +4,59 @@ import isEqual from "lodash/isEqual"; // Import deep comparison utility
import {
canSaveSettingToQdnAtom,
hasSettingsChangedAtom,
+ isUsingImportExportSettingsAtom,
oldPinnedAppsAtom,
settingsLocalLastUpdatedAtom,
settingsQDNLastUpdatedAtom,
sortablePinnedAppsAtom,
} from "../../atoms/global";
-import { ButtonBase } from "@mui/material";
+import { Box, Button, ButtonBase, Popover, Typography } from "@mui/material";
import { objectToBase64 } from "../../qdn/encryption/group-encryption";
import { MyContext } from "../../App";
import { getFee } from "../../background";
import { CustomizedSnackbars } from "../Snackbar/Snackbar";
import { SaveIcon } from "../../assets/svgs/SaveIcon";
import { IconWrapper } from "../Desktop/DesktopFooter";
-export const Save = ({ isDesktop, disableWidth }) => {
+import { Spacer } from "../../common/Spacer";
+import { LoadingButton } from "@mui/lab";
+import { saveToLocalStorage } from "../Apps/AppsNavBar";
+import { decryptData, encryptData } from "../../qortalRequests/get";
+import { saveFileToDiskGeneric } from "../../utils/generateWallet/generateWallet";
+import { base64ToUint8Array, uint8ArrayToObject } from "../../backgroundFunctions/encryption";
+
+
+export const handleImportClick = async () => {
+ const fileInput = document.createElement('input');
+ fileInput.type = 'file';
+ fileInput.accept = '.base64,.txt';
+
+ // Create a promise to handle file selection and reading synchronously
+ return await new Promise((resolve, reject) => {
+ fileInput.onchange = () => {
+ const file = fileInput.files[0];
+ if (!file) {
+ reject(new Error('No file selected'));
+ return;
+ }
+
+ const reader = new FileReader();
+ reader.onload = (e) => {
+ resolve(e.target.result); // Resolve with the file content
+ };
+ reader.onerror = () => {
+ reject(new Error('Error reading file'));
+ };
+
+ reader.readAsText(file); // Read the file as text (Base64 string)
+ };
+
+ // Trigger the file input dialog
+ fileInput.click();
+ });
+
+}
+
+export const Save = ({ isDesktop, disableWidth, myName }) => {
const [pinnedApps, setPinnedApps] = useRecoilState(sortablePinnedAppsAtom);
const [settingsQdnLastUpdated, setSettingsQdnLastUpdated] = useRecoilState(
settingsQDNLastUpdatedAtom
@@ -25,13 +65,14 @@ export const Save = ({ isDesktop, disableWidth }) => {
settingsLocalLastUpdatedAtom
);
const setHasSettingsChangedAtom = useSetRecoilState(hasSettingsChangedAtom);
+ const [isUsingImportExportSettings, setIsUsingImportExportSettings] = useRecoilState(isUsingImportExportSettingsAtom);
const [canSave] = useRecoilState(canSaveSettingToQdnAtom);
const [openSnack, setOpenSnack] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [infoSnack, setInfoSnack] = useState(null);
const [oldPinnedApps, setOldPinnedApps] = useRecoilState(oldPinnedAppsAtom);
-
+ const [anchorEl, setAnchorEl] = useState(null);
const { show } = useContext(MyContext);
const hasChanged = useMemo(() => {
@@ -63,6 +104,8 @@ export const Save = ({ isDesktop, disableWidth }) => {
settingsLocalLastUpdated,
]);
+
+
useEffect(() => {
setHasSettingsChangedAtom(hasChanged);
}, [hasChanged]);
@@ -83,9 +126,7 @@ export const Save = ({ isDesktop, disableWidth }) => {
.sendMessage(
"ENCRYPT_DATA",
{
-
- data64,
-
+ data64,
},
60000
)
@@ -135,6 +176,7 @@ export const Save = ({ isDesktop, disableWidth }) => {
message: "Sucessfully published to QDN",
});
setOpenSnack(true);
+ setAnchorEl(null)
}
}
} catch (error) {
@@ -147,20 +189,31 @@ export const Save = ({ isDesktop, disableWidth }) => {
setIsLoading(false);
}
};
+ const handlePopupClick = (event) => {
+ event.stopPropagation(); // Prevent parent onClick from firing
+ setAnchorEl(event.currentTarget);
+ };
+
+ const revertChanges = () => {
+ setPinnedApps(oldPinnedApps);
+ saveToLocalStorage("ext_saved_settings", "sortablePinnedApps", null);
+ setAnchorEl(null)
+ };
+
return (
<>
{isDesktop ? (
{
/>
)}
+
setAnchorEl(null)} // Close popover on click outside
+ anchorOrigin={{
+ vertical: "bottom",
+ horizontal: "center",
+ }}
+ transformOrigin={{
+ vertical: "top",
+ horizontal: "center",
+ }}
+ sx={{
+ width: "300px",
+ maxWidth: "90%",
+ maxHeight: "80%",
+ overflow: "auto",
+ }}
+ >
+ {isUsingImportExportSettings && (
+
+
+
+ You are using the export/import way of saving settings.
+
+
+
+
+
+ )}
+ {!isUsingImportExportSettings && (
+
+ {!myName ? (
+
+
+ You need a registered Qortal name to save your pinned apps to QDN.
+
+
+ ) : (
+ <>
+ {hasChanged && (
+
+
+ You have unsaved changes to your pinned apps. Save them to QDN.
+
+
+
+ Save to QDN
+
+
+ {!isNaN(settingsQdnLastUpdated) && settingsQdnLastUpdated > 0 && (
+ <>
+
+ Don't like your current local changes? Would you like to
+ reset to your saved QDN pinned apps?
+
+
+
+ Revert to QDN
+
+
+ )}
+ {!isNaN(settingsQdnLastUpdated) && settingsQdnLastUpdated === 0 && (
+ <>
+
+ Don't like your current local changes? Would you like to
+ reset to the default pinned apps?
+
+
+
+ Revert to default
+
+
+ )}
+
+ )}
+ {!isNaN(settingsQdnLastUpdated) && settingsQdnLastUpdated === -100 && isUsingImportExportSettings !== true && (
+
+
+ The app was unable to download your existing QDN-saved pinned
+ apps. Would you like to overwrite those changes?
+
+
+
+ Overwrite to QDN
+
+
+ )}
+ {!hasChanged && (
+
+
+ You currently do not have any changes to your pinned apps
+
+
+
+ )}
+
+ )}
+
+
+ )}
+
+
+ {
+ try {
+ const fileContent = await handleImportClick();
+ const decryptedData = await decryptData({
+ encryptedData: fileContent,
+ });
+ const decryptToUnit8ArraySubject =
+ base64ToUint8Array(decryptedData);
+ const responseData = uint8ArrayToObject(
+ decryptToUnit8ArraySubject
+ );
+ if(Array.isArray(responseData)){
+ saveToLocalStorage("ext_saved_settings_import_export", "sortablePinnedApps", responseData, {
+ isUsingImportExport: true
+ });
+ setPinnedApps(responseData)
+ setOldPinnedApps(responseData)
+ setIsUsingImportExportSettings(true)
+ }
+
+ } catch (error) {
+ console.log("error", error);
+ }
+ }}>
+
+ Import
+
+ {
+ try {
+ const data64 = await objectToBase64(pinnedApps);
+
+ const encryptedData = await encryptData({
+ data64,
+ });
+ const blob = new Blob([encryptedData], {
+ type: "text/plain",
+ });
+
+ const timestamp = new Date()
+ .toISOString()
+ .replace(/:/g, "-"); // Safe timestamp for filenames
+ const filename = `qortal-new-ui-backup-settings-${timestamp}.txt`;
+ await saveFileToDiskGeneric(blob, filename)
+
+ } catch (error) {
+ console.log('error', error)
+ }
+ }}>
+ Export
+
+
+
+
-
+
{
const { txList, setTxList, memberGroups } = useContext(MyContext);
@@ -39,7 +40,7 @@ export const TaskManager = ({ getUserInfo }) => {
await new Promise((res) =>
setTimeout(() => {
res(null);
- }, 300000)
+ }, 60000)
);
setTxList((prev) => {
let previousData = [...prev];
@@ -62,7 +63,7 @@ export const TaskManager = ({ getUserInfo }) => {
}
};
- intervals.current[signature] = setInterval(getAnswer, 120000);
+ intervals.current[signature] = setInterval(getAnswer, 60000);
};
useEffect(() => {
@@ -96,7 +97,15 @@ export const TaskManager = ({ getUserInfo }) => {
}
});
- prev.forEach((tx) => {
+
+
+ return previousData;
+ });
+ }, [memberGroups, getUserInfo]);
+
+ useEffect(()=> {
+
+ txList.forEach((tx) => {
if (
["created-common-secret", "joined-group-request", "join-request-accept"].includes(
tx?.type
@@ -113,11 +122,17 @@ export const TaskManager = ({ getUserInfo }) => {
getStatus({ signature: tx.signature }, getUserInfo);
}
}
+ if((tx?.type === "remove-rewardShare" || tx?.type === "add-rewardShare") && tx?.signature && !tx.done){
+ if (!intervals.current[tx.signature]) {
+ const sendEventForRewardShare = ()=> {
+ executeEvent('refresh-rewardshare-list', {})
+ }
+ getStatus({ signature: tx.signature }, sendEventForRewardShare);
+ }
+ }
});
- return previousData;
- });
- }, [memberGroups, getUserInfo]);
+ }, [txList])
if (isMobile || txList?.length === 0 || txList.every((item) => item?.done))
return null;
@@ -128,9 +143,9 @@ export const TaskManager = ({ getUserInfo }) => {
{
+ const { openTutorialModal, setOpenTutorialModal } = useContext(GlobalContext);
+ const [multiNumber, setMultiNumber] = useState(0)
+ const handleClose = ()=> {
+ setOpenTutorialModal(null)
+ setMultiNumber(0)
+ }
+ if(!openTutorialModal) return null
+ if(openTutorialModal?.multi){
+ const selectedTutorial = openTutorialModal?.multi[multiNumber]
+ return (
+
+ )
+ }
+ return (
+ <>
+
+
+ )
+}
diff --git a/src/components/Tutorials/img/creation.webp b/src/components/Tutorials/img/creation.webp
new file mode 100644
index 0000000..46310e0
Binary files /dev/null and b/src/components/Tutorials/img/creation.webp differ
diff --git a/src/components/Tutorials/img/dashboard.webp b/src/components/Tutorials/img/dashboard.webp
new file mode 100644
index 0000000..6e33ffd
Binary files /dev/null and b/src/components/Tutorials/img/dashboard.webp differ
diff --git a/src/components/Tutorials/img/groups.webp b/src/components/Tutorials/img/groups.webp
new file mode 100644
index 0000000..8a0ad22
Binary files /dev/null and b/src/components/Tutorials/img/groups.webp differ
diff --git a/src/components/Tutorials/img/important.webp b/src/components/Tutorials/img/important.webp
new file mode 100644
index 0000000..880a84e
Binary files /dev/null and b/src/components/Tutorials/img/important.webp differ
diff --git a/src/components/Tutorials/img/navigation.webp b/src/components/Tutorials/img/navigation.webp
new file mode 100644
index 0000000..a568960
Binary files /dev/null and b/src/components/Tutorials/img/navigation.webp differ
diff --git a/src/components/Tutorials/img/obtaining-qort.jpg b/src/components/Tutorials/img/obtaining-qort.jpg
new file mode 100644
index 0000000..1d213dd
Binary files /dev/null and b/src/components/Tutorials/img/obtaining-qort.jpg differ
diff --git a/src/components/Tutorials/img/overview.webp b/src/components/Tutorials/img/overview.webp
new file mode 100644
index 0000000..bc413b4
Binary files /dev/null and b/src/components/Tutorials/img/overview.webp differ
diff --git a/src/components/Tutorials/img/started.webp b/src/components/Tutorials/img/started.webp
new file mode 100644
index 0000000..76099a5
Binary files /dev/null and b/src/components/Tutorials/img/started.webp differ
diff --git a/src/components/Tutorials/useHandleTutorials.tsx b/src/components/Tutorials/useHandleTutorials.tsx
new file mode 100644
index 0000000..2fabfa0
--- /dev/null
+++ b/src/components/Tutorials/useHandleTutorials.tsx
@@ -0,0 +1,192 @@
+import React, { useCallback, useEffect, useState } from "react";
+import { saveToLocalStorage } from "../Apps/AppsNavBar";
+import creationImg from './img/creation.webp'
+import dashboardImg from './img/dashboard.webp'
+import groupsImg from './img/groups.webp'
+import importantImg from './img/important.webp'
+import navigationImg from './img/navigation.webp'
+import overviewImg from './img/overview.webp'
+import startedImg from './img/started.webp'
+import obtainingImg from './img/obtaining-qort.jpg'
+
+const checkIfGatewayIsOnline = async () => {
+ try {
+ const url = `https://ext-node.qortal.link/admin/status`;
+ const response = await fetch(url, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ });
+ const data = await response.json();
+ if (data?.height) {
+ return true
+ }
+ return false
+
+ } catch (error) {
+ return false
+
+ }
+ }
+export const useHandleTutorials = () => {
+ const [openTutorialModal, setOpenTutorialModal] = useState(null);
+const [shownTutorials, setShowTutorials] = useState(null)
+
+useEffect(()=> {
+ try {
+ const storedData = localStorage.getItem('shown-tutorials');
+
+
+ if (storedData) {
+ setShowTutorials(JSON.parse(storedData));
+ } else {
+ setShowTutorials({})
+ }
+ } catch (error) {
+ //error
+ }
+}, [])
+
+ const saveShowTutorial = useCallback((type)=> {
+ try {
+
+ setShowTutorials((prev)=> {
+ return {
+ ...(prev || {}),
+ [type]: true
+ }
+ })
+ saveToLocalStorage('shown-tutorials', type, true)
+ } catch (error) {
+ //error
+ }
+ }, [])
+ const showTutorial = useCallback(async (type, isForce) => {
+ try {
+ const isOnline = await checkIfGatewayIsOnline()
+ if(!isOnline) return
+ switch (type) {
+ case "create-account":
+ {
+ if((shownTutorials || {})['create-account'] && !isForce) return
+ saveShowTutorial('create-account')
+ setOpenTutorialModal({
+ title: "Account Creation",
+ resource: {
+ name: "a-test",
+ service: "VIDEO",
+ identifier: "account-creation-hub",
+ poster: creationImg
+ },
+ });
+ }
+ break;
+ case "important-information":
+ {
+ if((shownTutorials || {})['important-information'] && !isForce) return
+ saveShowTutorial('important-information')
+
+ setOpenTutorialModal({
+ title: "Important Information!",
+ resource: {
+ name: "a-test",
+ service: "VIDEO",
+ identifier: "important-information-hub",
+ poster: importantImg
+ },
+ });
+ }
+ break;
+ case "getting-started":
+ {
+ if((shownTutorials || {})['getting-started'] && !isForce) return
+ saveShowTutorial('getting-started')
+
+ setOpenTutorialModal({
+ multi: [
+
+ {
+ title: "1. Getting Started",
+ resource: {
+ name: "a-test",
+ service: "VIDEO",
+ identifier: "getting-started-hub",
+ poster: startedImg
+ },
+ },
+ {
+ title: "2. Overview",
+ resource: {
+ name: "a-test",
+ service: "VIDEO",
+ identifier: "overview-hub",
+ poster: overviewImg
+ },
+ },
+ {
+ title: "3. Qortal Groups",
+ resource: {
+ name: "a-test",
+ service: "VIDEO",
+ identifier: "groups-hub",
+ poster: groupsImg
+ },
+ },
+ {
+ title: "4. Obtaining Qort",
+ resource: {
+ name: "a-test",
+ service: "VIDEO",
+ identifier: "obtaining-qort",
+ poster: obtainingImg
+ },
+ },
+ ],
+ });
+ }
+ break;
+ case "qapps":
+ {
+ if((shownTutorials || {})['qapps'] && !isForce) return
+ saveShowTutorial('qapps')
+
+ setOpenTutorialModal({
+ multi: [
+ {
+ title: "1. Apps Dashboard",
+ resource: {
+ name: "a-test",
+ service: "VIDEO",
+ identifier: "apps-dashboard-hub",
+ poster: dashboardImg
+ },
+ },
+ {
+ title: "2. Apps Navigation",
+ resource: {
+ name: "a-test",
+ service: "VIDEO",
+ identifier: "apps-navigation-hub",
+ poster: navigationImg
+ },
+ }
+ ],
+ });
+ }
+ break;
+ default:
+ break;
+ }
+ } catch (error) {
+ //error
+ }
+ }, [shownTutorials]);
+ return {
+ showTutorial,
+ hasSeenGettingStarted: shownTutorials === null ? null : !!(shownTutorials || {})['getting-started'],
+ openTutorialModal,
+ setOpenTutorialModal,
+ shownTutorialsInitiated: !!shownTutorials
+ };
+};
diff --git a/src/components/WrapperUserAction.tsx b/src/components/WrapperUserAction.tsx
index aa0d19a..8bcc03a 100644
--- a/src/components/WrapperUserAction.tsx
+++ b/src/components/WrapperUserAction.tsx
@@ -1,6 +1,7 @@
-import React, { useState } from 'react';
-import { Popover, Button, Box } from '@mui/material';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
+import { Popover, Button, Box, CircularProgress } from '@mui/material';
import { executeEvent } from '../utils/events';
+import { MyContext } from '../App';
export const WrapperUserAction = ({ children, address, name, disabled }) => {
const [anchorEl, setAnchorEl] = useState(null);
@@ -12,9 +13,9 @@ export const WrapperUserAction = ({ children, address, name, disabled }) => {
};
// Handle closing the Popover
- const handleClose = () => {
+ const handleClose = useCallback(() => {
setAnchorEl(null);
- };
+ }, []);
// Determine if the popover is open
const open = Boolean(anchorEl);
@@ -46,65 +47,137 @@ export const WrapperUserAction = ({ children, address, name, disabled }) => {
{/* Popover */}
- event.stopPropagation(), // Stop propagation inside popover
- },
- }}
- >
-
- {/* Option 1: Message */}
-
-
- {/* Option 2: Send QORT */}
-
-
-
+ {open && (
+ event.stopPropagation(), // Stop propagation inside popover
+ },
+ }}
+ >
+
+ {/* Option 1: Message */}
+
+
+ {/* Option 2: Send QORT */}
+
+
+
+
+
+ )}
);
};
+
+
+const BlockUser = ({address, name, handleClose})=> {
+ const [isAlreadyBlocked, setIsAlreadyBlocked] = useState(null)
+ const [isLoading, setIsLoading] = useState(false)
+ const {isUserBlocked,
+ addToBlockList,
+ removeBlockFromList} = useContext(MyContext)
+
+useEffect(()=> {
+ if(!address) return
+ setIsAlreadyBlocked(isUserBlocked(address, name))
+}, [address, setIsAlreadyBlocked, isUserBlocked, name])
+
+ return (
+
+ )
+}
\ No newline at end of file
diff --git a/src/index.css b/src/index.css
index 7db06e7..867382c 100644
--- a/src/index.css
+++ b/src/index.css
@@ -34,8 +34,10 @@
--bg-primary : rgba(31, 32, 35, 1);
--bg-2: #27282c;
--bg-3: rgba(0, 0, 0, 0.1);
- --unread: #B14646;
- --apps-circle: #1F2023
+ --unread: #4297e2;
+ --danger: #B14646;
+ --apps-circle: #1F2023;
+ --green: #5EB049;
}
body {
@@ -63,7 +65,7 @@ body {
}
.image-container:hover .base-image {
- opacity: 0;
+ opacity: 0.6;
}
::-webkit-scrollbar-track {
@@ -74,7 +76,7 @@ body {
}
::-webkit-scrollbar {
- width: 14px;
+ width: 16px;
height: 10px;
}
@@ -83,6 +85,10 @@ body {
border-radius: 8px;
background-clip: content-box;
border: 4px solid transparent;
+ transition: 0.3s background-color;
+}
+::-webkit-scrollbar-thumb:hover {
+ background-color: #363636;
}
@property --var1 {
diff --git a/src/messaging/messagesToBackground.tsx b/src/messaging/messagesToBackground.tsx
index 1d5c724..7da16d4 100644
--- a/src/messaging/messagesToBackground.tsx
+++ b/src/messaging/messagesToBackground.tsx
@@ -52,7 +52,7 @@ export const sendMessageBackground = (action, data = {}, timeout = 180000, isExt
});
}).then((response) => {
// Return payload or error based on response content
- if (response?.payload) {
+ if (response?.payload !== null && response?.payload !== undefined) {
return response.payload;
} else if (response?.error) {
return { error: response.error, message: response?.message || "An error occurred" };
diff --git a/src/qdn/encryption/group-encryption.ts b/src/qdn/encryption/group-encryption.ts
index 3a3066b..82734ee 100644
--- a/src/qdn/encryption/group-encryption.ts
+++ b/src/qdn/encryption/group-encryption.ts
@@ -145,7 +145,7 @@ export const encryptDataGroup = ({ data64, publicKeys, privateKey, userPublicKey
}
}
-export const encryptSingle = async ({ data64, secretKeyObject, typeNumber = 1 }: any) => {
+export const encryptSingle = async ({ data64, secretKeyObject, typeNumber = 2 }: any) => {
// Find the highest key in the secretKeyObject
const highestKey = Math.max(...Object.keys(secretKeyObject).filter(item => !isNaN(+item)).map(Number));
const highestKeyObject = secretKeyObject[highestKey];
@@ -188,7 +188,22 @@ export const encryptSingle = async ({ data64, secretKeyObject, typeNumber = 1 }:
// Concatenate the highest key, type number, nonce, and encrypted data (new format)
const highestKeyStr = highestKey.toString().padStart(10, '0'); // Fixed length of 10 digits
- finalEncryptedData = btoa(highestKeyStr + typeNumberStr + nonceBase64 + encryptedDataBase64);
+
+ const highestKeyBytes = new TextEncoder().encode(highestKeyStr.padStart(10, '0'));
+const typeNumberBytes = new TextEncoder().encode(typeNumberStr.padStart(3, '0'));
+
+// Step 3: Concatenate all binary
+const combinedBinary = new Uint8Array(
+ highestKeyBytes.length + typeNumberBytes.length + nonce.length + encryptedData.length
+);
+ // finalEncryptedData = btoa(highestKeyStr) + btoa(typeNumberStr) + nonceBase64 + encryptedDataBase64;
+ combinedBinary.set(highestKeyBytes, 0);
+combinedBinary.set(typeNumberBytes, highestKeyBytes.length);
+combinedBinary.set(nonce, highestKeyBytes.length + typeNumberBytes.length);
+combinedBinary.set(encryptedData, highestKeyBytes.length + typeNumberBytes.length + nonce.length);
+
+// Step 4: Base64 encode once
+ finalEncryptedData = uint8ArrayToBase64(combinedBinary);
}
return finalEncryptedData;
@@ -202,22 +217,20 @@ export const decodeBase64ForUIChatMessages = (messages)=> {
try {
const decoded = atob(msg?.data);
const parseDecoded =JSON.parse(decodeURIComponent(escape(decoded)))
- if(parseDecoded?.messageText){
+
msgs.push({
...msg,
...parseDecoded
})
- }
+
} catch (error) {
}
}
return msgs
}
-
-
- export const decryptSingle = async ({ data64, secretKeyObject, skipDecodeBase64 }: any) => {
+export const decryptSingle = async ({ data64, secretKeyObject, skipDecodeBase64 }: any) => {
// First, decode the base64-encoded input (if skipDecodeBase64 is not set)
const decodedData = skipDecodeBase64 ? data64 : atob(data64);
@@ -249,6 +262,28 @@ export const decodeBase64ForUIChatMessages = (messages)=> {
encryptedDataBase64 = decodeForNumber.slice(10); // The remaining part is the encrypted data
} else {
if (hasTypeNumber) {
+ // const typeNumberStr = new TextDecoder().decode(typeNumberBytes);
+ if(decodeForNumber.slice(10, 13) !== '001'){
+ const decodedBinary = base64ToUint8Array(decodedData);
+ const highestKeyBytes = decodedBinary.slice(0, 10); // if ASCII digits only
+ const highestKeyStr = new TextDecoder().decode(highestKeyBytes);
+
+const nonce = decodedBinary.slice(13, 13 + 24);
+const encryptedData = decodedBinary.slice(13 + 24);
+const highestKey = parseInt(highestKeyStr, 10);
+
+const messageKey = base64ToUint8Array(secretKeyObject[+highestKey].messageKey);
+const decryptedBytes = nacl.secretbox.open(encryptedData, nonce, messageKey);
+
+ // Check if decryption was successful
+ if (!decryptedBytes) {
+ throw new Error("Decryption failed");
+ }
+
+ // Convert the decrypted Uint8Array back to a Base64 string
+ return uint8ArrayToBase64(decryptedBytes);
+
+ }
// New format: Extract type number and nonce
typeNumberStr = possibleTypeNumberStr; // Extract type number
nonceBase64 = decodeForNumber.slice(13, 45); // Extract nonce (next 32 characters after type number)
@@ -280,6 +315,9 @@ export const decodeBase64ForUIChatMessages = (messages)=> {
// Convert the decrypted Uint8Array back to a Base64 string
return uint8ArrayToBase64(decryptedData);
};
+
+
+
export const decryptGroupEncryptionWithSharingKey = async ({ data64EncryptedData, key }: any) => {
diff --git a/src/qortalRequests.ts b/src/qortalRequests.ts
index 658badf..0397538 100644
--- a/src/qortalRequests.ts
+++ b/src/qortalRequests.ts
@@ -1,5 +1,6 @@
import { gateways, getApiKeyFromStorage } from "./background";
-import { addForeignServer, addListItems, adminAction, cancelSellOrder, createAndCopyEmbedLink, createBuyOrder, createPoll, createSellOrder, decryptData, decryptDataWithSharingKey, decryptQortalGroupData, deleteListItems, deployAt, encryptData, encryptDataWithSharingKey, encryptQortalGroupData, getCrossChainServerInfo, getDaySummary, getForeignFee, getListItems, getServerConnectionHistory, getTxActivitySummary, getUserAccount, getUserWallet, getUserWalletInfo, getWalletBalance, joinGroup, openNewTab, publishMultipleQDNResources, publishQDNResource, removeForeignServer, saveFile, sendChatMessage, sendCoin, setCurrentForeignServer, signTransaction, updateForeignFee, voteOnPoll } from "./qortalRequests/get";
+import { listOfAllQortalRequests } from "./components/Apps/useQortalMessageListener";
+import { addForeignServer, addGroupAdminRequest, addListItems, adminAction, banFromGroupRequest, cancelGroupBanRequest, cancelGroupInviteRequest, cancelSellOrder, createAndCopyEmbedLink, createBuyOrder, createGroupRequest, createPoll, createSellOrder, decryptAESGCMRequest, decryptData, decryptDataWithSharingKey, decryptQortalGroupData, deleteHostedData, deleteListItems, deployAt, encryptData, encryptDataWithSharingKey, encryptQortalGroupData, getCrossChainServerInfo, getDaySummary, getForeignFee, getHostedData, getListItems, getServerConnectionHistory, getTxActivitySummary, getUserAccount, getUserWallet, getUserWalletInfo, getUserWalletTransactions, getWalletBalance, inviteToGroupRequest, joinGroup, kickFromGroupRequest, leaveGroupRequest, openNewTab, publishMultipleQDNResources, publishQDNResource, registerNameRequest, removeForeignServer, removeGroupAdminRequest, saveFile, sendChatMessage, sendCoin, setCurrentForeignServer, signTransaction, updateForeignFee, updateNameRequest, voteOnPoll } from "./qortalRequests/get";
import { getData, storeData } from "./utils/chromeStorage";
@@ -376,7 +377,7 @@ export const isRunningGateway = async ()=> {
case "GET_USER_WALLET": {
try {
- const res = await getUserWallet(request.payload, isFromExtension);
+ const res = await getUserWallet(request.payload, isFromExtension, appInfo);
event.source.postMessage({
requestId: request.requestId,
action: request.action,
@@ -413,10 +414,30 @@ export const isRunningGateway = async ()=> {
}
break;
}
+
+ case "GET_USER_WALLET_TRANSACTIONS": {
+ try {
+ const res = await getUserWalletTransactions(request.payload, isFromExtension, appInfo);
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
case "GET_USER_WALLET_INFO": {
try {
- const res = await getUserWalletInfo(request.payload, isFromExtension);
+ const res = await getUserWalletInfo(request.payload, isFromExtension, appInfo);
event.source.postMessage({
requestId: request.requestId,
action: request.action,
@@ -691,13 +712,13 @@ export const isRunningGateway = async ()=> {
}
break;
}
- case "IS_USING_GATEWAY": {
+ case "IS_USING_PUBLIC_NODE": {
try {
let isGateway = await isRunningGateway()
event.source.postMessage({
requestId: request.requestId,
action: request.action,
- payload: {isGateway},
+ payload: isGateway,
type: "backgroundMessageResponse",
}, event.origin);
} catch (error) {
@@ -827,7 +848,297 @@ export const isRunningGateway = async ()=> {
}
break;
}
-
+
+ case "DELETE_HOSTED_DATA" : {
+ try {
+ const res = await deleteHostedData(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "GET_HOSTED_DATA" : {
+ try {
+ const res = await getHostedData(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "SHOW_ACTIONS" : {
+ try {
+
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: listOfAllQortalRequests,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "REGISTER_NAME" : {
+ try {
+ const res = await registerNameRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "UPDATE_NAME" : {
+ try {
+ const res = await updateNameRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+
+ case "LEAVE_GROUP" : {
+ try {
+ const res = await leaveGroupRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+
+ case "INVITE_TO_GROUP" : {
+ try {
+ const res = await inviteToGroupRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "KICK_FROM_GROUP" : {
+ try {
+ const res = await kickFromGroupRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "BAN_FROM_GROUP" : {
+ try {
+ const res = await banFromGroupRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+
+ case "CANCEL_GROUP_BAN" : {
+ try {
+ const res = await cancelGroupBanRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "ADD_GROUP_ADMIN" : {
+ try {
+ const res = await addGroupAdminRequest(request.payload, isFromExtension)
+
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "DECRYPT_AESGCM" : {
+ try {
+ const res = await decryptAESGCMRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "REMOVE_GROUP_ADMIN" : {
+ try {
+ const res = await removeGroupAdminRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+
+ case "CANCEL_GROUP_INVITE" : {
+ try {
+ const res = await cancelGroupInviteRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
+ case "CREATE_GROUP" : {
+ try {
+ const res = await createGroupRequest(request.payload, isFromExtension)
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ payload: res,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ } catch (error) {
+ event.source.postMessage({
+ requestId: request.requestId,
+ action: request.action,
+ error: error?.message,
+ type: "backgroundMessageResponse",
+ }, event.origin);
+ }
+ break;
+ }
default:
break;
}
diff --git a/src/qortalRequests/get.ts b/src/qortalRequests/get.ts
index c7f7046..956fa07 100644
--- a/src/qortalRequests/get.ts
+++ b/src/qortalRequests/get.ts
@@ -1,3 +1,4 @@
+import { Sha256 } from "asmcrypto.js";
import {
computePow,
createEndpoint,
@@ -17,6 +18,18 @@ import {
performPowTask,
parseErrorResponse,
groupSecretkeys,
+ registerName,
+ updateName,
+ leaveGroup,
+ inviteToGroup,
+ getNameInfoForOthers,
+ kickFromGroup,
+ banFromGroup,
+ cancelBan,
+ makeAdmin,
+ removeAdmin,
+ cancelInvitationToGroup,
+ createGroup,
} from "../background";
import { getNameInfo, uint8ArrayToObject } from "../backgroundFunctions/encryption";
import { showSaveFilePicker } from "../components/Apps/useQortalMessageListener";
@@ -25,7 +38,10 @@ import { extractComponents } from "../components/Chat/MessageDisplay";
import { decryptResource, getGroupAdmins, getPublishesFromAdmins, validateSecretKey } from "../components/Group/Group";
import { QORT_DECIMALS } from "../constants/constants";
import Base58 from "../deps/Base58";
+import ed2curve from "../deps/ed2curve";
import nacl from "../deps/nacl-fast";
+
+
import {
base64ToUint8Array,
createSymmetricKeyAndNonce,
@@ -50,14 +66,38 @@ import DeleteTradeOffer from "../transactions/TradeBotDeleteRequest";
import signTradeBotTransaction from "../transactions/signTradeBotTransaction";
import { createTransaction } from "../transactions/transactions";
import { executeEvent } from "../utils/events";
+import { fileToBase64 } from "../utils/fileReading";
import { mimeToExtensionMap } from "../utils/memeTypes";
+import { RequestQueueWithPromise } from "../utils/queue/queue";
import utils from "../utils/utils";
+export const requestQueueGetAtAddresses = new RequestQueueWithPromise(10);
+
const sellerForeignFee = {
LITECOIN: {
value: "~0.00005",
ticker: "LTC",
},
+ DOGECOIN: {
+ value: "~0.005",
+ ticker: "DOGE",
+ },
+ BITCOIN: {
+ value: "~0.0001",
+ ticker: "BTC",
+ },
+ DIGIBYTE: {
+ value: "~0.0005",
+ ticker: "DGB",
+ },
+ RAVENCOIN: {
+ value: "~0.006",
+ ticker: "RVN",
+ },
+ PIRATECHAIN: {
+ value: "~0.0002",
+ ticker: "ARRR",
+ },
};
const btcFeePerByte = 0.000001;
@@ -374,10 +414,10 @@ export const getUserAccount = async ({ isFromExtension, appInfo }) => {
};
export const encryptData = async (data, sender) => {
- let data64 = data.data64;
+ let data64 = data.data64 || data.base64;
let publicKeys = data.publicKeys || [];
- if (data.fileId) {
- data64 = await getFileFromContentScript(data.fileId);
+ if (data?.file || data?.blob) {
+ data64 = await fileToBase64(data?.file || data?.blob);
}
if (!data64) {
throw new Error("Please include data to encrypt");
@@ -401,14 +441,14 @@ export const encryptData = async (data, sender) => {
};
export const encryptQortalGroupData = async (data, sender) => {
- let data64 = data.data64;
+ let data64 = data?.data64 || data?.base64;
let groupId = data?.groupId
let isAdmins = data?.isAdmins
if(!groupId){
throw new Error('Please provide a groupId')
}
- if (data.fileId) {
- data64 = await getFileFromContentScript(data.fileId);
+ if (data?.file || data?.blob) {
+ data64 = await fileToBase64(data?.file || data?.blob);
}
if (!data64) {
throw new Error("Please include data to encrypt");
@@ -436,7 +476,8 @@ export const encryptQortalGroupData = async (data, sender) => {
url
);
const resData = await res.text();
- const decryptedKey: any = await decryptResource(resData);
+
+ const decryptedKey: any = await decryptResource(resData, true);
const dataint8Array = base64ToUint8Array(decryptedKey.data);
const decryptedKeyToObject = uint8ArrayToObject(dataint8Array);
@@ -470,8 +511,7 @@ url
url
);
const resData = await res.text();
- const decryptedKey: any = await decryptResource(resData);
-
+ const decryptedKey: any = await decryptResource(resData, true);
const dataint8Array = base64ToUint8Array(decryptedKey.data);
const decryptedKeyToObject = uint8ArrayToObject(dataint8Array);
@@ -500,7 +540,7 @@ url
};
export const decryptQortalGroupData = async (data, sender) => {
- let data64 = data.data64;
+ let data64 = data?.data64 || data?.base64;
let groupId = data?.groupId
let isAdmins = data?.isAdmins
if(!groupId){
@@ -531,7 +571,7 @@ export const decryptQortalGroupData = async (data, sender) => {
url
);
const resData = await res.text();
- const decryptedKey: any = await decryptResource(resData);
+ const decryptedKey: any = await decryptResource(resData, true);
const dataint8Array = base64ToUint8Array(decryptedKey.data);
const decryptedKeyToObject = uint8ArrayToObject(dataint8Array);
@@ -562,7 +602,7 @@ url
url
);
const resData = await res.text();
- const decryptedKey: any = await decryptResource(resData);
+ const decryptedKey: any = await decryptResource(resData, true);
const dataint8Array = base64ToUint8Array(decryptedKey.data);
const decryptedKeyToObject = uint8ArrayToObject(dataint8Array);
@@ -589,10 +629,10 @@ url
};
export const encryptDataWithSharingKey = async (data, sender) => {
- let data64 = data.data64;
+ let data64 = data?.data64 || data?.base64;
let publicKeys = data.publicKeys || [];
- if (data.fileId) {
- data64 = await getFileFromContentScript(data.fileId);
+ if (data?.file || data?.blob) {
+ data64 = await fileToBase64(data?.file || data?.blob);
}
if (!data64) {
throw new Error("Please include data to encrypt");
@@ -636,6 +676,86 @@ export const decryptDataWithSharingKey = async (data, sender) => {
return base64ToObject.data
};
+export const getHostedData = async (data, isFromExtension) => {
+ const isGateway = await isRunningGateway();
+ if (isGateway) {
+ throw new Error("This action cannot be done through a gateway");
+ }
+ const resPermission = await getUserPermission(
+ {
+ text1: "Do you give this application permission to",
+ text2: `Get a list of your hosted data?`,
+ },
+ isFromExtension
+ );
+ const { accepted } = resPermission;
+
+ if(accepted){
+ const limit = data?.limit ? data?.limit : 20;
+ const query = data?.query ? data?.query : ""
+ const offset = data?.offset ? data?.offset : 0
+
+ let urlPath = `/arbitrary/hosted/resources/?limit=${limit}&offset=${offset}`
+ if(query){
+ urlPath = urlPath + `&query=${query}`
+ }
+
+ const url = await createEndpoint(urlPath);
+ const response = await fetch(url);
+ const dataResponse = await response.json();
+ return dataResponse
+
+
+ } else {
+ throw new Error("User declined to get list of hosted resources");
+ }
+
+};
+
+export const deleteHostedData = async (data, isFromExtension) => {
+ const isGateway = await isRunningGateway();
+ if (isGateway) {
+ throw new Error("This action cannot be done through a gateway");
+ }
+ const requiredFields = ["hostedData"];
+ const missingFields: string[] = [];
+ requiredFields.forEach((field) => {
+ if (!data[field]) {
+ missingFields.push(field);
+ }
+ });
+ const resPermission = await getUserPermission(
+ {
+ text1: "Do you give this application permission to",
+ text2: `Delete ${data?.hostedData?.length} hosted resources?`,
+ },
+ isFromExtension
+ );
+ const { accepted } = resPermission;
+
+ if(accepted){
+ const { hostedData } = data;
+
+ for (const hostedDataItem of hostedData){
+ try {
+ const url = await createEndpoint(`/arbitrary/resource/${hostedDataItem.service}/${hostedDataItem.name}/${hostedDataItem.identifier}`);
+ await fetch(url, {
+ method: "DELETE",
+ headers: {
+ "Content-Type": "application/json",
+ }
+ });
+ } catch (error) {
+ //error
+ }
+ }
+
+ return true
+ } else {
+ throw new Error("User declined delete hosted resources");
+ }
+
+};
export const decryptData = async (data) => {
const { encryptedData, publicKey } = data;
@@ -797,7 +917,7 @@ export const deleteListItems = async (data, isFromExtension) => {
if (isGateway) {
throw new Error("This action cannot be done through a gateway");
}
- const requiredFields = ["list_name", "item"];
+ const requiredFields = ["list_name"];
const missingFields: string[] = [];
requiredFields.forEach((field) => {
if (!data[field]) {
@@ -809,15 +929,18 @@ export const deleteListItems = async (data, isFromExtension) => {
const errorMsg = `Missing fields: ${missingFieldsString}`;
throw new Error(errorMsg);
}
-
- const item = data.item;
+ if(!data?.item && !data?.items){
+ throw new Error('Missing fields: items')
+ }
+ const item = data?.item;
+ const items = data?.items
const list_name = data.list_name;
const resPermission = await getUserPermission(
{
text1: "Do you give this application permission to",
text2: `Remove the following from the list ${list_name}:`,
- highlightedText: item,
+ highlightedText: items ? JSON.stringify(items) : item,
},
isFromExtension
);
@@ -826,7 +949,7 @@ export const deleteListItems = async (data, isFromExtension) => {
if (accepted) {
const url = await createEndpoint(`/lists/${list_name}`);
const body = {
- items: [item],
+ items: items || [item],
};
const bodyToString = JSON.stringify(body);
const response = await fetch(url, {
@@ -867,29 +990,45 @@ export const publishQDNResource = async (
const errorMsg = `Missing fields: ${missingFieldsString}`;
throw new Error(errorMsg);
}
- if (!data.fileId && !data.data64) {
+ if (!data.file && !data.data64 && !data.base64) {
throw new Error("No data or file was submitted");
}
- // Use "default" if user hasn't specified an identifer
+ // Use "default" if user hasn't specified an identifier
const service = data.service;
+ const appFee = data?.appFee ? +data.appFee : undefined
+ const appFeeRecipient = data?.appFeeRecipient
+ let hasAppFee = false
+ if(appFee && appFee > 0 && appFeeRecipient){
+ hasAppFee = true
+ }
const registeredName = await getNameInfo();
const name = registeredName;
+ if(!name){
+ throw new Error('User has no Qortal name')
+ }
let identifier = data.identifier;
- let data64 = data.data64;
+ let data64 = data.data64 || data.base64;
const filename = data.filename;
const title = data.title;
const description = data.description;
const category = data.category;
- const tag1 = data.tag1;
- const tag2 = data.tag2;
- const tag3 = data.tag3;
- const tag4 = data.tag4;
- const tag5 = data.tag5;
+
+ const tags = data?.tags || [];
+const result = {};
+
+// Fill tags dynamically while maintaining backward compatibility
+for (let i = 0; i < 5; i++) {
+ result[`tag${i + 1}`] = tags[i] || data[`tag${i + 1}`] || undefined;
+}
+
+// Access tag1 to tag5 from result
+const { tag1, tag2, tag3, tag4, tag5 } = result;
+
if (data.identifier == null) {
identifier = "default";
}
- if (data.fileId) {
- data64 = await getFileFromContentScript(data.fileId);
+ if (data?.file || data?.blob) {
+ data64 = await fileToBase64(data?.file || data?.blob);
}
if (
data.encrypt &&
@@ -924,17 +1063,30 @@ export const publishQDNResource = async (
const fee = await getFee("ARBITRARY");
+ const handleDynamicValues = {}
+ if(hasAppFee){
+ const feePayment = await getFee("PAYMENT");
+
+ handleDynamicValues['appFee'] = +appFee + +feePayment.fee,
+ handleDynamicValues['checkbox1'] = {
+ value: true,
+ label: "accept app fee",
+ }
+ }
+ if(!!data?.encrypt){
+ handleDynamicValues['highlightedText'] = `isEncrypted: ${!!data.encrypt}`
+ }
const resPermission = await getUserPermission(
{
text1: "Do you give this application permission to publish to QDN?",
text2: `service: ${service}`,
text3: `identifier: ${identifier || null}`,
- highlightedText: data?.externalEncrypt ? `App is externally encrypting the resource. Make sure you trust the app.` : `isEncrypted: ${!!data.encrypt}`,
fee: fee.fee,
+ ...handleDynamicValues
},
isFromExtension
);
- const { accepted } = resPermission;
+ const { accepted, checkbox1 = false } = resPermission;
if (accepted) {
try {
@@ -957,6 +1109,12 @@ export const publishQDNResource = async (
apiVersion: 2,
withFee: true,
});
+ if(resPublish?.signature && hasAppFee && checkbox1){
+ sendCoinFunc({
+ amount: appFee,
+ receiver: appFeeRecipient
+ }, true)
+ }
return resPublish;
} catch (error) {
throw new Error(error?.message || "Upload failed");
@@ -966,6 +1124,41 @@ export const publishQDNResource = async (
}
};
+export const checkArrrSyncStatus = async (seed) => {
+ const _url = await createEndpoint(`/crosschain/arrr/syncstatus`);
+ let tries = 0; // Track the number of attempts
+
+ while (tries < 36) {
+ const response = await fetch(_url, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: seed,
+ });
+
+ let res;
+ try {
+ res = await response.clone().json();
+ } catch (e) {
+ res = await response.text();
+ }
+
+ if (res.indexOf('<') > -1 || res !== "Synchronized") {
+ // Wait 2 seconds before trying again
+ await new Promise((resolve) => setTimeout(resolve, 2000));
+ tries += 1;
+ } else {
+ // If the response doesn't meet the two conditions, exit the function
+ return;
+ }
+ }
+
+ // If we exceed 6 tries, throw an error
+ throw new Error("Failed to synchronize after 36 attempts");
+};
+
+
export const publishMultipleQDNResources = async (
data: any,
sender,
@@ -991,16 +1184,54 @@ export const publishMultipleQDNResources = async (
if (resources.length === 0) {
throw new Error("No resources to publish");
}
- if (
- data.encrypt &&
- (!data.publicKeys ||
- (Array.isArray(data.publicKeys) && data.publicKeys.length === 0))
- ) {
- throw new Error("Encrypting data requires public keys");
+
+ const encrypt = data?.encrypt
+
+ for (const resource of resources) {
+ const resourceEncrypt = encrypt && resource?.disableEncrypt !== true
+ if (!resourceEncrypt && resource?.service.endsWith("_PRIVATE")) {
+ const errorMsg = "Only encrypted data can go into private services";
+ throw new Error(errorMsg)
+ } else if(resourceEncrypt && !resource?.service.endsWith("_PRIVATE")){
+ const errorMsg = "For an encrypted publish please use a service that ends with _PRIVATE";
+ throw new Error(errorMsg)
+ }
}
+
+
+ // if (
+ // data.encrypt &&
+ // (!data.publicKeys ||
+ // (Array.isArray(data.publicKeys) && data.publicKeys.length === 0))
+ // ) {
+ // throw new Error("Encrypting data requires public keys");
+ // }
const fee = await getFee("ARBITRARY");
const registeredName = await getNameInfo();
const name = registeredName;
+ if(!name){
+ throw new Error('You need a Qortal name to publish.')
+ }
+ const appFee = data?.appFee ? +data.appFee : undefined
+ const appFeeRecipient = data?.appFeeRecipient
+ let hasAppFee = false
+ if(appFee && appFee > 0 && appFeeRecipient){
+ hasAppFee = true
+ }
+
+ const handleDynamicValues = {}
+ if(hasAppFee){
+ const feePayment = await getFee("PAYMENT");
+
+ handleDynamicValues['appFee'] = +appFee + +feePayment.fee,
+ handleDynamicValues['checkbox1'] = {
+ value: true,
+ label: "accept app fee",
+ }
+ }
+ if(data?.encrypt){
+ handleDynamicValues['highlightedText'] = `isEncrypted: ${!!data.encrypt}`
+ }
const resPermission = await getUserPermission(
{
text1: "Do you give this application permission to publish to QDN?",
@@ -1051,7 +1282,7 @@ export const publishMultipleQDNResources = async (
Service: ${
resource.service
}
- Name: ${resource.name}
+ Name: ${name}
Identifier: ${
resource.identifier
}
@@ -1066,12 +1297,12 @@ export const publishMultipleQDNResources = async (