From d90d06c207eaaee634139a7606c0f5ec1068202b Mon Sep 17 00:00:00 2001
From: Tarrence van As <tarrence@vanas.family>
Date: Tue, 10 Dec 2024 17:05:28 -0500
Subject: [PATCH] Cleanup some stuff

---
 .../src/components/DeployController.tsx       | 12 +++++-----
 .../keychain/src/components/ErrorAlert.tsx    | 22 ++++++-------------
 .../keychain/src/components/Transaction.tsx   |  5 +++--
 packages/keychain/src/hooks/connection.ts     |  2 --
 packages/keychain/src/utils/cookie.ts         | 11 ----------
 5 files changed, 15 insertions(+), 37 deletions(-)
 delete mode 100644 packages/keychain/src/utils/cookie.ts

diff --git a/packages/keychain/src/components/DeployController.tsx b/packages/keychain/src/components/DeployController.tsx
index fae8f4311..223c2df49 100644
--- a/packages/keychain/src/components/DeployController.tsx
+++ b/packages/keychain/src/components/DeployController.tsx
@@ -15,6 +15,7 @@ import { Fees } from "./Fees";
 import { ControllerError } from "utils/connection";
 import { Policies } from "components/Policies";
 import { ETH_CONTRACT_ADDRESS, useERC20Balance } from "@cartridge/utils";
+import { useExplorer } from "@starknet-react/core";
 
 export function DeployController({
   onClose,
@@ -236,6 +237,8 @@ function ExplorerLink({
   txHash: string;
   chainId: string;
 }) {
+  const explorer = useExplorer();
+
   if (
     ![
       constants.StarknetChainId.SN_SEPOLIA,
@@ -246,12 +249,7 @@ function ExplorerLink({
   }
 
   return (
-    <Link
-      href={`https://${
-        chainId === constants.StarknetChainId.SN_SEPOLIA ? "sepolia." : ""
-      }starkscan.co/tx/${txHash}`}
-      isExternal
-    >
+    <Link href={explorer.transaction(txHash)} isExternal>
       <Button
         variant="goast"
         mt={10}
@@ -261,7 +259,7 @@ function ExplorerLink({
         fontSize="sm"
         fontFamily="Inter"
       >
-        View on Starkscan
+        View on Explorer
       </Button>
     </Link>
   );
diff --git a/packages/keychain/src/components/ErrorAlert.tsx b/packages/keychain/src/components/ErrorAlert.tsx
index c9f26529c..5ce8a66f1 100644
--- a/packages/keychain/src/components/ErrorAlert.tsx
+++ b/packages/keychain/src/components/ErrorAlert.tsx
@@ -28,6 +28,7 @@ import { useConnection } from "hooks/connection";
 import { constants } from "starknet";
 import { parseExecutionError, parseValidationError } from "utils/errors";
 import { formatAddress } from "@cartridge/utils";
+import { useExplorer } from "@starknet-react/core";
 
 export function ErrorAlert({
   title,
@@ -336,17 +337,7 @@ function StackTraceDisplay({
   stackTrace: ReturnType<typeof parseExecutionError>["stack"];
 }) {
   const { chainId } = useConnection();
-
-  const getExplorerUrl = (type: "contract" | "class", value: string) => {
-    if (!chainId) return;
-
-    const baseUrl = {
-      [constants.StarknetChainId.SN_SEPOLIA]: "https://sepolia.starkscan.co",
-      [constants.StarknetChainId.SN_MAIN]: "https://starkscan.co",
-    }[chainId];
-
-    return baseUrl ? `${baseUrl}/${type}/${value}` : undefined;
-  };
+  const explorer = useExplorer();
 
   const isExternalLink = [
     constants.StarknetChainId.SN_SEPOLIA,
@@ -377,10 +368,11 @@ function StackTraceDisplay({
                     </Text>
                     {key === "address" || key === "class" ? (
                       <Link
-                        href={getExplorerUrl(
-                          key === "address" ? "contract" : "class",
-                          value as string,
-                        )}
+                        href={
+                          key === "address"
+                            ? explorer.contract(value as string)
+                            : explorer.class(value as string)
+                        }
                         isExternal={isExternalLink}
                         wordBreak="break-all"
                         textAlign="left"
diff --git a/packages/keychain/src/components/Transaction.tsx b/packages/keychain/src/components/Transaction.tsx
index 5629680a1..e309a9f18 100644
--- a/packages/keychain/src/components/Transaction.tsx
+++ b/packages/keychain/src/components/Transaction.tsx
@@ -13,7 +13,7 @@ import { constants } from "starknet";
 import { CheckIcon, ExternalIcon, StarknetIcon } from "@cartridge/ui";
 import { useController } from "hooks/controller";
 import { useChainName } from "hooks/chain";
-import { StarkscanUrl } from "@cartridge/utils";
+import { useExplorer } from "@starknet-react/core";
 
 export type TransactionState = "pending" | "success" | "error";
 
@@ -30,6 +30,7 @@ export function Transaction({
   hash,
   finalized,
 }: TransactionProps) {
+  const explorer = useExplorer();
   const [state, setState] = useState<TransactionState>("pending");
   const { color, icon } = useMemo(() => getColorIcon(state), [state]);
   const { controller } = useController();
@@ -78,7 +79,7 @@ export function Transaction({
           </Text>
         </HStack>
         <Divider orientation="vertical" bgColor="solid.accent" h="30px" />
-        <Link href={StarkscanUrl(chainId).transaction(hash)} isExternal>
+        <Link href={explorer.transaction(hash)} isExternal>
           <ExternalIcon boxSize="12px" color="link.blue" />
         </Link>
       </HStack>
diff --git a/packages/keychain/src/hooks/connection.ts b/packages/keychain/src/hooks/connection.ts
index 7b521508d..7e3ae00dd 100644
--- a/packages/keychain/src/hooks/connection.ts
+++ b/packages/keychain/src/hooks/connection.ts
@@ -14,7 +14,6 @@ import {
   toSessionPolicies,
 } from "@cartridge/controller";
 import { mergeDefaultETHPrefund } from "utils/token";
-import { setIsSignedUp } from "utils/cookie";
 import {
   ConnectionContext,
   ConnectionContextValue,
@@ -98,7 +97,6 @@ export function useConnectionValue() {
     }
 
     setControllerRaw(controller);
-    setIsSignedUp();
   }, []);
 
   useEffect(() => {
diff --git a/packages/keychain/src/utils/cookie.ts b/packages/keychain/src/utils/cookie.ts
deleted file mode 100644
index 08c71ebaa..000000000
--- a/packages/keychain/src/utils/cookie.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export function isSignedUp() {
-  return document.cookie.search("controller=1") >= 0;
-}
-
-export function setIsSignedUp() {
-  if (isSignedUp()) {
-    return;
-  }
-
-  document.cookie = "controller=1; SameSite=None; Secure";
-}