Cleanup token util

cartridge-gg · Dec 23, 2024 · 07216e9 · 07216e9
1 parent c26d8f8
commit 07216e9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 143 deletions.
diff --git a/packages/keychain/src/components/ConfirmTransaction.stories.tsx b/packages/keychain/src/components/ConfirmTransaction.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from "@storybook/react";
 
 import { ConfirmTransaction } from "./ConfirmTransaction";
-import { ETH_CONTRACT_ADDRESS } from "../utils/token";
+import { ETH_CONTRACT_ADDRESS } from "@cartridge/utils";
 
 const meta = {
   component: ConfirmTransaction,

diff --git a/packages/keychain/src/components/Funding/DepositEth.tsx b/packages/keychain/src/components/Funding/DepositEth.tsx
@@ -27,13 +27,13 @@ import {
 } from "@cartridge/ui-next";
 import { useConnection } from "@/hooks/connection";
 import { useToast } from "@/hooks/toast";
-import { ETH_CONTRACT_ADDRESS } from "@/utils/token";
 import { ErrorAlert } from "../ErrorAlert";
 import { CopyAddress } from "@/components/CopyAddress";
 import { parseEther } from "viem";
 import { AmountSelection, DEFAULT_AMOUNT } from "./AmountSelection";
 import { Balance } from "./Balance";
 import { TokenPair, usePriceQuery } from "@cartridge/utils/api/cartridge";
+import { ETH_CONTRACT_ADDRESS } from "@cartridge/utils";
 
 type DepositEthProps = {
   onComplete?: (deployHash?: string) => void;

diff --git a/packages/keychain/src/hooks/connection.ts b/packages/keychain/src/hooks/connection.ts
@@ -6,14 +6,13 @@ import {
   ConnectionCtx,
   OpenSettingsCtx,
 } from "@/utils/connection";
-import { getChainName, isIframe } from "@cartridge/utils";
-import { RpcProvider } from "starknet";
+import { ETH_CONTRACT_ADDRESS, getChainName, isIframe } from "@cartridge/utils";
+import { getChecksumAddress, RpcProvider } from "starknet";
 import {
   Prefund,
   ResponseCodes,
   toSessionPolicies,
 } from "@cartridge/controller";
-import { mergeDefaultETHPrefund } from "@/utils/token";
 import { setIsSignedUp } from "@/utils/cookie";
 import {
   ConnectionContext,
@@ -122,7 +121,18 @@ export function useConnectionValue() {
       ? JSON.parse(decodeURIComponent(prefundParam))
       : [];
     setHasPrefundRequest(!!prefundParam);
-    setPrefunds(mergeDefaultETHPrefund(prefunds));
+    setPrefunds(
+      prefunds.find(
+        (p) =>
+          getChecksumAddress(p.address) ===
+          getChecksumAddress(ETH_CONTRACT_ADDRESS),
+      )
+        ? prefunds
+        : [
+            { address: ETH_CONTRACT_ADDRESS, min: "100000000000000" },
+            ...prefunds,
+          ],
+    );
 
     // Handle theme and policies
     const policiesParam = urlParams.get("policies");

diff --git a/packages/keychain/src/utils/token.tsx b/packages/keychain/src/utils/token.tsx