diff --git a/src/background.ts b/src/background.ts index 8368aca..9a820b7 100644 --- a/src/background.ts +++ b/src/background.ts @@ -1154,7 +1154,7 @@ export async function transferAsset({ }) { const lastReference = await getLastRef(); const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const uint8PrivateKey = Base58.decode(parsedData.privateKey); const uint8PublicKey = Base58.decode(parsedData.publicKey); const keyPair = { @@ -2551,7 +2551,7 @@ export async function registerName({ name, description = "" }) { export async function updateName({ newName, oldName, description }) { const lastReference = await getLastRef(); const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const uint8PrivateKey = Base58.decode(parsedData.privateKey); const uint8PublicKey = Base58.decode(parsedData.publicKey); const keyPair = { @@ -2748,7 +2748,7 @@ export async function sellName({ const lastReference = await getLastRef(); const feeres = await getFee("SELL_NAME"); const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const uint8PrivateKey = Base58.decode(parsedData.privateKey); const uint8PublicKey = Base58.decode(parsedData.publicKey); const keyPair = { @@ -2780,7 +2780,7 @@ export async function cancelSellName({ const lastReference = await getLastRef(); const feeres = await getFee("SELL_NAME"); const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const uint8PrivateKey = Base58.decode(parsedData.privateKey); const uint8PublicKey = Base58.decode(parsedData.publicKey); const keyPair = { @@ -2813,7 +2813,7 @@ export async function buyName({ const lastReference = await getLastRef(); const feeres = await getFee("BUY_NAME"); const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const uint8PrivateKey = Base58.decode(parsedData.privateKey); const uint8PublicKey = Base58.decode(parsedData.publicKey); const keyPair = { @@ -2853,7 +2853,7 @@ export async function updateGroup({ const lastReference = await getLastRef(); const feeres = await getFee("UPDATE_GROUP"); const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const uint8PrivateKey = Base58.decode(parsedData.privateKey); const uint8PublicKey = Base58.decode(parsedData.publicKey); const keyPair = { @@ -4684,7 +4684,7 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { tag2, tag3, tag4, - tag5, uploadType } = request.payload; + tag5, uploadType, name = "" } = request.payload; publishOnQDN({ data, @@ -4698,7 +4698,8 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { tag3, tag4, tag5, - uploadType + uploadType, + name }) .then((data) => { sendResponse(data); diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx index bf2e2dc..8e8e5db 100644 --- a/src/components/Group/Group.tsx +++ b/src/components/Group/Group.tsx @@ -62,7 +62,7 @@ import HomeIcon from "@mui/icons-material/Home"; import CloseIcon from "@mui/icons-material/Close"; import { ThingsToDoInitial } from "./ThingsToDoInitial"; -import { GroupJoinRequests } from "./GroupJoinRequests"; +import { GroupJoinRequests, requestQueueGroupJoinRequests } from "./GroupJoinRequests"; import { GroupForum } from "../Chat/GroupForum"; import { GroupInvites } from "./GroupInvites"; import { diff --git a/src/qortalRequests/get.ts b/src/qortalRequests/get.ts index 2baae31..bb0900b 100644 --- a/src/qortalRequests/get.ts +++ b/src/qortalRequests/get.ts @@ -4648,7 +4648,8 @@ export const decryptAESGCMRequest = async (data, isFromExtension) => { // Decode keys and IV const senderPublicKey = Base58.decode(senderPublicKeyBase58); - const resKeyPair = await getKeyPair(); // Assume this retrieves the current user's keypair + let resKeyPair = await getKeyPair(); // Assume this retrieves the current user's keypair + resKeyPair = JSON.parse(resKeyPair); const uint8PrivateKey = Base58.decode(resKeyPair.privateKey); // Convert ed25519 keys to Curve25519 @@ -4789,7 +4790,7 @@ if (resPermission) { let publicKey if(data?.coin === 'ARRR'){ const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); publicKey = parsedData.arrrSeed58; } else { publicKey = walletKeys["publickey"] @@ -4892,7 +4893,7 @@ export const getNodeStatus = async () => { export const getArrrSyncStatus = async () => { const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const arrrSeed = parsedData.arrrSeed58; const url = `/crosschain/arrr/syncstatus`; // Simplified endpoint URL @@ -5128,7 +5129,7 @@ export const multiPaymentWithPrivateData = async (data, isFromExtension) => { } }); const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const privateKey = parsedData.privateKey; const userPublicKey = parsedData.publicKey const {fee: paymentFee} = await getFee("TRANSFER_ASSET"); @@ -5493,7 +5494,7 @@ export const signForeignFees = async (data, isFromExtension) => { const wallet = await getSaveWallet(); const address = wallet.address0; const resKeyPair = await getKeyPair(); - const parsedData = resKeyPair; + const parsedData = JSON.parse(resKeyPair); const uint8PrivateKey = Base58.decode(parsedData.privateKey); const uint8PublicKey = Base58.decode(parsedData.publicKey); const keyPair = {