Skip to content

Commit 0671a05

Browse files
committed
reorganize directories
1 parent 90affa8 commit 0671a05

File tree

13 files changed

+78
-44
lines changed

13 files changed

+78
-44
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
export * from "./address-lookup-table.js";
2+
export * from "./mint.js";
3+
export * from "./token-account.js";

packages/grill/src/hooks/use-mint-account.ts renamed to packages/grill/src/accounts/mint.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import type { Mint } from "@solana-program/token";
2-
import type { UseDecodedAccountHook } from "./create-decoded-account-hook.js";
3-
import type { UseDecodedAccountsHook } from "./create-decoded-accounts-hook.js";
2+
import type { UseDecodedAccountHook } from "../hooks/create-decoded-account-hook.js";
3+
import type { UseDecodedAccountsHook } from "../hooks/create-decoded-accounts-hook.js";
4+
import {
5+
createDecodedAccountHook,
6+
createDecodedAccountsHook,
7+
} from "@macalinao/grill";
48
import { getMintDecoder } from "@solana-program/token";
5-
import { createDecodedAccountHook } from "./create-decoded-account-hook.js";
6-
import { createDecodedAccountsHook } from "./create-decoded-accounts-hook.js";
79

810
/**
911
* Hook for fetching and decoding a mint account
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import type {
2+
UseDecodedAccountHook,
3+
UseDecodedAccountsHook,
4+
} from "@macalinao/grill";
5+
import type { Token } from "@solana-program/token";
6+
import {
7+
createDecodedAccountHook,
8+
createDecodedAccountsHook,
9+
} from "@macalinao/grill";
10+
import { getTokenDecoder } from "@solana-program/token";
11+
12+
export const useTokenAccount: UseDecodedAccountHook<Token> =
13+
createDecodedAccountHook<Token>(getTokenDecoder());
14+
15+
export const useTokenAccounts: UseDecodedAccountsHook<Token> =
16+
createDecodedAccountsHook<Token>(getTokenDecoder());

packages/grill/src/hooks/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ export * from "./create-pdas-hook.js";
55
export * from "./use-account.js";
66
export * from "./use-accounts.js";
77
export * from "./use-associated-token-account.js";
8-
export * from "./use-associated-token-pda.js";
98
export * from "./use-ata-balance.js";
109
export { useConnectedWallet } from "./use-connected-wallet.js";
1110
export { useKitWallet } from "./use-kit-wallet.js";
12-
export * from "./use-mint-account.js";
1311
export * from "./use-send-tx.js";
14-
export * from "./use-token-account.js";
1512
export * from "./use-token-balance.js";
1613
export * from "./use-token-info.js";
1714
export * from "./use-token-infos.js";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import type { Account, Address } from "@solana/kit";
22
import type { Token } from "@solana-program/token";
33
import type { UseQueryResult } from "@tanstack/react-query";
44
import { TOKEN_PROGRAM_ADDRESS } from "@solana-program/token";
5-
import { useAssociatedTokenPda } from "./use-associated-token-pda.js";
6-
import { useTokenAccount } from "./use-token-account.js";
5+
import { useTokenAccount } from "../accounts/token-account.js";
6+
import { useAssociatedTokenPda } from "../pdas/associated-token.js";
77

88
export interface UseAssociatedTokenAccountOptions {
99
/** The mint address of the token */

packages/grill/src/hooks/use-associated-token-pda.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

packages/grill/src/hooks/use-token-balance.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { TokenAmount } from "@macalinao/token-utils";
22
import type { Address } from "@solana/kit";
33
import { createTokenAmount } from "@macalinao/token-utils";
44
import { useMemo } from "react";
5-
import { useTokenAccount } from "./use-token-account.js";
5+
import { useTokenAccount } from "../accounts/token-account.js";
66
import { useTokenInfo } from "./use-token-info.js";
77

88
export interface UseTokenBalanceOptions {

packages/grill/src/hooks/use-token-info.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import type { Address } from "@solana/kit";
33
import type { UseQueryResult } from "@tanstack/react-query";
44
import { fetchTokenInfo } from "@macalinao/gill-extra";
55
import { useQuery } from "@tanstack/react-query";
6+
import { useMintAccount } from "../accounts/mint.js";
67
import { useGrillContext } from "../contexts/grill-context.js";
78
import { createTokenInfoQueryKey } from "../query-keys.js";
8-
import { useMintAccount } from "./use-mint-account.js";
99
import { useTokenMetadataAccount } from "./use-token-metadata-account.js";
1010

1111
export interface UseTokenInfoInput {

packages/grill/src/hooks/use-token-infos.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import type { TokenInfo } from "@macalinao/token-utils";
22
import type { Address } from "@solana/kit";
33
import { fetchTokenInfo } from "@macalinao/gill-extra";
44
import { useQueries } from "@tanstack/react-query";
5+
import { useMintAccounts } from "../accounts/mint.js";
56
import { useGrillContext } from "../contexts/grill-context.js";
67
import { createTokenInfoQueryKey } from "../query-keys.js";
7-
import { useMintAccounts } from "./use-mint-account.js";
88
import { useTokenMetadataAccounts } from "./use-token-metadata-account.js";
99

1010
export interface UseTokenInfosInput {

0 commit comments

Comments
 (0)