Skip to content

Commit 61edd0e

Browse files
committed
fix
1 parent f6ab2fd commit 61edd0e

File tree

2 files changed

+27
-31
lines changed
  • apps/dashboard/src
    • @/contexts
    • app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/rewards

2 files changed

+27
-31
lines changed

apps/dashboard/src/@/contexts/error-handler.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
"use client";
2-
32
import { CircleAlertIcon, InfoIcon } from "lucide-react";
43
import Link from "next/link";
54
import { createContext, useCallback, useContext, useState } from "react";

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/rewards/page.tsx

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,24 @@ export default async function Page(props: {
2828
notFound();
2929
}
3030

31-
const assetContractClient = info.clientContract;
31+
const chain = info.clientContract.chain;
32+
const assetContractServer = info.serverContract;
33+
const serverClient = assetContractServer.client;
3234

33-
const { address } = await getDeployedEntrypointERC20({
34-
chain: assetContractClient.chain,
35-
client: assetContractClient.client,
36-
});
37-
38-
const entrypointContractClient = getContract({
39-
address,
40-
chain: assetContractClient.chain,
41-
client: assetContractClient.client,
42-
});
35+
const { address: entrypointContractAddress } =
36+
await getDeployedEntrypointERC20({
37+
chain,
38+
client: serverClient,
39+
});
4340

41+
// Note: must use server contract/client here
4442
const reward = await getValidReward({
45-
assetContract: assetContractClient,
46-
entrypointContract: entrypointContractClient,
43+
assetContract: assetContractServer,
44+
entrypointContract: getContract({
45+
address: entrypointContractAddress,
46+
chain,
47+
client: serverClient,
48+
}),
4749
});
4850

4951
if (!reward) {
@@ -52,32 +54,27 @@ export default async function Page(props: {
5254
);
5355
}
5456

55-
const v3PositionManagerContract = getContract({
56-
address: reward.positionManager,
57-
chain: assetContractClient.chain,
58-
client: assetContractClient.client,
59-
});
60-
57+
// Note: must use server contract/client here
6158
const unclaimedFees = await getUnclaimedFees({
62-
positionManager: v3PositionManagerContract,
59+
positionManager: getContract({
60+
address: reward.positionManager,
61+
chain,
62+
client: serverClient,
63+
}),
6364
reward: {
6465
tokenId: reward.positionId,
6566
recipient: reward.recipient,
6667
},
6768
});
6869

69-
console.error("DEBUG", {
70-
assetContractClient,
71-
entrypointContractClient,
72-
reward,
73-
unclaimedFees,
74-
chainSlug: info.chainMetadata.slug,
75-
});
76-
7770
return (
7871
<ClaimRewardsPage
79-
assetContractClient={assetContractClient}
80-
entrypointContractClient={entrypointContractClient}
72+
assetContractClient={info.clientContract}
73+
entrypointContractClient={getContract({
74+
address: entrypointContractAddress,
75+
chain: chain,
76+
client: info.clientContract.client,
77+
})}
8178
reward={reward}
8279
unclaimedFees={unclaimedFees}
8380
chainSlug={info.chainMetadata.slug}

0 commit comments

Comments
 (0)