@chrryai/chrry 1.4.36 → 1.4.39

package/Store.module.scss

@@ -72,6 +72,8 @@
 
 .appTitle {
   display: flex;
+  margin: 0 0 toRem.toRem(10) 0;
+  font-size: toRem.toRem(20);
 }
 
 .titleText {

package/dist/index.js

@@ -1898,7 +1898,7 @@ var init_utils = __esm({
     };
     isFirefox = typeof navigator !== "undefined" && navigator?.userAgent?.includes("Firefox");
     config = getSiteConfig(getClientHostname());
-    VERSION = config.version || "1.4.36";
+    VERSION = config.version || "1.4.39";
     getSlugFromPathname = (path) => {
       return getAppAndStoreSlugs(path, {
         defaultAppSlug: config.slug,
@@ -23228,7 +23228,9 @@ function AuthProvider({
     if (!appSlug) {
       return void 0;
     }
-    const matchedApp = allApps?.find((app2) => app2.slug === appSlug);
+    const matchedApp = allApps?.find(
+      (app2) => app2.slug === appSlug || app2.store?.slug === appSlug
+    );
     return matchedApp?.slug;
   };
   const findAppByPathname = (path, apps2) => {
@@ -23241,7 +23243,7 @@ function AuthProvider({
     setAllApps((prevApps) => {
       const existingAppsMap = new Map(prevApps.map((app2) => [app2.id, app2]));
       newApps.forEach((app2) => {
-        if (!existingAppsMap.has(app2.id) || !existingAppsMap.get(app2.id)?.store?.apps.length) {
+        if (!existingAppsMap.has(app2.id) || !existingAppsMap.get(app2.id)?.store?.apps.length || !existingAppsMap.get(app2.id)?.store?.app) {
           existingAppsMap.set(app2.id, app2);
         }
       });
@@ -23379,9 +23381,8 @@ function AuthProvider({
   (0, import_react17.useEffect)(() => {
     const loadCachedApps = async () => {
       if (!token || !loadingApp?.id && !app?.id) return;
-      const key = `allApps-${loadingApp?.id || app?.id}-${user?.id || guest?.id}`;
+      const key = `allApps`;
       const cached = await getCachedData(key);
-      console.log(`\u{1F680} ~ file: AuthProvider.tsx:958 ~ cached:`, cached);
       if (cached && cached.length > 0) {
         console.log("\u26A1 Loading cached apps instantly");
         mergeApps(cached);
@@ -23413,16 +23414,12 @@ function AuthProvider({
     }
   );
   (0, import_react17.useEffect)(() => {
-    console.log(`\u{1F680} ~ file: AuthProvider.tsx:940 ~ isLoadingApps:`, {
-      isLoadingApps,
-      loadingApp,
-      allAppsSwr
-    });
-    if (loadingApp && allApps?.find((app2) => app2.id === loadingApp.id)?.store?.apps.length) {
-      router.push(getAppSlug(loadingApp));
+    const item = loadingApp ? allApps?.find((app2) => app2.id === loadingApp?.id) : void 0;
+    if (loadingApp && item?.store?.apps.length) {
       setLoadingApp(void 0);
+      return;
     }
-    if (!isLoadingApps && loadingApp) {
+    if (loadingApp) {
       refetchApps();
     }
   }, [loadingApp, isLoadingApps, allApps]);
@@ -23623,7 +23620,6 @@ function AuthProvider({
     }
   }, [threadId]);
   const [isLoadingTasks, setIsLoadingTasks] = (0, import_react17.useState)(true);
-  console.log(`\u{1F680} ~ file: AuthProvider.tsx:1184 ~ allApps:`, allApps);
   (0, import_react17.useEffect)(() => {
     if (!allApps.length || !thread2 && threadId) return;
     let matchedApp;
@@ -23748,20 +23744,6 @@ function AuthProvider({
       if (sessionData.app) {
         setApp(sessionData.app);
         setStore(sessionData.app.store);
-        console.log("\u{1F504} Processing Session Data - Apps:", {
-          totalApps: sessionData.app.store?.apps?.length || 0,
-          apps: sessionData.app.store?.apps?.map((a) => ({
-            slug: a.slug,
-            name: a.name,
-            storeId: a.store?.id,
-            storeName: a.store?.name
-          })),
-          currentStoreId: sessionData.app.store?.id,
-          currentStoreName: sessionData.app.store?.name
-        });
-        if (sessionData?.app?.store?.apps?.length && sessionData?.app?.store?.apps?.length > 0) {
-          const currentStoreApps = sessionData.app.store.apps;
-        }
       }
     }
   }, [sessionData]);
@@ -24059,7 +24041,7 @@ function DataProvider({ children, ...rest }) {
   const [instructions, setInstructions] = (0, import_react19.useState)([]);
   const [affiliateStats, setAffiliateStats] = (0, import_react19.useState)(null);
   const [loadingAffiliateStats, setLoadingAffiliateStats] = (0, import_react19.useState)(false);
-  const VERSION4 = "1.4.36";
+  const VERSION4 = "1.4.39";
   const [weather, setWeather] = useLocalStorage2("weather", user?.weather || guest?.weather || void 0);
   const {
     API_URL: API_URL2,
@@ -25139,7 +25121,8 @@ function AppProvider({ children }) {
     setIsSavingApp,
     defaultInstructions,
     sushi,
-    focus
+    focus,
+    setLoadingApp
   } = useAuth();
   const { actions } = useData();
   const { t: t6 } = (0, import_react_i18next4.useTranslation)();
@@ -25350,11 +25333,20 @@ function AppProvider({ children }) {
   (0, import_react26.useEffect)(() => {
     setStoreSlug(pathname.replace("/", ""));
   }, [pathname]);
-  const currentStore = (0, import_react26.useMemo)(() => {
+  const getCurrentStoreApp = () => {
     const pathSegments = pathname.split("/").filter(Boolean);
     const lastSegment = pathSegments[pathSegments.length - 1] || "";
     const matchedApp = allApps?.find((app2) => app2?.store?.slug === lastSegment);
-    return matchedApp?.store;
+    return matchedApp;
+  };
+  const [currentStore, setCurrentStore] = (0, import_react26.useState)(getCurrentStoreApp()?.store);
+  (0, import_react26.useEffect)(() => {
+    const matchedApp = getCurrentStoreApp();
+    if (matchedApp && !matchedApp?.store?.apps?.length) {
+      setLoadingApp(matchedApp);
+      return;
+    }
+    matchedApp?.store && setCurrentStore(matchedApp.store);
   }, [pathname, allApps]);
   const appFormWatcher = {
     ...watcher,
@@ -26221,7 +26213,32 @@ function ChatProvider({
     setIsIncognito(searchParams.get("incognito") === "true");
   }, [searchParams]);
   const [wasIncognito, setWasIncognito] = (0, import_react29.useState)(isIncognito);
-  const [newChatTrigger, setNewChatTrigger] = (0, import_react29.useState)(0);
+  const hasStoreApps = (item) => {
+    const i = item && allApps?.find((app2) => app2.id === item?.id);
+    return i?.store?.apps.length;
+  };
+  const [loadingApp, setLoadingApp] = (0, import_react29.useState)(
+    void 0
+  );
+  const setIsNewAppChat = (item) => {
+    if (!loadingApp && hasStoreApps(item) && item) {
+      setIsNewChat(true, getAppSlug(item));
+      return;
+    }
+    if (!loadingApp && item) {
+      setLoadingApp(item);
+      return;
+    }
+  };
+  (0, import_react29.useEffect)(() => {
+    if (!loadingApp) {
+      return;
+    }
+    if (hasStoreApps(loadingApp)) {
+      setIsNewChat(true, getAppSlug(loadingApp));
+      return;
+    }
+  }, [loadingApp, allApps]);
   const setIsNewChat = (value, to = app?.slug ? getAppSlug(app) : "/") => {
     if (value) {
       setCollaborationStep(0);
@@ -26236,9 +26253,6 @@ function ChatProvider({
       setCollaborationStatus(void 0);
       setIsChatFloating(false);
     }
-    if (value && isExtension2) {
-      setNewChatTrigger((prev2) => prev2 + 1);
-    }
     setIsNewChatInternal(value);
   };
   (0, import_react29.useEffect)(() => {
@@ -26662,6 +26676,7 @@ function ChatProvider({
     ChatContext.Provider,
     {
       value: {
+        setIsNewAppChat,
         shouldFocus,
         setShouldFocus,
         placeHolderText,
@@ -27490,7 +27505,9 @@ var init_Store_styles = __esm({
         fontSize: 14
       },
       appTitle: {
-        display: "flex"
+        display: "flex",
+        margin: "0 0 10px 0",
+        fontSize: 20
       },
       titleText: {
         gap: 5,
@@ -29066,7 +29083,7 @@ function Loading({
 }) {
   const isHydrated = useHasHydrated();
   const styles4 = useLoadingStyles();
-  const LoadingWrapper = ({ children }) => fullScreen ? /* @__PURE__ */ React.createElement(Div, { style: styles4.loadingWrapper.style }, children) : /* @__PURE__ */ React.createElement(React.Fragment, null, children);
+  const LoadingWrapper = ({ children }) => fullScreen ? /* @__PURE__ */ React.createElement(Div, { className: "fullScreen", style: styles4.loadingWrapper.style }, children) : /* @__PURE__ */ React.createElement(React.Fragment, null, children);
   if (!isHydrated) {
     return null;
   }
@@ -29077,7 +29094,8 @@ function Loading({
       height: height2 || size2 || 24,
       style: styles4.loadingCircle.style,
       color,
-      "data-testid": "imgLoading"
+      "data-testid": "imgLoading",
+      className: "spinner"
     }
   ));
 }
@@ -35060,7 +35078,7 @@ function App({
   } = useAuth();
   const { FRONTEND_URL: FRONTEND_URL2, API_URL: API_URL2 } = useData();
   const { router, setIsNewChat, getStoreSlug } = useNavigationContext();
-  const { setInput, setIsWebSearchEnabled } = useChat();
+  const { setInput, setIsWebSearchEnabled, setIsNewAppChat } = useChat();
   const { addHapticFeedback } = useTheme2();
   const currentStoreId = store?.id;
   const focus = apps.find((app2) => app2.slug === "focus");
@@ -35070,8 +35088,7 @@ function App({
   const atlas = apps.find((app2) => app2.slug === "atlas");
   const grape = apps.find((app2) => app2.slug === "grape");
   const zarathustra = apps.find((app2) => app2.slug === "zarathustra");
-  const isBlossom = app?.id === chrry?.id;
-  console.log(`\u{1F680} ~ file: App.tsx:178 ~ apps:`, apps);
+  const isBlossom = app?.store?.id === chrry?.store?.id;
   const getApps2 = () => {
     return apps.filter(
       (item) => item.id !== store?.appId && item.id !== chrry?.id && item.id !== grape?.id && (isBlossom ? item.id !== atlas?.id && item.id !== zarathustra?.id && item.id !== popcorn?.id : true)
@@ -35229,7 +35246,7 @@ function App({
         href: getAppSlug(storeApp),
         onClick: (e) => {
           e.preventDefault();
-          setIsNewChat(true, getAppSlug(storeApp));
+          setIsNewAppChat(storeApp);
           addHapticFeedback();
           setAppStatus(void 0);
           if (e.metaKey || e.ctrlKey) {
@@ -35737,7 +35754,7 @@ function App({
                 return;
               }
               e.preventDefault();
-              setIsNewChat(true, getAppSlug(chrry));
+              setIsNewAppChat(chrry);
             },
             style: {
               ...styles4.chrry.style
@@ -35768,7 +35785,7 @@ function App({
                 return;
               }
               e.preventDefault();
-              setIsNewChat(true, getAppSlug(zarathustra));
+              setIsNewAppChat(zarathustra);
             },
             style: {
               ...styles4.zarathustra.style
@@ -35800,7 +35817,7 @@ function App({
                 return;
               }
               e.preventDefault();
-              setIsNewChat(true, getAppSlug(popcorn));
+              setIsNewAppChat(popcorn);
             },
             style: {
               ...styles4.popcorn.style
@@ -35855,13 +35872,7 @@ function App({
               if (e.metaKey || e.ctrlKey) {
                 return;
               }
-              if (!item?.store?.apps.every(
-                (a) => a.store?.apps.length
-              )) {
-                setLoadingApp(item);
-              } else {
-                setIsNewChat(true, getAppSlug(item));
-              }
+              setIsNewAppChat(item);
               e.preventDefault();
             }
           },
@@ -35888,7 +35899,7 @@ function App({
                 return;
               }
               e.preventDefault();
-              setIsNewChat(true, getAppSlug(atlas));
+              setIsNewAppChat(atlas);
             },
             style: {
               ...styles4.atlas.style
@@ -41857,6 +41868,7 @@ var init_Account_styles = __esm({
 function Account({ style: style2 }) {
   const { push } = useRouter();
   const styles4 = useAccountStyles();
+  const { isMobileDevice } = useTheme2();
   const { utilities } = useStyles();
   const { t: t6 } = useAppContext();
   const {
@@ -42017,6 +42029,7 @@ function Account({ style: style2 }) {
       style: {
         ...utilities.transparent.style,
         ...utilities.small.style,
+        display: isMobileDevice ? "none" : "flex",
         ...style2
       },
       onClick: () => {
@@ -44560,9 +44573,9 @@ function Store({
   const { FRONTEND_URL: FRONTEND_URL2 } = useData();
   const { isMobileDevice } = useTheme2();
   const { utilities } = useStyles();
-  const { router, setIsNewChat, pathname, searchParams } = useNavigationContext();
-  const { getAppSlug } = useAuth();
-  const { track, allApps } = useAuth();
+  const { router, pathname, searchParams } = useNavigationContext();
+  const { setIsNewAppChat } = useChat();
+  const { track, allApps, getAppSlug, loadingApp } = useAuth();
   const { currentStore } = useApp();
   const store = slug ? allApps.find((app) => app.slug === slug)?.store : currentStore;
   const apps = store?.apps;
@@ -44608,10 +44621,10 @@ function Store({
   }, [selectedApp?.id, store?.id, track]);
   useStoreMetadata(store);
   const styles4 = useStoreStyles();
+  if (!store?.app) {
+    return null;
+  }
   const render = () => {
-    if (!store?.app) {
-      return null;
-    }
     return /* @__PURE__ */ import_react73.default.createElement(
       Div,
       {
@@ -44652,7 +44665,7 @@ function Store({
           onClick: (e) => {
             e.preventDefault();
             if (store.app) {
-              setIsNewChat(true, getAppSlug(store.app));
+              setIsNewAppChat(store.app);
             }
             if (e.metaKey || e.ctrlKey) {
               return;
@@ -44714,7 +44727,7 @@ function Store({
               display: isMobileDevice ? "none" : "flex"
             }
           },
-          /* @__PURE__ */ import_react73.default.createElement(Span, { style: { ...styles4.appName.style } }, app.icon, " ", app.name),
+          /* @__PURE__ */ import_react73.default.createElement(Span, { style: { ...styles4.appName.style } }, loadingApp?.id === app.id ? /* @__PURE__ */ import_react73.default.createElement(Loading, { size: 16 }) : app.icon, " ", app.name),
           /* @__PURE__ */ import_react73.default.createElement(Span, { style: { ...styles4.appSubtitle.style } }, t6(app.subtitle || ""))
         )
       ))), /* @__PURE__ */ import_react73.default.createElement(Div, { key: selectedApp?.id, style: styles4.footer.style }, selectedApp && /* @__PURE__ */ import_react73.default.createElement(Div, { style: styles4.appDetails.style }, /* @__PURE__ */ import_react73.default.createElement(H3, { style: styles4.appTitle.style }, selectedApp.icon, " ", selectedApp.name, /* @__PURE__ */ import_react73.default.createElement(
@@ -44726,7 +44739,7 @@ function Store({
               return;
             }
             e.preventDefault();
-            setIsNewChat(true, getAppSlug(selectedApp));
+            setIsNewAppChat(selectedApp);
           },
           style: styles4.tryItNow.style
         },
@@ -44748,7 +44761,7 @@ function Store({
               return;
             }
             e.preventDefault();
-            setIsNewChat(true, getAppSlug(selectedApp));
+            setIsNewAppChat(selectedApp);
           },
           className: "link"
         },
@@ -44779,9 +44792,6 @@ function Store({
   if (compact) {
     return render();
   }
-  if (!store?.app) {
-    return null;
-  }
   return /* @__PURE__ */ import_react73.default.createElement(Skeleton, null, render());
 }
 var import_react73;
@@ -44800,6 +44810,7 @@ var init_Store = __esm({
     init_A();
     init_useMetadata();
     init_StylesContext();
+    init_Loading();
   }
 });