Remove assetUrl prefix (#1133)

cartridge-gg · Dec 10, 2024 · 7cf582a · 7cf582a
1 parent f7bf9b2
commit 7cf582a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/packages/keychain/.storybook/preview.tsx b/packages/keychain/.storybook/preview.tsx
@@ -162,7 +162,7 @@ export function ControllerThemeProvider({
   children,
   theme = defaultTheme,
 }: PropsWithChildren<{ theme?: ControllerTheme }>) {
-  useThemeEffect({ theme, assetUrl: "" });
+  useThemeEffect({ theme });
   const chakraTheme = useChakraTheme(theme);
 
   return (

diff --git a/packages/keychain/src/components/Provider/theme.tsx b/packages/keychain/src/components/Provider/theme.tsx
@@ -9,7 +9,7 @@ import { PropsWithChildren, useEffect, useMemo } from "react";
 export function ControllerThemeProvider({ children }: PropsWithChildren) {
   const { theme } = useConnection();
 
-  useThemeEffect({ theme, assetUrl: "" });
+  useThemeEffect({ theme });
   const chakraTheme = useChakraTheme(theme);
 
   return (

diff --git a/packages/profile/.env.development b/packages/profile/.env.development
@@ -1,5 +1,4 @@
 VITE_CARTRIDGE_API_URL="https://api.cartridge.gg"
-VITE_KEYCHAIN_URL="http://localhost:3001"
 VITE_RPC_SEPOLIA="https://api.cartridge.gg/x/starknet/sepolia"
 VITE_POSTHOG_KEY=phc_UWaJajNQ00PjHhveZ81SJ2zVtBicKrzewdZHGiyavQQ
 VITE_POSTHOG_HOST=https://profile.cartridge.gg/ingest
diff --git a/packages/profile/.env.production b/packages/profile/.env.production
@@ -1,5 +1,4 @@
 VITE_CARTRIDGE_API_URL="https://api.cartridge.gg"
-VITE_KEYCHAIN_URL="https://x.cartridge.gg"
 VITE_RPC_SEPOLIA="https://api.cartridge.gg/x/starknet/sepolia"
 VITE_POSTHOG_KEY=phc_UWaJajNQ00PjHhveZ81SJ2zVtBicKrzewdZHGiyavQQ
 VITE_POSTHOG_HOST=https://profile.cartridge.gg/ingest
diff --git a/packages/profile/src/components/context/theme.tsx b/packages/profile/src/components/context/theme.tsx
@@ -83,7 +83,7 @@ export function ThemeProvider({
     setTheme(JSON.parse(val));
   }, [themeParam, origin]);
 
-  useThemeEffect({ theme, assetUrl: import.meta.env.VITE_KEYCHAIN_URL });
+  useThemeEffect({ theme });
 
   const value = {
     colorScheme,

diff --git a/packages/ui-next/src/hooks.ts b/packages/ui-next/src/hooks.ts
@@ -1,13 +1,7 @@
 import { useEffect } from "react";
 import { hexToHsl } from "@cartridge/utils";
 
-export function useThemeEffect({
-  theme,
-  assetUrl,
-}: {
-  theme: ControllerTheme;
-  assetUrl: string;
-}) {
+export function useThemeEffect({ theme }: { theme: ControllerTheme }) {
   useEffect(() => {
     if (!theme) return;
 
@@ -17,12 +11,12 @@ export function useThemeEffect({
 
     document.documentElement.style.setProperty(
       "--theme-icon-url",
-      `url("${assetUrl}${theme.icon}")`,
+      `url("${theme.icon}")`,
     );
     const coverUrl =
       typeof theme.cover === "string"
-        ? `url("${assetUrl}${theme.cover}")`
-        : `url("${assetUrl}${theme.cover[appliedColorMode]}")`;
+        ? `url("${theme.cover}")`
+        : `url("${theme.cover[appliedColorMode]}")`;
     document.documentElement.style.setProperty("--theme-cover-url", coverUrl);
 
     if (!theme.colors) return;
@@ -45,7 +39,7 @@ export function useThemeEffect({
         hexToHsl(val),
       );
     }
-  }, [theme, assetUrl]);
+  }, [theme]);
 }
 
 // dup of @cartridge/controller/types