Use origin on parent (#1335)

cartridge-gg · Jan 27, 2025 · afbe1c8 · afbe1c8
1 parent a9c51c3
commit afbe1c8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 31 deletions.
diff --git a/packages/keychain/src/hooks/connection.ts b/packages/keychain/src/hooks/connection.ts
@@ -157,23 +157,18 @@ export function useConnectionValue() {
         );
       }
     }
-  }, [
-    origin,
-    setTheme,
-    setPolicies,
-    setHasPrefundRequest,
-    setOrigin,
-    setController,
-  ]);
+  }, [origin, setTheme, setPolicies, setHasPrefundRequest, setController]);
 
   useEffect(() => {
     const connection = connectToController<ParentMethods>({
-      setOrigin,
       setRpcUrl,
       setContext,
       setController,
     });
-    connection.promise.then(setParent);
+    connection.promise.then((parent) => {
+      setOrigin(parent.origin);
+      setParent(parent);
+    });
 
     return () => {
       connection.destroy();
@@ -260,8 +255,3 @@ export function useRpcUrl() {
   const { rpcUrl } = useConnection();
   return rpcUrl;
 }
-
-export function useOrigin() {
-  const { context } = useConnection();
-  return context?.origin;
-}
diff --git a/packages/keychain/src/utils/connection/connect.ts b/packages/keychain/src/utils/connection/connect.ts
@@ -3,17 +3,13 @@ import { ConnectCtx, ConnectionCtx } from "./types";
 import { Policies } from "@cartridge/presets";
 
 export function connect({
-  setOrigin,
   setRpcUrl,
   setContext,
 }: {
-  setOrigin: (origin: string) => void;
   setRpcUrl: (url: string) => void;
   setContext: (context: ConnectionCtx) => void;
 }) {
   return (origin: string) => {
-    setOrigin(origin);
-
     return (policies: Policies, rpcUrl: string): Promise<ConnectReply> => {
       setRpcUrl(rpcUrl);
 

diff --git a/packages/keychain/src/utils/connection/index.ts b/packages/keychain/src/utils/connection/index.ts
@@ -14,12 +14,10 @@ import { normalize } from "@cartridge/utils";
 import { switchChain } from "./switchChain";
 
 export function connectToController<ParentMethods extends object>({
-  setOrigin,
   setRpcUrl,
   setContext,
   setController,
 }: {
-  setOrigin: (origin: string) => void;
   setRpcUrl: (url: string) => void;
   setContext: (ctx: ConnectionCtx) => void;
   setController: (controller?: Controller) => void;
@@ -28,7 +26,6 @@ export function connectToController<ParentMethods extends object>({
     methods: {
       connect: normalize(
         connect({
-          setOrigin,
           setRpcUrl,
           setContext,
         }),

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -4,7 +4,7 @@ packages:
   - packages/*
 
 catalog:
-  "@cartridge/penpal": "^6.2.3"
+  "@cartridge/penpal": "^6.2.4"
   "@eslint/js": "^9.18.0"
   "@starknet-io/types-js": "^0.7.7"
   "@starknet-react/chains": "^3.1"