Merge pull request #75 from macalinao/igm/react-quarry-fixes

React quarry various fixes

Author: macalinao

.changeset/flat-clocks-prove.md

@@ -0,0 +1,5 @@
+---
+"@macalinao/react-quarry": patch
+---
+
+Fix peer dep

.changeset/lazy-parents-occur.md

@@ -0,0 +1,5 @@
+---
+"@macalinao/react-quarry": minor
+---
+
+rename balance -> blanceRaw, expose mergeMinerAddress

bun.lock

@@ -167,18 +167,19 @@
       "name": "@macalinao/react-quarry",
       "version": "0.0.11",
       "dependencies": {
-        "@macalinao/grill": "workspace:*",
         "@macalinao/quarry": "workspace:*",
       },
       "devDependencies": {
         "@macalinao/eslint-config-react": "^5.0.2",
+        "@macalinao/grill": "workspace:*",
         "@macalinao/tsconfig": "catalog:",
         "@solana/kit": "catalog:",
         "@types/bun": "catalog:",
         "@types/react": "catalog:",
         "typescript": "catalog:",
       },
       "peerDependencies": {
+        "@macalinao/grill": "workspace:*",
         "@solana/kit": "catalog:",
         "react": "^18 || ^19",
       },

packages/react-quarry/package.json

@@ -54,14 +54,15 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@macalinao/grill": "workspace:*",
     "@macalinao/quarry": "workspace:*"
   },
   "peerDependencies": {
+    "@macalinao/grill": "workspace:*",
     "@solana/kit": "catalog:",
     "react": "^18 || ^19"
   },
   "devDependencies": {
+    "@macalinao/grill": "workspace:*",
     "@macalinao/eslint-config-react": "^5.0.2",
     "@macalinao/tsconfig": "catalog:",
     "@solana/kit": "catalog:",

packages/react-quarry/src/contexts/merge-miner.ts

@@ -5,8 +5,13 @@ import { createContext, useContext } from "react";
 export interface MergeMinerContextValue {
   mergePool: MergePool;
   mergePoolAddress: Address;
+  mergeMinerAddress: Address | null;
   userAddress: Address | null;
-  balance: bigint;
+  /**
+   * Null = doesn't exist (balance is effectively)
+   * Undefined = loading
+   */
+  balanceRaw: bigint | null | undefined;
 }
 
 export const MergeMinerContext: React.Context<MergeMinerContextValue | null> =

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

@@ -38,20 +38,26 @@ export const MergeMinerProvider: React.FC<Props> = ({ children }: Props) => {
   });
 
   // TODO(igm): probably want to create a proper loading state here
-  if (!(mergePoolAddress && mergePoolAccount)) {
+  if (
+    !(mergePoolAddress && mergePoolAccount) ||
+    mergeMinerAddress === undefined
+  ) {
     return <div>Loading...</div>;
   }
 
   // Get balance from merge miner account, default to 0
-  const balance = mergeMinerAccount?.data.primaryBalance ?? 0n;
+  const balanceRaw = mergeMinerAccount
+    ? mergeMinerAccount.data.primaryBalance
+    : mergeMinerAccount;
 
   return (
     <MergeMinerContext.Provider
       value={{
         mergePool: mergePoolAccount.data,
         mergePoolAddress,
+        mergeMinerAddress,
         userAddress: signer?.address ?? null,
-        balance,
+        balanceRaw,
       }}
     >
       {children}