diff --git a/src/background.ts b/src/background.ts index 6c1f5b6..b9b0d68 100644 --- a/src/background.ts +++ b/src/background.ts @@ -795,26 +795,28 @@ 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 9628394..94ce650 100644 --- a/src/backgroundFunctions/encryption.ts +++ b/src/backgroundFunctions/encryption.ts @@ -47,18 +47,19 @@ 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 ''; } } + export async function getAllUserNames() { const wallet = await getSaveWallet(); diff --git a/src/components/Apps/useQortalMessageListener.tsx b/src/components/Apps/useQortalMessageListener.tsx index 6dedd6d..59b1283 100644 --- a/src/components/Apps/useQortalMessageListener.tsx +++ b/src/components/Apps/useQortalMessageListener.tsx @@ -352,6 +352,7 @@ export function openIndexedDB() { 'BUY_NAME', 'MULTI_ASSET_PAYMENT_WITH_PRIVATE_DATA', 'TRANSFER_ASSET', 'SIGN_FOREIGN_FEES', + 'GET_PRIMARY_NAME', ] @@ -370,6 +371,7 @@ const UIQortalRequests = [ 'BUY_NAME', 'MULTI_ASSET_PAYMENT_WITH_PRIVATE_DATA', 'TRANSFER_ASSET', 'SIGN_FOREIGN_FEES', + 'GET_PRIMARY_NAME', ]; diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx index c60df16..2a59b27 100644 --- a/src/components/Group/Group.tsx +++ b/src/components/Group/Group.tsx @@ -330,16 +330,17 @@ 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 ''; } } + export const getGroupAdmins = async (groupNumber: number) => { // const validApi = await findUsableApi(); diff --git a/src/components/Minting/Minting.tsx b/src/components/Minting/Minting.tsx index 5b7c922..9291c4c 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 41f781b..4934083 100644 --- a/src/qdn/publish/pubish.ts +++ b/src/qdn/publish/pubish.ts @@ -316,7 +316,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 8bf5a52..8f0df53 100644 --- a/src/qortalRequests.ts +++ b/src/qortalRequests.ts @@ -1,4 +1,4 @@ -import { gateways, getApiKeyFromStorage } from "./background"; +import { gateways, getApiKeyFromStorage, getNameInfoForOthers } from "./background"; import { listOfAllQortalRequests } from "./components/Apps/useQortalMessageListener"; import { addForeignServer, addGroupAdminRequest, addListItems, adminAction, banFromGroupRequest, buyNameRequest, cancelGroupBanRequest, cancelGroupInviteRequest, cancelSellNameRequest, cancelSellOrder, createAndCopyEmbedLink, createBuyOrder, createGroupRequest, createPoll, 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, openNewTab, publishMultipleQDNResources, publishQDNResource, registerNameRequest, removeForeignServer, removeGroupAdminRequest, saveFile, sellNameRequest, sendChatMessage, sendCoin, setCurrentForeignServer, signForeignFees, signTransaction, transferAssetRequest, updateForeignFee, updateGroupRequest, updateNameRequest, voteOnPoll } from "./qortalRequests/get"; import { getData, storeData } from "./utils/chromeStorage"; @@ -1346,6 +1346,32 @@ export const isRunningGateway = async ()=> { } break; } + case 'GET_PRIMARY_NAME': { + try { + const res = await getNameInfoForOthers(request.payload?.address); + const resData = res ? res : null; + event.source.postMessage( + { + requestId: request.requestId, + action: request.action, + payload: resData, + 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; }