Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fuzzy-memes-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@macalinao/react-quarry": patch
---

Allow specifying custom loading state for merge miner provider
5 changes: 5 additions & 0 deletions .changeset/smart-pans-spend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@macalinao/token-utils": patch
---

Add toNumber helper for TokenAmount
8 changes: 6 additions & 2 deletions packages/react-quarry/src/providers/merge-miner-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { useMergePoolPda } from "../pdas/merge-pool.js";

interface Props {
children?: React.ReactNode;
loading?: React.ReactNode;
}

/**
Expand All @@ -17,7 +18,10 @@ interface Props {
* @param param0
* @returns
*/
export const MergeMinerProvider: React.FC<Props> = ({ children }: Props) => {
export const MergeMinerProvider: React.FC<Props> = ({
children,
loading,
}: Props) => {
const poolInfo = usePoolInfo();
const { signer } = useKitWallet();
const mergePoolAddress = useMergePoolPda({
Expand Down Expand Up @@ -48,7 +52,7 @@ export const MergeMinerProvider: React.FC<Props> = ({ children }: Props) => {
!(mergePoolAddress && mergePoolAccount) ||
mergeMinerAddress === undefined
) {
return <div>Loading...</div>;
return loading ?? <div>Loading...</div>;
}

// Get balance from merge miner account, default to 0
Expand Down
9 changes: 9 additions & 0 deletions packages/token-utils/src/tmath.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,12 @@ export function toRaw<TMint extends string, TDecimals extends number>(
): bigint {
return tokenAmountToBigInt(amount);
}

/**
* Converts a TokenAmount to a number.
* @param amount
* @returns
*/
export function toNumber(amount: TokenAmount): number {
return dn.toNumber(amount.amount);
}