From 7b61a4a153c53d2b47bd9034b725f1a0905a637f Mon Sep 17 00:00:00 2001 From: PhilReact Date: Tue, 27 May 2025 00:30:23 +0300 Subject: [PATCH] updated to primary name logic --- src/background.ts | 19 +++++++++++-------- src/backgroundFunctions/encryption.ts | 12 ++++++------ .../Apps/useQortalMessageListener.tsx | 2 +- src/components/Group/Group.tsx | 8 ++++---- src/components/Minting/Minting.tsx | 8 ++++---- src/qdn/publish/pubish.ts | 2 +- src/qortalRequests.ts | 17 +++++++++++++++-- 7 files changed, 42 insertions(+), 26 deletions(-) diff --git a/src/background.ts b/src/background.ts index e377ef3..088560d 100644 --- a/src/background.ts +++ b/src/background.ts @@ -977,28 +977,31 @@ const forceCloseWebSocket = () => { } }; -async function getNameInfo() { +export async function getNameInfo() { const wallet = await getSaveWallet(); const address = wallet.address0; const validApi = await getBaseApi(); - const response = await fetch(validApi + "/names/address/" + address); + const response = await fetch(validApi + '/names/primary/' + address); const nameData = await response.json(); - if (nameData?.length > 0) { + if (nameData?.name) { return nameData[0].name; } else { - return ""; + return ''; } } + export async function getNameInfoForOthers(address) { + if (!address) return ''; const validApi = await getBaseApi(); - const response = await fetch(validApi + "/names/address/" + address); + const response = await fetch(validApi + '/names/primary/' + address); const nameData = await response.json(); - if (nameData?.length > 0) { - return nameData[0].name; + if (nameData?.name) { + return nameData?.name; } else { - return ""; + return ''; } } + export async function getAddressInfo(address) { const validApi = await getBaseApi(); const response = await fetch(validApi + "/addresses/" + address); diff --git a/src/backgroundFunctions/encryption.ts b/src/backgroundFunctions/encryption.ts index a2bc160..7b8e1ed 100644 --- a/src/backgroundFunctions/encryption.ts +++ b/src/backgroundFunctions/encryption.ts @@ -46,16 +46,16 @@ async function getSaveWallet() { throw new Error("No wallet saved"); } } -export async function getNameInfo() { + export async function getNameInfo() { const wallet = await getSaveWallet(); const address = wallet.address0; - const validApi = await getBaseApi() - const response = await fetch(validApi + "/names/address/" + address); + const validApi = await getBaseApi(); + const response = await fetch(validApi + '/names/primary/' + address); const nameData = await response.json(); - if (nameData?.length > 0) { - return nameData[0].name; + if (nameData?.name) { + return nameData?.name; } else { - return ""; + return ''; } } diff --git a/src/components/Apps/useQortalMessageListener.tsx b/src/components/Apps/useQortalMessageListener.tsx index b7e68a2..c32bdbb 100644 --- a/src/components/Apps/useQortalMessageListener.tsx +++ b/src/components/Apps/useQortalMessageListener.tsx @@ -359,7 +359,7 @@ const UIQortalRequests = [ 'CANCEL_SELL_NAME', 'BUY_NAME', 'MULTI_ASSET_PAYMENT_WITH_PRIVATE_DATA', 'TRANSFER_ASSET', -'SIGN_FOREIGN_FEES', +'SIGN_FOREIGN_FEES', 'GET_PRIMARY_NAME', ]; diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx index 377d2a3..0933cfe 100644 --- a/src/components/Group/Group.tsx +++ b/src/components/Group/Group.tsx @@ -324,13 +324,13 @@ export const getDataPublishesFunc = async (groupId, type) => { }; export async function getNameInfo(address: string) { - const response = await fetch(`${getBaseApiReact()}/names/address/` + address); + const response = await fetch(`${getBaseApiReact()}/names/primary/` + address); const nameData = await response.json(); - if (nameData?.length > 0) { - return nameData[0]?.name; + if (nameData?.name) { + return nameData?.name; } else { - return ""; + return ''; } } diff --git a/src/components/Minting/Minting.tsx b/src/components/Minting/Minting.tsx index 617f52e..ac438d9 100644 --- a/src/components/Minting/Minting.tsx +++ b/src/components/Minting/Minting.tsx @@ -89,14 +89,14 @@ export const Minting = ({ const getName = async (address) => { try { const response = await fetch( - `${getBaseApiReact()}/names/address/${address}` + `${getBaseApiReact()}/names/primary/${address}` ); const nameData = await response.json(); - if (nameData?.length > 0) { + if (nameData?.name) { setNames((prev) => { return { ...prev, - [address]: nameData[0].name, + [address]: nameData?.name, }; }); } else { @@ -108,7 +108,7 @@ export const Minting = ({ }); } } catch (error) { - // error + console.log(error); } }; diff --git a/src/qdn/publish/pubish.ts b/src/qdn/publish/pubish.ts index 7257607..91dfbd6 100644 --- a/src/qdn/publish/pubish.ts +++ b/src/qdn/publish/pubish.ts @@ -310,7 +310,7 @@ export const publishData = async ({ } const file = data; - // const urlCheck = `/arbitrary/check-tmp-space?totalSize=${file.size}`; + // const urlCheck = `/arbitrary/check/tmp?totalSize=${file.size}`; // const checkEndpoint = await createEndpoint(urlCheck); // const checkRes = await fetch(checkEndpoint); diff --git a/src/qortalRequests.ts b/src/qortalRequests.ts index f5dde0a..8747a7a 100644 --- a/src/qortalRequests.ts +++ b/src/qortalRequests.ts @@ -1,4 +1,4 @@ -import { banFromGroup, gateways, getApiKeyFromStorage } from "./background"; +import { banFromGroup, gateways, getApiKeyFromStorage, getNameInfoForOthers } from "./background"; import { addForeignServer, addGroupAdminRequest, addListItems, adminAction, banFromGroupRequest, buyNameRequest, cancelGroupBanRequest, cancelGroupInviteRequest, cancelSellNameRequest, cancelSellOrder, createBuyOrder, createGroupRequest, createPoll, createSellOrder, decryptAESGCMRequest, decryptData, decryptDataWithSharingKey, decryptQortalGroupData, deleteHostedData, deleteListItems, deployAt, encryptData, encryptDataWithSharingKey, encryptQortalGroupData, getArrrSyncStatus, getCrossChainServerInfo, getDaySummary, getForeignFee, getHostedData, getListItems, getNodeInfo, getNodeStatus, getServerConnectionHistory, getTxActivitySummary, getUserAccount, getUserWallet, getUserWalletInfo, getUserWalletTransactions, getWalletBalance, inviteToGroupRequest, joinGroup, kickFromGroupRequest, leaveGroupRequest, multiPaymentWithPrivateData, publishMultipleQDNResources, publishQDNResource, registerNameRequest, removeForeignServer, removeGroupAdminRequest, saveFile, sellNameRequest, sendChatMessage, sendCoin, setCurrentForeignServer, showPdfReader, signForeignFees, signTransaction, transferAssetRequest, updateForeignFee, updateGroupRequest, updateNameRequest, voteOnPoll } from "./qortalRequests/get"; export const listOfAllQortalRequests = [ @@ -89,6 +89,7 @@ import { addForeignServer, addGroupAdminRequest, addListItems, adminAction, banF 'BUY_NAME', 'MULTI_ASSET_PAYMENT_WITH_PRIVATE_DATA', 'TRANSFER_ASSET', 'SIGN_FOREIGN_FEES', + 'GET_PRIMARY_NAME', ] // Promisify chrome.storage.local.get @@ -943,7 +944,19 @@ chrome?.runtime?.onMessage.addListener((request, sender, sendResponse) => { }); break; } - + case "GET_PRIMARY_NAME": { + const data = request.payload; + + getNameInfoForOthers(data) + .then((res) => { + const resData = res ? res : null; + sendResponse(resData); + }) + .catch((error) => { + sendResponse({ error: error.message }); + }); + break; + } } } return true;