From 91132534218fe055dd183fa3d0398ee21365645b Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 16:31:30 +0800 Subject: [PATCH 1/4] Allow specifying loading placeholder for merge miner provider --- .../react-quarry/src/providers/merge-miner-provider.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/react-quarry/src/providers/merge-miner-provider.tsx b/packages/react-quarry/src/providers/merge-miner-provider.tsx index ca70c75..60abf8d 100644 --- a/packages/react-quarry/src/providers/merge-miner-provider.tsx +++ b/packages/react-quarry/src/providers/merge-miner-provider.tsx @@ -9,6 +9,7 @@ import { useMergePoolPda } from "../pdas/merge-pool.js"; interface Props { children?: React.ReactNode; + loading?: React.ReactNode; } /** @@ -17,7 +18,10 @@ interface Props { * @param param0 * @returns */ -export const MergeMinerProvider: React.FC = ({ children }: Props) => { +export const MergeMinerProvider: React.FC = ({ + children, + loading, +}: Props) => { const poolInfo = usePoolInfo(); const { signer } = useKitWallet(); const mergePoolAddress = useMergePoolPda({ @@ -48,7 +52,7 @@ export const MergeMinerProvider: React.FC = ({ children }: Props) => { !(mergePoolAddress && mergePoolAccount) || mergeMinerAddress === undefined ) { - return
Loading...
; + return loading ??
Loading...
; } // Get balance from merge miner account, default to 0 From d8f999b810951a84a8be50616ba6d1d8a1fa789a Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 16:32:12 +0800 Subject: [PATCH 2/4] docs(changeset): Allow specifying custom loading state for merge miner provider --- .changeset/fuzzy-memes-guess.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/fuzzy-memes-guess.md diff --git a/.changeset/fuzzy-memes-guess.md b/.changeset/fuzzy-memes-guess.md new file mode 100644 index 0000000..85b5392 --- /dev/null +++ b/.changeset/fuzzy-memes-guess.md @@ -0,0 +1,5 @@ +--- +"@macalinao/react-quarry": patch +--- + +Allow specifying custom loading state for merge miner provider From 0af86edf57b13358a9a696282df9e3bd556dae47 Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 16:33:30 +0800 Subject: [PATCH 3/4] add toNumber helper --- packages/token-utils/src/tmath.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/token-utils/src/tmath.ts b/packages/token-utils/src/tmath.ts index 07e8b8b..616ae9a 100644 --- a/packages/token-utils/src/tmath.ts +++ b/packages/token-utils/src/tmath.ts @@ -189,3 +189,12 @@ export function toRaw( ): bigint { return tokenAmountToBigInt(amount); } + +/** + * Converts a TokenAmount to a number. + * @param amount + * @returns + */ +export function toNumber(amount: TokenAmount): number { + return dn.toNumber(amount.amount); +} From ceff137c667fc7f8e29ae314524ddba79b14cb77 Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 16:33:42 +0800 Subject: [PATCH 4/4] docs(changeset): Add toNumber helper for TokenAmount --- .changeset/smart-pans-spend.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/smart-pans-spend.md diff --git a/.changeset/smart-pans-spend.md b/.changeset/smart-pans-spend.md new file mode 100644 index 0000000..e6ac79e --- /dev/null +++ b/.changeset/smart-pans-spend.md @@ -0,0 +1,5 @@ +--- +"@macalinao/token-utils": patch +--- + +Add toNumber helper for TokenAmount