Skip to content

Commit ee675fc

Browse files
authored
Merge pull request #81 from macalinao/igm/fixes
PDA hook null input fix
2 parents bdc8a33 + a24905b commit ee675fc

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.changeset/dark-insects-join.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@macalinao/grill": patch
3+
---
4+
5+
Make PDA null if PDA hook is null

packages/grill/src/hooks/pda-query-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function createPdaQuery<TArgs, TResult>(
1919
const [pda] = await pdaFn(args);
2020
return pda;
2121
},
22-
enabled: !!args,
22+
enabled: args !== undefined,
2323
// PDAs are deterministic, so we can cache them indefinitely
2424
staleTime: Number.POSITIVE_INFINITY,
2525
gcTime: Number.POSITIVE_INFINITY,

packages/grill/src/hooks/use-token-metadata-account.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@ import type { UseAccountsResult } from "./use-accounts.js";
55
import {
66
findMetadataPda,
77
getMetadataDecoder,
8+
TOKEN_METADATA_PROGRAM_ADDRESS,
89
} from "@macalinao/clients-token-metadata";
910
import { createDecodedAccountHook } from "./create-decoded-account-hook.js";
1011
import { createDecodedAccountsHook } from "./create-decoded-accounts-hook.js";
1112
import { createPdaHook } from "./create-pda-hook.js";
1213
import { createPdasHook } from "./create-pdas-hook.js";
1314

14-
const TOKEN_METADATA_PROGRAM_ID =
15-
"metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s" as Address;
16-
1715
export const useTokenMetadataPda = createPdaHook(
1816
async ({ mint }: { mint: Address }) => {
1917
const pda = await findMetadataPda({
20-
programId: TOKEN_METADATA_PROGRAM_ID,
18+
programId: TOKEN_METADATA_PROGRAM_ADDRESS,
2119
mint,
2220
});
2321
return pda;
@@ -28,7 +26,7 @@ export const useTokenMetadataPda = createPdaHook(
2826
export const useTokenMetadataPdas = createPdasHook(
2927
async ({ mint }: { mint: Address }) => {
3028
const pda = await findMetadataPda({
31-
programId: TOKEN_METADATA_PROGRAM_ID,
29+
programId: TOKEN_METADATA_PROGRAM_ADDRESS,
3230
mint,
3331
});
3432
return pda;

0 commit comments

Comments
 (0)