Skip to content

Commit a115c22

Browse files
authored
Merge pull request #91 from macalinao/igm/improve-token
Add helpers for TokenAmount
2 parents 83fe826 + ceff137 commit a115c22

File tree

4 files changed

+25
-2
lines changed

4 files changed

+25
-2
lines changed

.changeset/fuzzy-memes-guess.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@macalinao/react-quarry": patch
3+
---
4+
5+
Allow specifying custom loading state for merge miner provider

.changeset/smart-pans-spend.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@macalinao/token-utils": patch
3+
---
4+
5+
Add toNumber helper for TokenAmount

packages/react-quarry/src/providers/merge-miner-provider.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { useMergePoolPda } from "../pdas/merge-pool.js";
99

1010
interface Props {
1111
children?: React.ReactNode;
12+
loading?: React.ReactNode;
1213
}
1314

1415
/**
@@ -17,7 +18,10 @@ interface Props {
1718
* @param param0
1819
* @returns
1920
*/
20-
export const MergeMinerProvider: React.FC<Props> = ({ children }: Props) => {
21+
export const MergeMinerProvider: React.FC<Props> = ({
22+
children,
23+
loading,
24+
}: Props) => {
2125
const poolInfo = usePoolInfo();
2226
const { signer } = useKitWallet();
2327
const mergePoolAddress = useMergePoolPda({
@@ -48,7 +52,7 @@ export const MergeMinerProvider: React.FC<Props> = ({ children }: Props) => {
4852
!(mergePoolAddress && mergePoolAccount) ||
4953
mergeMinerAddress === undefined
5054
) {
51-
return <div>Loading...</div>;
55+
return loading ?? <div>Loading...</div>;
5256
}
5357

5458
// Get balance from merge miner account, default to 0

packages/token-utils/src/tmath.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,3 +189,12 @@ export function toRaw<TMint extends string, TDecimals extends number>(
189189
): bigint {
190190
return tokenAmountToBigInt(amount);
191191
}
192+
193+
/**
194+
* Converts a TokenAmount to a number.
195+
* @param amount
196+
* @returns
197+
*/
198+
export function toNumber(amount: TokenAmount): number {
199+
return dn.toNumber(amount.amount);
200+
}

0 commit comments

Comments
 (0)