diff --git a/src/lib/components/account-header.svelte b/src/lib/components/account-header.svelte index 21d41143..c7f35353 100644 --- a/src/lib/components/account-header.svelte +++ b/src/lib/components/account-header.svelte @@ -128,31 +128,11 @@ {:else if usernames && usernames?.length > 0}
{#each usernames as username} - {#if username.type === "backpack"} -
-
- - - {username.username} - -
-
- {:else} -
- {username.username} -
- {/if} +
+ {username.username} +
{/each}
{/if} diff --git a/src/lib/components/search.svelte b/src/lib/components/search.svelte index dd5b1abe..256010cb 100644 --- a/src/lib/components/search.svelte +++ b/src/lib/components/search.svelte @@ -11,7 +11,6 @@ | "transaction" | "bonfida-domain" | "ans-domain" - | "backpack-username" | null; interface SearchResult { diff --git a/src/lib/components/transactions.svelte b/src/lib/components/transactions.svelte index 94c04ba0..0a18f588 100644 --- a/src/lib/components/transactions.svelte +++ b/src/lib/components/transactions.svelte @@ -32,15 +32,15 @@ }) => compressed ? client.cnftTransactions.createInfiniteQuery(input, { - getNextPageParam: (lastPage) => lastPage.oldest, - refetchOnMount: false, - refetchOnWindowFocus: false, - }) + getNextPageParam: (lastPage) => lastPage.oldest, + refetchOnMount: false, + refetchOnWindowFocus: false, + }) : client.transactions.createInfiniteQuery(input, { - getNextPageParam: (lastPage) => lastPage.oldest, - refetchOnMount: false, - refetchOnWindowFocus: false, - }); + getNextPageParam: (lastPage) => lastPage.oldest, + refetchOnMount: false, + refetchOnWindowFocus: false, + }); const loadMore = () => { $transactions.fetchNextPage(); diff --git a/src/lib/trpc/routes/account-usernames.ts b/src/lib/trpc/routes/account-usernames.ts index 1210ff96..ab12ec06 100644 --- a/src/lib/trpc/routes/account-usernames.ts +++ b/src/lib/trpc/routes/account-usernames.ts @@ -5,24 +5,10 @@ import { z } from "zod"; const { HELIUS_API_KEY } = process.env; interface Username { - type: "bonfida" | "backpack"; + type: "bonfida"; username: string; } -const getBackpackUsername = async (usernames: Username[], address = "") => { - const response = await fetch( - `https://xnft-api-server.xnfts.dev/v1/users/fromPubkey?publicKey=${address}&blockchain=solana` - ); - const data = await response.json(); - - if (data?.user?.username) { - usernames.push({ - type: "backpack", - username: data.user.username, - }); - } -}; - const getSolanaDomain = async (usernames: Username[], address = "") => { const url = `https://api.helius.xyz/v0/addresses/${address}/names?api-key=${HELIUS_API_KEY}`; const response = await fetch(url); @@ -50,7 +36,6 @@ export const accountUsernames = t.procedure ) .query(async ({ input: address }) => { const usernames: Username[] = []; - await getBackpackUsername(usernames, address); await getSolanaDomain(usernames, address); return usernames || []; diff --git a/src/lib/xray/lib/search.ts b/src/lib/xray/lib/search.ts index af738873..94b343a8 100644 --- a/src/lib/xray/lib/search.ts +++ b/src/lib/xray/lib/search.ts @@ -21,7 +21,6 @@ type SearchResultType = | "transaction" | "bonfida-domain" | "ans-domain" - | "backpack-username" | null; const searchDefaults: SearchResult = { @@ -52,7 +51,7 @@ export const search = async ( network = "mainnet"; } const isMainnetValue = network !== "devnet"; - const probablyBackpackName = query.startsWith("@") && query.length > 1; + if (isValidPublicKey(query)) { const pubkey = new PublicKey(query); const account = await connection.getParsedAccountInfo(pubkey); @@ -105,26 +104,6 @@ export const search = async ( } catch (error) { return searchDefaults; } - } else if (probablyBackpackName) { - const username = query?.slice(1)?.toLowerCase(); - - const url = `https://backpack-api.xnfts.dev/users/primarySolPubkey/${username}`; - - const response = await fetch(url); - - const { publicKey = "" } = await response.json(); - - if (!publicKey) { - return searchDefaults; - } - - return { - address: query || "", - search: query, - type: "backpack-username", - url: `/account/${publicKey}`, - valid: true, - }; } else if (probablyAnsDomain) { const owner = await ans.getOwnerFromDomainTld(query); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 1c1504f7..a5c5d3dd 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -161,14 +161,6 @@ >

🎒

- -
-

xNFT Backpack Support

-

- You can Lookup Backpack usernames by searching - "@yourname", like "@xray". -

-