Skip to content

Commit 5478440

Browse files
committed
refactor(components): update createExtraContent and claim buttons
Changes include: - Modify createExtraContent to use object parameter - Remove unnecessary console.log
1 parent 0b5088f commit 5478440

File tree

4 files changed

+35
-29
lines changed

4 files changed

+35
-29
lines changed

components/global/extra-content.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ import { Button } from "@/components/ui/button";
22
import type { Chain, TransactionReceipt } from "viem";
33
import { generateBlockExplorerLink } from "@/lib/utils";
44

5-
export const createExtraContent = (
6-
receipt: TransactionReceipt,
7-
hypercertId?: string,
8-
chain?: Chain,
9-
) => {
5+
export const createExtraContent = ({
6+
receipt,
7+
hypercertId,
8+
chain,
9+
}: {
10+
receipt: TransactionReceipt;
11+
hypercertId?: string;
12+
chain: Chain;
13+
}) => {
1014
const receiptButton = receipt && (
1115
<>
1216
<a

components/profile/unclaimed-hypercert-butchClaim-button.tsx

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { useState } from "react";
1212
import { Hex, ByteArray, getAddress } from "viem";
1313
import { errorToast } from "@/lib/errorToast";
1414
import { ChainFactory } from "@/lib/chainFactory";
15+
import { createExtraContent } from "../global/extra-content";
1516

1617
interface TransformedClaimData {
1718
hypercertTokenIds: bigint[];
@@ -43,7 +44,7 @@ export default function UnclaimedHypercertBatchClaimButton({
4344
const account = useAccount();
4445
const { refresh } = useRouter();
4546
const [isLoading, setIsLoading] = useState(false);
46-
const { setDialogStep, setSteps, setOpen, setTitle } =
47+
const { setDialogStep, setSteps, setOpen, setTitle, setExtraContent } =
4748
useStepProcessDialogContext();
4849
const { switchChain } = useSwitchChain();
4950

@@ -73,12 +74,10 @@ export default function UnclaimedHypercertBatchClaimButton({
7374

7475
const claimData = transformAllowListRecords(allowListRecords);
7576
await setDialogStep("preparing, active");
76-
console.log(allowListRecords);
7777
try {
7878
await setDialogStep("claiming", "active");
7979

8080
const tx = await client.batchClaimFractionsFromAllowlists(claimData);
81-
console.log(tx);
8281
if (!tx) {
8382
await setDialogStep("claiming", "error");
8483
throw new Error("Failed to claim fractions");
@@ -89,39 +88,43 @@ export default function UnclaimedHypercertBatchClaimButton({
8988
});
9089
if (receipt.status == "success") {
9190
await setDialogStep("done", "completed");
91+
const extraContent = createExtraContent({
92+
receipt,
93+
chain: account?.chain!,
94+
});
95+
setExtraContent(extraContent);
9296
await revalidatePathServerAction([
9397
`/profile/${account.address}?tab=hypercerts-claimable`,
9498
`/profile/${account.address}?tab=hypercerts-owned`,
9599
]);
96100
} else if (receipt.status == "reverted") {
97101
await setDialogStep("confirming", "error", "Transaction reverted");
98102
}
99-
console.log({ receipt });
100103
setTimeout(() => {
101104
refresh();
102105
}, 5000);
103106
} catch (error) {
104107
console.error(error);
105108
} finally {
106109
setIsLoading(false);
107-
setOpen(false);
108110
}
109111
};
112+
113+
const isBatchClaimDisabled =
114+
isLoading ||
115+
!allowListRecords.length ||
116+
!account ||
117+
!client ||
118+
account.address !== getAddress(allowListRecords[0].user_address as string);
119+
110120
return (
111121
<>
112122
{account.chainId === selectedChainId ? (
113123
<Button
114124
variant={"default"}
115125
size={"sm"}
116126
onClick={claimHypercert}
117-
disabled={
118-
isLoading ||
119-
!allowListRecords.length ||
120-
!account ||
121-
!client ||
122-
account.address !==
123-
getAddress(allowListRecords[0].user_address as string)
124-
}
127+
disabled={isBatchClaimDisabled}
125128
>
126129
Claim Selected
127130
</Button>

components/profile/unclaimed-hypercert-claim-button.tsx

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ export default function UnclaimedHypercertClaimButton({
6363
}
6464
await setDialogStep("preparing, active");
6565

66-
console.log(allowListRecord);
67-
6866
try {
6967
await setDialogStep("claiming", "active");
7068
const tx = await client.mintClaimFractionFromAllowlist(
@@ -73,7 +71,6 @@ export default function UnclaimedHypercertClaimButton({
7371
selectedHypercert?.proof as `0x${string}`[],
7472
undefined,
7573
);
76-
console.log(tx);
7774

7875
if (!tx) {
7976
await setDialogStep("claiming", "error");
@@ -87,11 +84,11 @@ export default function UnclaimedHypercertClaimButton({
8784

8885
if (receipt.status == "success") {
8986
await setDialogStep("route", "active");
90-
const extraContent = createExtraContent(
91-
receipt,
92-
selectedHypercert?.hypercert_id!,
93-
account.chain,
94-
);
87+
const extraContent = createExtraContent({
88+
receipt: receipt,
89+
hypercertId: selectedHypercert?.hypercert_id!,
90+
chain: account.chain!,
91+
});
9592
setExtraContent(extraContent);
9693
await setDialogStep("done", "completed");
9794
await revalidatePathServerAction([
@@ -102,15 +99,13 @@ export default function UnclaimedHypercertClaimButton({
10299
} else if (receipt.status == "reverted") {
103100
await setDialogStep("confirming", "error", "Transaction reverted");
104101
}
105-
console.log({ receipt });
106102
setTimeout(() => {
107103
refresh();
108104
}, 5000);
109105
} catch (error) {
110106
console.error(error);
111107
} finally {
112108
setIsLoading(false);
113-
setOpen(false);
114109
}
115110
};
116111

hypercerts/hooks/useMintHypercert.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ export const useMintHypercert = () => {
8787
);
8888
}
8989

90-
const extraContent = createExtraContent(receipt, hypercertId, chain);
90+
const extraContent = createExtraContent({
91+
receipt,
92+
hypercertId,
93+
chain: chain!,
94+
});
9195
setExtraContent(extraContent);
9296

9397
await setDialogStep("done", "completed");

0 commit comments

Comments
 (0)