Remove wrong controller theme context

cartridge-gg · Jan 6, 2025 · deff0bf · deff0bf
1 parent 0d915d8
commit deff0bf
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 14 deletions.
diff --git a/packages/keychain/.storybook/provider.tsx b/packages/keychain/.storybook/provider.tsx
@@ -51,10 +51,10 @@ function ControllerThemeProvider({
   theme = defaultTheme,
 }: PropsWithChildren<{ theme?: ControllerTheme }>) {
   useThemeEffect({ theme, assetUrl: "" });
-  const chakraTheme = useChakraTheme(theme);
+  const chakraTheme = useChakraTheme({ ...theme, verified: false });
 
   return (
-    <ControllerThemeContext.Provider value={theme}>
+    <ControllerThemeContext.Provider value={{ ...theme, verified: false }}>
       <ChakraProvider theme={chakraTheme}>{children}</ChakraProvider>
     </ControllerThemeContext.Provider>
   );

diff --git a/...eychain/__image_snapshots__/components-confirmtransaction--default-chromium.png b/...eychain/__image_snapshots__/components-confirmtransaction--default-chromium.png
diff --git a/...chain/__image_snapshots__/components-connect-authenticate--default-chromium.png b/...chain/__image_snapshots__/components-connect-authenticate--default-chromium.png
diff --git a/...ge_snapshots__/components-connect-create-createcontroller--default-chromium.png b/...ge_snapshots__/components-connect-create-createcontroller--default-chromium.png
diff --git a/...s__/components-connect-create-createcontroller--with-generic-error-chromium.png b/...s__/components-connect-create-createcontroller--with-generic-error-chromium.png
diff --git a/...hots__/components-connect-create-createcontroller--with-light-mode-chromium.png b/...hots__/components-connect-create-createcontroller--with-light-mode-chromium.png
diff --git a/...snapshots__/components-connect-create-createcontroller--with-theme-chromium.png b/...snapshots__/components-connect-create-createcontroller--with-theme-chromium.png
diff --git a/...s__/components-connect-create-createcontroller--with-timeout-error-chromium.png b/...s__/components-connect-create-createcontroller--with-timeout-error-chromium.png
diff --git a/.../components-connect-create-createcontroller--with-validation-error-chromium.png b/.../components-connect-create-createcontroller--with-validation-error-chromium.png
diff --git a/...hain/__image_snapshots__/components-connect-createsession--default-chromium.png b/...hain/__image_snapshots__/components-connect-createsession--default-chromium.png
diff --git a/.../__image_snapshots__/components-connect-createsession--with-preset-chromium.png b/.../__image_snapshots__/components-connect-createsession--with-preset-chromium.png
diff --git a/...s/keychain/__image_snapshots__/components-connect-upgrade--default-chromium.png b/...s/keychain/__image_snapshots__/components-connect-upgrade--default-chromium.png
diff --git a/.../keychain/__image_snapshots__/components-deploycontroller--default-chromium.png b/.../keychain/__image_snapshots__/components-deploycontroller--default-chromium.png
diff --git a/packages/keychain/__image_snapshots__/components-errorpage--default-chromium.png b/packages/keychain/__image_snapshots__/components-errorpage--default-chromium.png
diff --git a/...ages/keychain/__image_snapshots__/components-errorpage--long-error-chromium.png b/...ages/keychain/__image_snapshots__/components-errorpage--long-error-chromium.png
diff --git a/packages/keychain/__image_snapshots__/components-funding--default-chromium.png b/packages/keychain/__image_snapshots__/components-funding--default-chromium.png
diff --git a/packages/keychain/__image_snapshots__/components-settings--default-chromium.png b/packages/keychain/__image_snapshots__/components-settings--default-chromium.png
diff --git a/packages/keychain/src/context/theme.tsx b/packages/keychain/src/context/theme.tsx
@@ -1,6 +1,10 @@
 import { ControllerTheme } from "@cartridge/presets";
 import { createContext } from "react";
 
+export type VerifiableControllerTheme = ControllerTheme & {
+  verified: boolean;
+};
+
 export const ControllerThemeContext = createContext<
-  ControllerTheme | undefined
+  VerifiableControllerTheme | undefined
 >(undefined);
diff --git a/packages/keychain/src/hooks/connection.ts b/packages/keychain/src/hooks/connection.ts
@@ -27,7 +27,7 @@ import {
   ControllerTheme,
 } from "@cartridge/presets";
 import { ParsedSessionPolicies, parseSessionPolicies } from "./session";
-import { VerifiableControllerTheme } from "./theme";
+import { VerifiableControllerTheme } from "@/context/theme";
 
 type ParentMethods = AsyncMethodReturns<{ close: () => Promise<void> }>;
 

diff --git a/packages/keychain/src/hooks/theme.tsx b/packages/keychain/src/hooks/theme.tsx
@@ -1,14 +1,10 @@
-import { ControllerColor, ControllerTheme } from "@cartridge/presets";
+import {
+  ControllerThemeContext,
+  VerifiableControllerTheme,
+} from "@/context/theme";
+import { ControllerColor } from "@cartridge/presets";
 import { CartridgeTheme } from "@cartridge/ui";
-import { useContext, createContext, useMemo } from "react";
-
-export type VerifiableControllerTheme = ControllerTheme & {
-  verified: boolean;
-};
-
-export const ControllerThemeContext = createContext<
-  VerifiableControllerTheme | undefined
->(undefined);
+import { useContext, useMemo } from "react";
 
 export function useControllerTheme() {
   const ctx = useContext<VerifiableControllerTheme | undefined>(