@lmnto/h-mall-shared 1.0.22 → 1.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmnto/h-mall-shared",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "private": false,
   "sideEffects": false,
   "scripts": {

package/shared/components/HomeBanners.tsx

@@ -23,6 +23,8 @@ export default function HomeBanners({
   onCategoryChange,
 }) {
   const { featureFlags } = useMainContext();
+  const isMembershipFeatureEnabled =
+    featureFlags?.[FeatureCodes.ENABLE_MEMBERSHIP_FEATURE]?.isActive;
 
   const renderNote = () => {
     return (
@@ -291,6 +293,7 @@ export default function HomeBanners({
             onCategoryChange(CATEGORY_FOR_SUBSCRIPTION);
           }}
           isSubscriptionActive={isSubscriptionActive}
+          isMembershipFeatureEnabled={isMembershipFeatureEnabled}
         />
       </Carousel>
     </div>

package/shared/components/SubscriptionBanner.tsx

@@ -8,18 +8,20 @@ import { useMemo } from "react";
 
 export type SubscriptionBannerProps = {
   isSubscriptionActive: boolean;
+  isMembershipFeatureEnabled?: boolean;
   callback: () => void;
 };
 
 export default function SubscriptionBanner({
   isSubscriptionActive,
+  isMembershipFeatureEnabled = true,
   callback,
 }: SubscriptionBannerProps) {
   const scopeT = _useScopedI18n("products.subscriptionBanner");
   const { user } = useUserStore();
 
   const renderBanner = useMemo(() => {
-    if (isSubscriptionActive)
+    if (isSubscriptionActive) {
       return (
         <div className="justify-between rounded-xl h-[200px] sm:h-[150px] p-[5%] lg:p-[2%] subscriptionBanner">
           <div className="w-full md:w-5/6 lg:w-3/4 xl:w-2/3">
@@ -39,6 +41,30 @@ export default function SubscriptionBanner({
           </div>
         </div>
       );
+    }
+
+    if (!isMembershipFeatureEnabled) {
+      return (
+        <div className="justify-between rounded-xl h-[200px] sm:h-[150px] p-[5%] lg:p-[2%] subscriptionBanner">
+          <div className="w-full md:w-5/6 lg:w-3/4 xl:w-2/3">
+            <Typography
+              variant="h6"
+              className="font-medium text-sm text-black-500 mb-1"
+            >
+              {scopeT("welcome")}
+            </Typography>
+
+            <Typography
+              variant="h3"
+              className="font-semibold text-sm md:text-base text-black-500"
+            >
+              {scopeT("membershipFeatureUnavailableWelcome")}
+            </Typography>
+          </div>
+        </div>
+      );
+    }
+
     return (
       <div className="justify-between rounded-xl h-[200px] p-[5%] lg:p-[2%]  subscriptionBannerBuy">
         <div className="w-full md:w-5/6 lg:w-3/4 xl:w-2/3">
@@ -57,14 +83,12 @@ export default function SubscriptionBanner({
               {scopeT("subscriptionActivationPending")}
             </Typography>
           ) : (
-            <>
-              <Typography
-                variant="h2"
-                className="font-semibold text-sm md:text-base text-black-500"
-              >
-                {scopeT("inactiveSubscription")} 🚀
-              </Typography>
-            </>
+            <Typography
+              variant="h2"
+              className="font-semibold text-sm md:text-base text-black-500"
+            >
+              {scopeT("inactiveSubscription")} 🚀
+            </Typography>
           )}
           <ButtonCustom
             onClick={callback}
@@ -77,7 +101,13 @@ export default function SubscriptionBanner({
         </div>
       </div>
     );
-  }, [isSubscriptionActive, callback, scopeT, user]);
+  }, [
+    isSubscriptionActive,
+    isMembershipFeatureEnabled,
+    callback,
+    scopeT,
+    user,
+  ]);
 
   return <>{renderBanner}</>;
 }

package/shared/hooks/useOnlineUser.ts

@@ -1,28 +1,40 @@
 import { useQuery } from "@tanstack/react-query";
+import { useEffect, useState } from "react";
 import { usePathname } from "next/navigation";
-import { useEffect } from "react";
-
 import { QueryKeys } from "../constants/query-keys";
 import { UsersService } from "../services/api";
 import { IUserProfile } from "../types/user";
 
 const useOnlineUser = () => {
+  const [onlineUser, setOnlineUser] = useState<IUserProfile>();
+
   const pathname = usePathname();
 
-  const { data: onlineUser, refetch: getUser } = useQuery<IUserProfile>({
+
+  const { data: onlineData, refetch: getUser } = useQuery({
     queryKey: [QueryKeys.users.GET_USER],
     queryFn: () => UsersService.usersControllerGetProfile(),
+    enabled: true,
+  });
+
+  const { refetch: getAletaAuth } = useQuery({
+    queryKey: ["ALETA_AUTH"],
+    queryFn: () => UsersService.paymentGatewayControllerGetProfile(),
     enabled: false,
-    staleTime: 0,
   });
 
   useEffect(() => {
-    void getUser();
-  }, [pathname, getUser]);
+    (async () => await setOnlineUser(onlineData))();
+  }, [setOnlineUser, onlineData]);
+
+  useEffect(() => {
+    getUser();
+  }, [getUser, pathname]);
 
   return {
     onlineUser,
     getUser,
+    getAletaAuth,
   };
 };
 

package/shared/i18n/locales/en.ts

@@ -59,6 +59,8 @@ export default {
       buySubscriptionBtn: "Buy Subscription",
       subscriptionActivationPending:
         "Subscription activation still in progress. Please check back later or contact support.",
+      membershipFeatureUnavailableWelcome:
+        "Welcome to H Mall! Explore our products and discover what we have to offer.",
     },
     quantityComponent: {
       quantity: "Quantity",

package/shared/i18n/locales/it.ts

@@ -56,6 +56,10 @@ export default {
       inactiveSubscription:
         "Sblocca vantaggi esclusivi rinnovando il tuo abbonamento oggi",
       buySubscriptionBtn: "Acquista abbonamento",
+      subscriptionActivationPending:
+        "Attivazione dell'abbonamento ancora in corso. Riprova più tardi o contatta l'assistenza.",
+      membershipFeatureUnavailableWelcome:
+        "Benvenuto su H Mall! Esplora i nostri prodotti e scopri cosa abbiamo da offrire.",
     },
     quantityComponent: {
       quantity: "Quantità",