From dded2e64ecab2e6ef6f6738feafc104b9d678b78 Mon Sep 17 00:00:00 2001
From: JunichiSugiura <jun.sugiura.jp@gmail.com>
Date: Tue, 19 Nov 2024 17:24:39 +0100
Subject: [PATCH 1/2] Show settings button on top bar in Keychain

---
 .../src/components/Settings/index.tsx         | 114 ++++++++----------
 .../layout/Container/Header/TopBar.tsx        |  11 +-
 .../layout/Container/Header/index.tsx         |  13 +-
 .../src/components/layout/Container/index.tsx |   2 -
 packages/keychain/src/hooks/connection.ts     |   2 +-
 packages/keychain/src/pages/index.tsx         |   2 +-
 6 files changed, 63 insertions(+), 81 deletions(-)

diff --git a/packages/keychain/src/components/Settings/index.tsx b/packages/keychain/src/components/Settings/index.tsx
index 405add0fc..a3554cc7d 100644
--- a/packages/keychain/src/components/Settings/index.tsx
+++ b/packages/keychain/src/components/Settings/index.tsx
@@ -1,21 +1,9 @@
-import {
-  Button,
-  VStack,
-  Text,
-  HStack,
-  UnorderedList,
-  ListItem,
-} from "@chakra-ui/react";
-import { Container, Content, Footer } from "components/layout";
-import { GearIcon, TrashIcon } from "@cartridge/ui";
-import { useConnection } from "hooks/connection";
-import { useCallback, useEffect, useState } from "react";
-import { useExternalOwners } from "hooks/external";
-import { formatAddress } from "@cartridge/utils";
+import { Button } from "@chakra-ui/react";
+import { GearIcon } from "@cartridge/ui";
+import { useState } from "react";
+import { Container, Footer } from "components/layout";
 import { Recovery } from "./Recovery";
 import { Delegate } from "./Delegate";
-import { CallData } from "starknet";
-import { ExecuteCtx } from "utils/connection";
 
 enum State {
   SETTINGS,
@@ -24,54 +12,54 @@ enum State {
 }
 
 export function Settings({ onLogout }: { onLogout: () => void }) {
-  const { controller, context, setContext } = useConnection();
+  // const { controller, context, setContext } = useConnection();
   const [state, setState] = useState<State>(State.SETTINGS);
-  const [delegateAccount, setDelegateAccount] = useState("");
+  // const [delegateAccount, setDelegateAccount] = useState("");
 
-  useEffect(() => {
-    const init = async () => {
-      const delegate = await controller.delegateAccount();
-      setDelegateAccount(delegate);
-    };
-    init();
-  }, [controller]);
+  // useEffect(() => {
+  //   const init = async () => {
+  //     const delegate = await controller.delegateAccount();
+  //     setDelegateAccount(delegate);
+  //   };
+  //   init();
+  // }, [controller]);
 
-  const { externalOwners } = useExternalOwners();
+  // const { externalOwners } = useExternalOwners();
 
-  const onRemoveExternalOwner = useCallback(
-    (externalOwnerAddress: string) => {
-      setContext({
-        origin: context.origin,
-        transactions: [
-          {
-            contractAddress: controller.address,
-            entrypoint: "remove_external_owner",
-            calldata: CallData.compile([externalOwnerAddress]),
-          },
-        ],
-        type: "execute",
-        resolve: context.resolve,
-        reject: context.reject,
-      } as ExecuteCtx);
-    },
-    [controller, context, setContext],
-  );
+  // const onRemoveExternalOwner = useCallback(
+  //   (externalOwnerAddress: string) => {
+  //     setContext({
+  //       origin: context.origin,
+  //       transactions: [
+  //         {
+  //           contractAddress: controller.address,
+  //           entrypoint: "remove_external_owner",
+  //           calldata: CallData.compile([externalOwnerAddress]),
+  //         },
+  //       ],
+  //       type: "execute",
+  //       resolve: context.resolve,
+  //       reject: context.reject,
+  //     } as ExecuteCtx);
+  //   },
+  //   [controller, context, setContext],
+  // );
 
-  const onRemoveDelegate = useCallback(() => {
-    setContext({
-      origin: context.origin,
-      transactions: [
-        {
-          contractAddress: controller.address,
-          entrypoint: "set_delegate_account",
-          calldata: CallData.compile(["0x0"]),
-        },
-      ],
-      type: "execute",
-      resolve: context.resolve,
-      reject: context.reject,
-    } as ExecuteCtx);
-  }, [controller, context, setContext]);
+  // const onRemoveDelegate = useCallback(() => {
+  //   setContext({
+  //     origin: context.origin,
+  //     transactions: [
+  //       {
+  //         contractAddress: controller.address,
+  //         entrypoint: "set_delegate_account",
+  //         calldata: CallData.compile(["0x0"]),
+  //       },
+  //     ],
+  //     type: "execute",
+  //     resolve: context.resolve,
+  //     reject: context.reject,
+  //   } as ExecuteCtx);
+  // }, [controller, context, setContext]);
 
   if (state === State.RECOVERY) {
     return <Recovery onBack={() => setState(State.SETTINGS)} />;
@@ -83,9 +71,9 @@ export function Settings({ onLogout }: { onLogout: () => void }) {
 
   return (
     <Container variant="compressed" title="Controller Settings" Icon={GearIcon}>
-      <Content>
+      {/* <Content>
         <VStack gap="30px" w="full">
-          {/* <VStack>
+          <VStack>
             {controller.cartridge.hasSession(
               controller.cartridge.session(),
             ) ? (
@@ -101,7 +89,7 @@ export function Settings({ onLogout }: { onLogout: () => void }) {
             >
               Clear Session
             </Button> 
-          </VStack> */}
+          </VStack>
 
           <VStack w="full" alignItems="flex-start">
             <Text fontWeight="bold" color="text.secondary">
@@ -169,7 +157,7 @@ export function Settings({ onLogout }: { onLogout: () => void }) {
             )}
           </VStack>
         </VStack>
-      </Content>
+      </Content> */}
       <Footer>
         <Button w="full" onClick={onLogout}>
           Log out
diff --git a/packages/keychain/src/components/layout/Container/Header/TopBar.tsx b/packages/keychain/src/components/layout/Container/Header/TopBar.tsx
index bce7af1cb..e8698acd9 100644
--- a/packages/keychain/src/components/layout/Container/Header/TopBar.tsx
+++ b/packages/keychain/src/components/layout/Container/Header/TopBar.tsx
@@ -4,15 +4,20 @@ import { NetworkStatus } from "./NetworkStatus";
 import { SettingsButton } from "./SettingsButton";
 import { BackButton } from "./BackButton";
 import { useConnection } from "hooks/connection";
+import { useMemo } from "react";
 
 export type TopBarProps = {
   onBack?: () => void;
   hideAccount?: boolean;
-  showSettings?: boolean;
 };
 
-export function TopBar({ onBack, hideAccount, showSettings }: TopBarProps) {
-  const { openSettings } = useConnection();
+export function TopBar({ onBack, hideAccount }: TopBarProps) {
+  const { openSettings, context } = useConnection();
+  const showSettings = useMemo(
+    () => !context || !["connect", "open-settings"].includes(context.type),
+    [context],
+  );
+
   return (
     <HStack
       w="full"
diff --git a/packages/keychain/src/components/layout/Container/Header/index.tsx b/packages/keychain/src/components/layout/Container/Header/index.tsx
index fca4a5759..9fd0709dc 100644
--- a/packages/keychain/src/components/layout/Container/Header/index.tsx
+++ b/packages/keychain/src/components/layout/Container/Header/index.tsx
@@ -4,20 +4,11 @@ import { TopBar, TopBarProps } from "./TopBar";
 
 export type HeaderProps = TopBarProps & BannerProps;
 
-export function Header({
-  onBack,
-  hideAccount,
-  showSettings,
-  ...bannerProps
-}: HeaderProps) {
+export function Header({ onBack, hideAccount, ...bannerProps }: HeaderProps) {
   return (
     <Box position="sticky" top={0} w="full" zIndex={1} bg="solid.bg">
       <Banner {...bannerProps} />
-      <TopBar
-        onBack={onBack}
-        hideAccount={hideAccount}
-        showSettings={showSettings}
-      />
+      <TopBar onBack={onBack} hideAccount={hideAccount} />
     </Box>
   );
 }
diff --git a/packages/keychain/src/components/layout/Container/index.tsx b/packages/keychain/src/components/layout/Container/index.tsx
index 00aaaacfd..ba90f17da 100644
--- a/packages/keychain/src/components/layout/Container/index.tsx
+++ b/packages/keychain/src/components/layout/Container/index.tsx
@@ -14,7 +14,6 @@ export function Container({
   children,
   onBack,
   hideAccount,
-  showSettings,
   Icon,
   icon,
   title,
@@ -30,7 +29,6 @@ export function Container({
       <Header
         onBack={onBack}
         hideAccount={hideAccount}
-        showSettings={showSettings}
         Icon={Icon}
         icon={icon}
         title={title}
diff --git a/packages/keychain/src/hooks/connection.ts b/packages/keychain/src/hooks/connection.ts
index ad510f334..3ebaae3c7 100644
--- a/packages/keychain/src/hooks/connection.ts
+++ b/packages/keychain/src/hooks/connection.ts
@@ -166,7 +166,7 @@ export function useConnectionValue() {
 
   const openSettings = useCallback(() => {
     setContext({
-      origin,
+      origin: context.origin || origin,
       type: "open-settings",
       resolve: context.resolve,
       reject: context.reject,
diff --git a/packages/keychain/src/pages/index.tsx b/packages/keychain/src/pages/index.tsx
index 2e8d1801c..2bf6a8e4f 100644
--- a/packages/keychain/src/pages/index.tsx
+++ b/packages/keychain/src/pages/index.tsx
@@ -34,7 +34,7 @@ function Home() {
         },
       });
     }
-  }, [context?.origin]);
+  }, [context?.origin, posthog]);
 
   if (window.self === window.top || !context?.origin) {
     return <></>;

From 732befe90d84ad12e6bb72383cf29c15f29dd32f Mon Sep 17 00:00:00 2001
From: JunichiSugiura <jun.sugiura.jp@gmail.com>
Date: Tue, 19 Nov 2024 17:30:25 +0100
Subject: [PATCH 2/2] Show settings button in Profile

---
 packages/controller/src/controller.ts                  |  2 ++
 packages/profile/src/components/context/connection.tsx |  2 ++
 packages/profile/src/components/layout/index.tsx       | 10 +++++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/controller/src/controller.ts b/packages/controller/src/controller.ts
index c6103062e..1baedeffd 100644
--- a/packages/controller/src/controller.ts
+++ b/packages/controller/src/controller.ts
@@ -80,6 +80,7 @@ export default class ControllerProvider extends BaseProvider {
           this.profile = profile;
         },
         methods: {
+          openSettings: this.openSettings.bind(this),
           openPurchaseCredits: this.openPurchaseCredits.bind(this),
           openExecute: normalize(() => this.openExecute.bind(this)),
         },
@@ -172,6 +173,7 @@ export default class ControllerProvider extends BaseProvider {
       console.error(new NotReadyToConnect().message);
       return null;
     }
+    this.iframes.profile?.close();
     this.iframes.keychain.open();
     const res = await this.keychain.openSettings();
     this.iframes.keychain.close();
diff --git a/packages/profile/src/components/context/connection.tsx b/packages/profile/src/components/context/connection.tsx
index 9993a7774..7d6e01227 100644
--- a/packages/profile/src/components/context/connection.tsx
+++ b/packages/profile/src/components/context/connection.tsx
@@ -27,6 +27,7 @@ type ConnectionContextType = {
 
 type ParentMethods = {
   close: () => void;
+  openSettings: () => void;
   openPurchaseCredits: () => void;
   openExecute: (calls: Call[]) => void;
 };
@@ -34,6 +35,7 @@ type ParentMethods = {
 const initialState: ConnectionContextType = {
   parent: {
     close: () => {},
+    openSettings: () => {},
     openPurchaseCredits: () => {},
     openExecute: () => {},
   },
diff --git a/packages/profile/src/components/layout/index.tsx b/packages/profile/src/components/layout/index.tsx
index 5a58a2c61..969348770 100644
--- a/packages/profile/src/components/layout/index.tsx
+++ b/packages/profile/src/components/layout/index.tsx
@@ -1,4 +1,4 @@
-import { Button, cn, TimesIcon, Network } from "@cartridge/ui-next";
+import { Button, cn, TimesIcon, Network, DotsIcon } from "@cartridge/ui-next";
 import { PropsWithChildren, useCallback } from "react";
 import { useConnection } from "@/hooks/context";
 import { isIframe } from "@cartridge/utils";
@@ -28,9 +28,13 @@ export function LayoutContainer({
 
         <div className="flex gap-2">
           <Network chainId={chainId} />
-          {/* <Button variant="icon" size="icon">
+          <Button
+            variant="icon"
+            size="icon"
+            onClick={() => parent.openSettings()}
+          >
             <DotsIcon />
-          </Button> */}
+          </Button>
         </div>
       </div>