feat(page): final hook up

fakenickels · Dec 5, 2021 · 8ca53e9 · 8ca53e9
1 parent 8c031d0
commit 8ca53e9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/pages/kittens-hd.tsx b/pages/kittens-hd.tsx
@@ -287,11 +287,8 @@ export default function KittensHD() {
  })
  .catch((e) => {
  toast.dismiss();
- toast.error(
- `Error claiming ${Number(
- rkittenClaim.getLeaf().amount
- )} kittens: ${e.message}`
- );
+ console.log(e);
+ toast.error(`${e.data?.message || e.message}`);
  });
  }}
  disabled={!Boolean(rkittenClaim.getLeaf())}

diff --git a/src/utils/useKittensHdMinter.ts b/src/utils/useKittensHdMinter.ts
@@ -29,10 +29,14 @@ export const useKittenHDMinterMethods = () => {
  const wallet = useWallet();
 
  const claimKittens = async (quantity: number | string) => {
- return contract.current.claim(quantity).send({
- from: wallet?.account as string,
- value: getCostPerKittenByQuantity(Number(quantity)).mul(quantity),
- });
+ return contract.current
+ .claim(quantity, {
+ from: wallet?.account as string,
+ value: getCostPerKittenByQuantity(Number(quantity)).mul(quantity),
+ })
+ .then((res: any) => {
+ return res.wait();
+ });
  };
 
  return {

diff --git a/src/utils/useRKittenClaim.tsx b/src/utils/useRKittenClaim.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import { useWallet } from "use-wallet";
 import * as ethers from "ethers";
-import KittensHDMinter from "../../artifacts/contracts/KittensHDPublicMinter.sol/KittensHDPublicMinter.json";
 import rKittenMerkleRootSnaptshot from "../../airdrop/kittens-hd-rkitten-airdrop/merkle-root.json";
+import MerkleDistributor from "../../artifacts/contracts/KittenHDRKittenMerkleDistributor.sol/KittenHDRKittenMerkleDistributor.json";
 
 export const useWeb3 = () => {
  const provider: React.MutableRefObject<
@@ -15,7 +15,7 @@ export const useWeb3 = () => {
  const signer = provider.current.getSigner();
  contract.current = new ethers.Contract(
  process.env.NEXT_PUBLIC_KITTENS_MERKLE_DISTRIBUTOR_ADDRESS as string,
- KittensHDMinter.abi as any,
+ MerkleDistributor.abi as any,
  signer
  );
  });
@@ -29,14 +29,16 @@ export const useRKittenClaim = () => {
  const wallet = useWallet();
 
  const claimKittens = async () => {
- const proof: {
+ const leaf: {
  index: number;
  amount: string;
  proof: string[];
  } = (rKittenMerkleRootSnaptshot as any).claims[wallet?.account as string];
- return contract.current.claim(Number(proof.amount), {
- from: wallet?.account as string,
- });
+ return contract.current
+ .claim(leaf.index, Number(leaf.amount), leaf.proof)
+ .then((res: any) => {
+ return res.wait();
+ });
  };
 
  // check if wallet.address is in the rKittenMerkleRootSnaptshot