diff --git a/front/apps/mobile/app/index.tsx b/front/apps/mobile/app/index.tsx
index 495ed6a9..5a36c008 100644
--- a/front/apps/mobile/app/index.tsx
+++ b/front/apps/mobile/app/index.tsx
@@ -93,7 +93,6 @@ const App = () => {
// eslint-disable-next-line react-hooks/rules-of-hooks
const info = initialRender ? useContext(AccountContext) : useAccounts();
initialRender = false;
- console.log(info);
if (info.type === "loading") return
if (info.type === "error") return ;
if (info.selected === null) return ;
diff --git a/front/apps/mobile/metro.config.js b/front/apps/mobile/metro.config.js
index 1282cde7..0405694a 100644
--- a/front/apps/mobile/metro.config.js
+++ b/front/apps/mobile/metro.config.js
@@ -64,7 +64,7 @@ module.exports = addMonorepoSupport(
...defaultConfig.resolver,
requireCycleIgnorePatterns: [
...defaultConfig.resolver.requireCycleIgnorePatterns,
- /login.ts/,
+ /.*/,
],
},
}),
diff --git a/front/packages/models/src/query.tsx b/front/packages/models/src/query.tsx
index 3f9bcb62..81bd345b 100644
--- a/front/packages/models/src/query.tsx
+++ b/front/packages/models/src/query.tsx
@@ -41,6 +41,8 @@ const kyooUrl =
? process.env.KYOO_URL ?? "http://localhost:5000"
: "/api";
+export let kyooApiUrl: string | null = kyooUrl || null;
+
export const queryFn = async (
context:
| QueryFunctionContext
@@ -57,6 +59,7 @@ export const queryFn = async (
// @ts-ignore
let url: string | null = context.apiUrl ?? (Platform.OS !== "web" ? await getSecureItem("apiUrl") : null) ?? kyooUrl;
if (!url) console.error("Kyoo's url is not defined.");
+ kyooApiUrl = url;
// @ts-ignore
if (!token && context.authenticated !== false) token = await getToken();
diff --git a/front/packages/models/src/traits/images.ts b/front/packages/models/src/traits/images.ts
index e638cb0f..c4dec740 100644
--- a/front/packages/models/src/traits/images.ts
+++ b/front/packages/models/src/traits/images.ts
@@ -20,11 +20,12 @@
import { Platform } from "react-native";
import { z } from "zod";
+import { kyooApiUrl } from "..";
export const imageFn = (url: string) =>
Platform.OS === "web"
? `/api${url}`
- : process.env.PUBLIC_BACK_URL + url;
+ : kyooApiUrl + url;
export const ImagesP = z.object({
/**
diff --git a/front/packages/primitives/src/icons.tsx b/front/packages/primitives/src/icons.tsx
index f90e6541..53c33c2c 100644
--- a/front/packages/primitives/src/icons.tsx
+++ b/front/packages/primitives/src/icons.tsx
@@ -44,17 +44,16 @@ export const Icon = ({ icon: Icon, color, size = 24, ...props }: IconProps) => {
const computed = css(
{ width: size, height: size, fill: color ?? theme.contrast } as any,
props,
- );
+ ) as any;
return (
({
web: computed,
default: {
- height: computed.style?.height,
- width: computed.style?.width,
- // // @ts-ignore
- // fill: computed.style?.fill,
+ height: computed.style[0]?.height,
+ width: computed.style[0]?.width,
+ fill: computed.style[0]?.fill,
...computed,
},
})}