@selfcommunity/react-core 0.7.0-alpha.1 → 0.7.0-alpha.10

package/lib/cjs/hooks/useSCFetchPaymentProduct.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const api_services_1 = require("@selfcommunity/api-services");
+const utils_1 = require("@selfcommunity/utils");
+const react_1 = require("react");
+const use_deep_compare_effect_1 = require("use-deep-compare-effect");
+const SCUserProvider_1 = require("../components/provider/SCUserProvider");
+const Cache_1 = require("../constants/Cache");
+const Errors_1 = require("../constants/Errors");
+/**
+ :::info
+ This custom hook is used to fetch a payment product.
+ :::
+ * @param object
+ * @param object.id
+ * @param object.paymentProduct
+ * @param object.cacheStrategy
+ */
+function useSCFetchPaymentProduct({ id = null, paymentProduct = null, cacheStrategy = utils_1.CacheStrategies.NETWORK_ONLY, }) {
+    const __paymentProductId = (0, react_1.useMemo)(() => (paymentProduct === null || paymentProduct === void 0 ? void 0 : paymentProduct.id) || id, [paymentProduct, id]);
+    // CONTEXT
+    const scUserContext = (0, SCUserProvider_1.useSCUser)();
+    const authUserId = (0, react_1.useMemo)(() => { var _a; return ((_a = scUserContext.user) === null || _a === void 0 ? void 0 : _a.id) || null; }, [scUserContext.user]);
+    // CACHE
+    const __paymentProductCacheKey = (0, react_1.useMemo)(() => (0, Cache_1.getPaymentProductObjectCacheKey)(__paymentProductId), [__paymentProductId]);
+    const [scPaymentProduct, setScPaymentProduct] = (0, react_1.useState)(cacheStrategy !== utils_1.CacheStrategies.NETWORK_ONLY ? utils_1.LRUCache.get(__paymentProductCacheKey, paymentProduct) : null);
+    const [error, setError] = (0, react_1.useState)(null);
+    const setSCPaymentProduct = (0, react_1.useCallback)((c) => {
+        setScPaymentProduct(c);
+        utils_1.LRUCache.set(__paymentProductCacheKey, c);
+    }, [setScPaymentProduct, __paymentProductCacheKey]);
+    /**
+     * Memoized fetch product
+     */
+    const fetchPaymentProduct = (0, react_1.useMemo)(() => (id) => {
+        return api_services_1.http
+            .request({
+            url: api_services_1.Endpoints.GetPaymentProduct.url({ id }),
+            method: api_services_1.Endpoints.GetPaymentProduct.method,
+        })
+            .then((res) => {
+            if (res.status >= 300) {
+                return Promise.reject(res);
+            }
+            return Promise.resolve(res.data);
+        });
+    }, []);
+    /**
+     * If id attempt to get the course by id
+     */
+    (0, react_1.useEffect)(() => {
+        if (id !== null && id !== undefined && !paymentProduct) {
+            fetchPaymentProduct(id)
+                .then((e) => {
+                setSCPaymentProduct(e);
+            })
+                .catch((err) => {
+                utils_1.LRUCache.delete(__paymentProductCacheKey);
+                utils_1.Logger.error(Errors_1.SCOPE_SC_CORE, err.message);
+            });
+        }
+    }, [id, paymentProduct, authUserId]);
+    (0, use_deep_compare_effect_1.useDeepCompareEffectNoCheck)(() => {
+        if (paymentProduct) {
+            setSCPaymentProduct(paymentProduct);
+        }
+    }, [paymentProduct, authUserId]);
+    return { scPaymentProduct, setSCPaymentProduct, error };
+}
+exports.default = useSCFetchPaymentProduct;

package/lib/cjs/hooks/useSCFetchUsers.d.ts

@@ -0,0 +1,23 @@
+import { SCUserAutocompleteType } from '@selfcommunity/types';
+import { CacheStrategies } from '@selfcommunity/utils';
+/**
+ :::info
+ This custom hook is used to fetch users.
+ @param object.cacheStrategy
+
+ :::tip Context can be consumed in this way:
+
+ ```jsx
+ const {users, isLoading} = useSCFetchUsers();
+ ```
+ :::
+ * @param props
+ */
+declare const useSCFetchUsers: (props?: {
+    cacheStrategy?: CacheStrategies;
+    search?: string;
+}) => {
+    users: SCUserAutocompleteType[];
+    isLoading: boolean;
+};
+export default useSCFetchUsers;

package/lib/cjs/hooks/useSCFetchUsers.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const react_1 = require("react");
+const Errors_1 = require("../constants/Errors");
+const api_services_1 = require("@selfcommunity/api-services");
+const utils_1 = require("@selfcommunity/utils");
+const Cache_1 = require("../constants/Cache");
+// Hydrate cache
+const hydrate = (ids) => {
+    if (!ids)
+        return null;
+    const users = ids.map((id) => {
+        const __userCacheKey = (0, Cache_1.getUserObjectCacheKey)(id);
+        return utils_1.LRUCache.get(__userCacheKey);
+    });
+    if (users.filter((u) => !u).length > 0) {
+        return null; // revalidate cache
+    }
+    return users;
+};
+/**
+ :::info
+ This custom hook is used to fetch users.
+ @param object.cacheStrategy
+
+ :::tip Context can be consumed in this way:
+
+ ```jsx
+ const {users, isLoading} = useSCFetchUsers();
+ ```
+ :::
+ * @param props
+ */
+const useSCFetchUsers = (props) => {
+    const { cacheStrategy = utils_1.CacheStrategies.CACHE_FIRST, search = '' } = props || {};
+    const __usersCacheKey = (0, Cache_1.getUsersObjectCacheKey)(search);
+    const cachedUsers = cacheStrategy !== utils_1.CacheStrategies.NETWORK_ONLY ? hydrate(utils_1.LRUCache.get(__usersCacheKey, null)) : null;
+    const [data, setData] = (0, react_1.useState)(cachedUsers !== null ? { users: cachedUsers, isLoading: false } : { users: [], isLoading: false });
+    const fetchUsers = (next = api_services_1.Endpoints.UserAutocomplete.url(), searchParam) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const response = yield api_services_1.http.request({
+            url: next,
+            method: api_services_1.Endpoints.UserAutocomplete.method,
+            params: searchParam ? { search: searchParam } : undefined,
+        });
+        const data = response.data;
+        if (data.next) {
+            return data.results.concat(yield fetchUsers(data.next, searchParam));
+        }
+        return data.results;
+    });
+    (0, react_1.useEffect)(() => {
+        if (!search)
+            return;
+        if (cacheStrategy === utils_1.CacheStrategies.CACHE_FIRST && cachedUsers)
+            return;
+        fetchUsers(undefined, search)
+            .then((data) => {
+            setData({ users: data, isLoading: false });
+            utils_1.LRUCache.set(__usersCacheKey, data.map((u) => {
+                const __userCacheKey = (0, Cache_1.getUserObjectCacheKey)(u.id);
+                utils_1.LRUCache.set(__userCacheKey, u);
+                return u.id;
+            }));
+        })
+            .catch((error) => {
+            console.error(error);
+            utils_1.Logger.error(Errors_1.SCOPE_SC_CORE, 'Unable to retrieve users');
+            setData((prev) => (Object.assign(Object.assign({}, prev), { isLoading: false })));
+        });
+    }, [search]);
+    return data;
+};
+exports.default = useSCFetchUsers;

package/lib/cjs/hooks/useSCJoinedCoursesManager.d.ts

@@ -30,7 +30,7 @@ export default function useSCJoinedCoursesManager(user?: SCUserType): {
     isLoading: (v: number | {
         id: number;
     }) => boolean;
-    join: (course: SCCourseType, userId?: number) => Promise<any>;
+    join: (course: SCCourseType) => Promise<any>;
     leave: (course: SCCourseType) => Promise<any>;
     joinStatus: (course: SCCourseType) => string;
     refresh: () => void;

package/lib/cjs/hooks/useSCJoinedCoursesManager.js

@@ -36,21 +36,15 @@ function useSCJoinedCoursesManager(user) {
         Preferences_1.CONFIGURATIONS_COURSES_ENABLED in preferences &&
         preferences[Preferences_1.CONFIGURATIONS_COURSES_ENABLED].value, [preferences, features]);
     const notificationInvitedToJoinCourse = (0, react_1.useRef)(null);
-    const notificationRequestedToJoinCourse = (0, react_1.useRef)(null);
-    const notificationAcceptedToJoinCourse = (0, react_1.useRef)(null);
     const notificationAddedToCourse = (0, react_1.useRef)(null);
     /**
      * Subscribe to notification types user_follow, user_unfollow
      */
     (0, use_deep_compare_effect_1.useDeepCompareEffectNoCheck)(() => {
         notificationInvitedToJoinCourse.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_INVITED_TO_JOIN_COURSE}`, notificationSubscriber);
-        notificationRequestedToJoinCourse.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_COURSE}`, notificationSubscriber);
-        notificationAcceptedToJoinCourse.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_COURSE}`, notificationSubscriber);
         notificationAddedToCourse.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_ADDED_TO_COURSE}`, notificationSubscriber);
         return () => {
             pubsub_js_1.default.unsubscribe(notificationInvitedToJoinCourse.current);
-            pubsub_js_1.default.unsubscribe(notificationRequestedToJoinCourse.current);
-            pubsub_js_1.default.unsubscribe(notificationAcceptedToJoinCourse.current);
             pubsub_js_1.default.unsubscribe(notificationAddedToCourse.current);
         };
     }, [data]);
@@ -60,20 +54,20 @@ function useSCJoinedCoursesManager(user) {
      * @param dataMsg
      */
     const notificationSubscriber = (msg, dataMsg) => {
+        var _a;
         if (dataMsg.data.course !== undefined) {
             let _status;
             switch (Notification_1.SCNotificationMapping[dataMsg.data.activity_type]) {
                 case types_1.SCNotificationTypologyType.USER_INVITED_TO_JOIN_COURSE:
                     _status = types_1.SCCourseJoinStatusType.INVITED;
                     break;
-                case types_1.SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_COURSE:
-                    _status = types_1.SCCourseJoinStatusType.REQUESTED;
-                    break;
-                case types_1.SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_COURSE:
-                    _status = types_1.SCCourseJoinStatusType.JOINED;
-                    break;
                 case types_1.SCNotificationTypologyType.USER_ADDED_TO_COURSE:
-                    _status = types_1.SCCourseJoinStatusType.JOINED;
+                    if (dataMsg.data.notification_obj.course && ((_a = dataMsg.data.notification_obj.course.paywalls) === null || _a === void 0 ? void 0 : _a.length)) {
+                        _status = types_1.SCCourseJoinStatusType.PAYMENT_WAITING;
+                    }
+                    else {
+                        _status = types_1.SCCourseJoinStatusType.JOINED;
+                    }
                     break;
             }
             updateCache([dataMsg.data.course]);
@@ -92,8 +86,8 @@ function useSCJoinedCoursesManager(user) {
             // Only if user is authenticated
             api_services_1.http
                 .request({
-                url: api_services_1.Endpoints.GetJoinedCourses.url(),
-                method: api_services_1.Endpoints.GetJoinedCourses.method,
+                url: api_services_1.Endpoints.GetUserJoinedCourses.url({ id: user.id }),
+                method: api_services_1.Endpoints.GetUserJoinedCourses.method,
             })
                 .then((res) => {
                 if (res.status >= 300) {
@@ -114,67 +108,42 @@ function useSCJoinedCoursesManager(user) {
      * Memoized join Course
      * Toggle action
      */
-    const join = (0, react_1.useMemo)(() => (course, userId) => {
+    const join = (0, react_1.useMemo)(() => (course) => tslib_1.__awaiter(this, void 0, void 0, function* () {
         setLoading(course.id);
-        if (userId) {
-            return api_services_1.http
-                .request({
-                url: api_services_1.Endpoints.InviteOrAcceptUsersToCourse.url({ id: course.id }),
-                method: api_services_1.Endpoints.InviteOrAcceptUsersToCourse.method,
-                data: { users: [userId] },
-            })
-                .then((res) => {
-                if (res.status >= 300) {
-                    return Promise.reject(res);
-                }
-                updateCache([course.id]);
-                setData((prev) => getDataUpdated(prev, course.id, types_1.SCCourseJoinStatusType.JOINED));
-                setUnLoading(course.id);
-                return Promise.resolve(res.data);
-            });
-        }
-        else {
-            return api_services_1.http
-                .request({
-                url: api_services_1.Endpoints.JoinOrAcceptInviteToCourse.url({ id: course.id }),
-                method: api_services_1.Endpoints.JoinOrAcceptInviteToCourse.method,
-            })
-                .then((res) => {
-                if (res.status >= 300) {
-                    return Promise.reject(res);
-                }
-                updateCache([course.id]);
-                setData((prev) => getDataUpdated(prev, course.id, course.privacy === types_1.SCCoursePrivacyType.PRIVATE && course.join_status !== types_1.SCCourseJoinStatusType.INVITED
-                    ? types_1.SCCourseJoinStatusType.REQUESTED
-                    : types_1.SCCourseJoinStatusType.JOINED));
-                setUnLoading(course.id);
-                return Promise.resolve(res.data);
-            });
+        const res = yield api_services_1.http.request({
+            url: api_services_1.Endpoints.JoinOrAcceptInviteToCourse.url({ id: course.id }),
+            method: api_services_1.Endpoints.JoinOrAcceptInviteToCourse.method,
+        });
+        if (res.status >= 300) {
+            return Promise.reject(res);
         }
-    }, [data, loading, cache]);
+        updateCache([course.id]);
+        setData((prev) => getDataUpdated(prev, course.id, course.privacy === types_1.SCCoursePrivacyType.PRIVATE && course.join_status !== types_1.SCCourseJoinStatusType.INVITED
+            ? types_1.SCCourseJoinStatusType.REQUESTED
+            : types_1.SCCourseJoinStatusType.JOINED));
+        setUnLoading(course.id);
+        return yield Promise.resolve(res.data);
+    }), [data, loading, cache]);
     /**
      * Memoized leave Course
      * Toggle action
      */
-    const leave = (0, react_1.useMemo)(() => (course) => {
-        if (course.join_status !== types_1.SCCourseJoinStatusType.REQUESTED) {
+    const leave = (0, react_1.useMemo)(() => (course) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (data[course.id] !== types_1.SCCourseJoinStatusType.REQUESTED) {
             setLoading(course.id);
-            return api_services_1.http
-                .request({
+            const res = yield api_services_1.http.request({
                 url: api_services_1.Endpoints.LeaveOrRemoveCourseRequest.url({ id: course.id }),
                 method: api_services_1.Endpoints.LeaveOrRemoveCourseRequest.method,
-            })
-                .then((res) => {
-                if (res.status >= 300) {
-                    return Promise.reject(res);
-                }
-                updateCache([course.id]);
-                setData((prev) => getDataUpdated(prev, course.id, null));
-                setUnLoading(course.id);
-                return Promise.resolve(res.data);
             });
+            if (res.status >= 300) {
+                return Promise.reject(res);
+            }
+            updateCache([course.id]);
+            setData((prev) => getDataUpdated(prev, course.id, null));
+            setUnLoading(course.id);
+            return yield Promise.resolve(res.data);
         }
-    }, [data, loading, cache]);
+    }), [data, loading, cache]);
     /**
      * Check the authenticated user subscription status to the course
      * Update the courses cached
@@ -250,7 +219,7 @@ function useSCJoinedCoursesManager(user) {
         if (cache.includes(course.id)) {
             return getCurrentCourseCacheStatus(course);
         }
-        if (authUserId) {
+        if (authUserId && course) {
             if ('join_status' in course) {
                 return getJoinStatus(course);
             }
@@ -259,7 +228,7 @@ function useSCJoinedCoursesManager(user) {
             }
         }
         return null;
-    }, [loading, cache, authUserId]);
+    }, [loading, cache, authUserId, getJoinStatus, getCurrentCourseCacheStatus]);
     /**
      * Empty cache on logout
      */

package/lib/cjs/hooks/useSCPaymentsEnabled.d.ts

@@ -0,0 +1,18 @@
+/**
+ :::info
+ This custom hook is used to check if the payments are enabled
+ :::
+ :::tip How to use it:
+
+ Follow these steps:
+ ```jsx
+ 1. import useSCPaymentsEnabled from '@selfcommunity/react-core';
+ 2.	const {isPaymentsEnabled, stripePublicKey, stripeConnectedAccountId} = useSCPaymentsEnabled();
+ ```
+ :::
+ */
+export default function useSCPaymentsEnabled(): {
+    isPaymentsEnabled: any;
+    stripePublicKey: any;
+    stripeConnectedAccountId: any;
+};

package/lib/cjs/hooks/useSCPaymentsEnabled.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const react_1 = require("react");
+const types_1 = require("@selfcommunity/types");
+const SCPreferencesProvider_1 = require("../components/provider/SCPreferencesProvider");
+const SCPreferences = tslib_1.__importStar(require("../constants/Preferences"));
+/**
+ :::info
+ This custom hook is used to check if the payments are enabled
+ :::
+ :::tip How to use it:
+
+ Follow these steps:
+ ```jsx
+ 1. import useSCPaymentsEnabled from '@selfcommunity/react-core';
+ 2.	const {isPaymentsEnabled, stripePublicKey, stripeConnectedAccountId} = useSCPaymentsEnabled();
+ ```
+ :::
+ */
+function useSCPaymentsEnabled() {
+    // CONTEXT
+    const { preferences, features } = (0, SCPreferencesProvider_1.useSCPreferences)();
+    const isPaymentsEnabled = (0, react_1.useMemo)(() => preferences &&
+        features &&
+        features.includes(types_1.SCFeatureName.PAYMENTS) &&
+        SCPreferences.CONFIGURATIONS_PAYMENTS_ENABLED in preferences &&
+        preferences[SCPreferences.CONFIGURATIONS_PAYMENTS_ENABLED].value, [preferences]);
+    const stripePublicKey = (0, react_1.useMemo)(() => preferences && SCPreferences.STATIC_STRIPE_PUBLIC_KEY in preferences && preferences[SCPreferences.STATIC_STRIPE_PUBLIC_KEY].value, [preferences]);
+    const stripeConnectedAccountId = (0, react_1.useMemo)(() => preferences &&
+        SCPreferences.CONFIGURATIONS_STRIPE_CONNECTED_ACCOUNT_ID in preferences &&
+        preferences[SCPreferences.CONFIGURATIONS_STRIPE_CONNECTED_ACCOUNT_ID].value, [preferences]);
+    return { isPaymentsEnabled, stripePublicKey, stripeConnectedAccountId };
+}
+exports.default = useSCPaymentsEnabled;

package/lib/cjs/hooks/useSCPreferenceEnabled.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Custom hook to check if a given preference is present and has a value.
+ * @param preference - full preference key (e.g., 'section.name')
+ * @returns boolean - true if the preference exists and has a value
+ */
+export default function useSCPreferenceEnabled(preference: string): boolean;

package/lib/cjs/hooks/useSCPreferenceEnabled.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = require("react");
+const SCPreferencesProvider_1 = require("../components/provider/SCPreferencesProvider");
+/**
+ * Custom hook to check if a given preference is present and has a value.
+ * @param preference - full preference key (e.g., 'section.name')
+ * @returns boolean - true if the preference exists and has a value
+ */
+function useSCPreferenceEnabled(preference) {
+    const { preferences } = (0, SCPreferencesProvider_1.useSCPreferences)();
+    return (0, react_1.useMemo)(() => {
+        return preferences && preference in preferences && preferences[preference].value;
+    }, [preferences, preference]);
+}
+exports.default = useSCPreferenceEnabled;

package/lib/cjs/hooks/useSCSubscribedEventsManager.js

@@ -37,21 +37,17 @@ function useSCSubscribedEventsManager(user) {
         Preferences_1.CONFIGURATIONS_EVENTS_ENABLED in preferences &&
         preferences[Preferences_1.CONFIGURATIONS_EVENTS_ENABLED].value, [preferences, features]);
     const notificationInvitedToJoinEvent = (0, react_1.useRef)(null);
-    const notificationRequestedToJoinEvent = (0, react_1.useRef)(null);
-    const notificationAcceptedToJoinEvent = (0, react_1.useRef)(null);
+    // const notificationRequestedToJoinEvent = useRef(null);
+    // const notificationAcceptedToJoinEvent = useRef(null);
     const notificationAddedToEvent = (0, react_1.useRef)(null);
     /**
      * Subscribe to notification types user_follow, user_unfollow
      */
     (0, use_deep_compare_effect_1.useDeepCompareEffectNoCheck)(() => {
         notificationInvitedToJoinEvent.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_INVITED_TO_JOIN_EVENT}`, notificationSubscriber);
-        notificationRequestedToJoinEvent.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_EVENT}`, notificationSubscriber);
-        notificationAcceptedToJoinEvent.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_EVENT}`, notificationSubscriber);
         notificationAddedToEvent.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_ADDED_TO_EVENT}`, notificationSubscriber);
         return () => {
             pubsub_js_1.default.unsubscribe(notificationInvitedToJoinEvent.current);
-            pubsub_js_1.default.unsubscribe(notificationRequestedToJoinEvent.current);
-            pubsub_js_1.default.unsubscribe(notificationAcceptedToJoinEvent.current);
             pubsub_js_1.default.unsubscribe(notificationAddedToEvent.current);
         };
     }, [data]);
@@ -67,12 +63,6 @@ function useSCSubscribedEventsManager(user) {
                 case types_1.SCNotificationTypologyType.USER_INVITED_TO_JOIN_EVENT:
                     _status = types_1.SCEventSubscriptionStatusType.INVITED;
                     break;
-                case types_1.SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_EVENT:
-                    _status = types_1.SCEventSubscriptionStatusType.REQUESTED;
-                    break;
-                case types_1.SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_EVENT:
-                    _status = types_1.SCEventSubscriptionStatusType.SUBSCRIBED;
-                    break;
                 case types_1.SCNotificationTypologyType.USER_ADDED_TO_EVENT:
                     _status = types_1.SCEventSubscriptionStatusType.SUBSCRIBED;
                     break;
@@ -93,8 +83,8 @@ function useSCSubscribedEventsManager(user) {
             // Only if user is authenticated
             api_services_1.http
                 .request({
-                url: api_services_1.Endpoints.GetUserEvents.url(),
-                method: api_services_1.Endpoints.GetUserEvents.method,
+                url: api_services_1.Endpoints.GetUserSubscribedEvents.url({ id: user.id }),
+                method: api_services_1.Endpoints.GetUserSubscribedEvents.method,
             })
                 .then((res) => {
                 if (res.status >= 300) {

package/lib/cjs/hooks/useSCSubscribedGroupsManager.d.ts

@@ -30,7 +30,7 @@ export default function useSCSubscribedGroupsManager(user?: SCUserType): {
     isLoading: (v: number | {
         id: number;
     }) => boolean;
-    subscribe: (group: SCGroupType, userId?: number) => Promise<any>;
+    subscribe: (group: SCGroupType) => Promise<any>;
     unsubscribe: (group: SCGroupType) => Promise<any>;
     subscriptionStatus: (group: SCGroupType) => string;
     refresh: () => void;

package/lib/cjs/hooks/useSCSubscribedGroupsManager.js

@@ -37,21 +37,15 @@ function useSCSubscribedGroupsManager(user) {
         Preferences_1.CONFIGURATIONS_GROUPS_ENABLED in preferences &&
         preferences[Preferences_1.CONFIGURATIONS_GROUPS_ENABLED].value, [preferences, features]);
     const notificationInvitedToJoinGroup = (0, react_1.useRef)(null);
-    const notificationRequestedToJoinGroup = (0, react_1.useRef)(null);
-    const notificationAcceptedToJoinGroup = (0, react_1.useRef)(null);
     const notificationAddedToGroup = (0, react_1.useRef)(null);
     /**
      * Subscribe to notification types user_follow, user_unfollow
      */
     (0, use_deep_compare_effect_1.useDeepCompareEffectNoCheck)(() => {
         notificationInvitedToJoinGroup.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_INVITED_TO_JOIN_GROUP}`, notificationSubscriber);
-        notificationRequestedToJoinGroup.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_GROUP}`, notificationSubscriber);
-        notificationAcceptedToJoinGroup.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_GROUP}`, notificationSubscriber);
         notificationAddedToGroup.current = pubsub_js_1.default.subscribe(`${types_1.SCNotificationTopicType.INTERACTION}.${types_1.SCNotificationTypologyType.USER_ADDED_TO_GROUP}`, notificationSubscriber);
         return () => {
             pubsub_js_1.default.unsubscribe(notificationInvitedToJoinGroup.current);
-            pubsub_js_1.default.unsubscribe(notificationRequestedToJoinGroup.current);
-            pubsub_js_1.default.unsubscribe(notificationAcceptedToJoinGroup.current);
             pubsub_js_1.default.unsubscribe(notificationAddedToGroup.current);
         };
     }, [data]);
@@ -61,20 +55,20 @@ function useSCSubscribedGroupsManager(user) {
      * @param dataMsg
      */
     const notificationSubscriber = (msg, dataMsg) => {
+        var _a;
         if (dataMsg.data.group !== undefined) {
             let _status;
             switch (Notification_1.SCNotificationMapping[dataMsg.data.activity_type]) {
                 case types_1.SCNotificationTypologyType.USER_INVITED_TO_JOIN_GROUP:
                     _status = types_1.SCGroupSubscriptionStatusType.INVITED;
                     break;
-                case types_1.SCNotificationTypologyType.USER_REQUESTED_TO_JOIN_GROUP:
-                    _status = types_1.SCGroupSubscriptionStatusType.REQUESTED;
-                    break;
-                case types_1.SCNotificationTypologyType.USER_ACCEPTED_TO_JOIN_GROUP:
-                    _status = types_1.SCGroupSubscriptionStatusType.SUBSCRIBED;
-                    break;
                 case types_1.SCNotificationTypologyType.USER_ADDED_TO_GROUP:
-                    _status = types_1.SCGroupSubscriptionStatusType.SUBSCRIBED;
+                    if (dataMsg.data.notification_obj.group && ((_a = dataMsg.data.notification_obj.group.paywalls) === null || _a === void 0 ? void 0 : _a.length)) {
+                        _status = types_1.SCGroupSubscriptionStatusType.PAYMENT_WAITING;
+                    }
+                    else {
+                        _status = types_1.SCGroupSubscriptionStatusType.SUBSCRIBED;
+                    }
                     break;
             }
             updateCache([dataMsg.data.group]);
@@ -93,8 +87,8 @@ function useSCSubscribedGroupsManager(user) {
             // Only if user is authenticated
             api_services_1.http
                 .request({
-                url: api_services_1.Endpoints.GetUserGroups.url(),
-                method: api_services_1.Endpoints.GetUserGroups.method,
+                url: api_services_1.Endpoints.GetUserSubscribedGroups.url({ id: user.id }),
+                method: api_services_1.Endpoints.GetUserSubscribedGroups.method,
             })
                 .then((res) => {
                 if (res.status >= 300) {
@@ -115,50 +109,31 @@ function useSCSubscribedGroupsManager(user) {
      * Memoized subscribe Group
      * Toggle action
      */
-    const subscribe = (0, react_1.useMemo)(() => (group, userId) => {
+    const subscribe = (0, react_1.useMemo)(() => (group) => {
         setLoading(group.id);
-        if (userId) {
-            return api_services_1.http
-                .request({
-                url: api_services_1.Endpoints.InviteOrAcceptGroupRequest.url({ id: group.id }),
-                method: api_services_1.Endpoints.InviteOrAcceptGroupRequest.method,
-                data: { users: [userId] },
-            })
-                .then((res) => {
-                if (res.status >= 300) {
-                    return Promise.reject(res);
-                }
-                updateCache([group.id]);
-                setData((prev) => getDataUpdated(prev, group.id, types_1.SCGroupSubscriptionStatusType.SUBSCRIBED));
-                setUnLoading(group.id);
-                return Promise.resolve(res.data);
-            });
-        }
-        else {
-            return api_services_1.http
-                .request({
-                url: api_services_1.Endpoints.SubscribeToGroup.url({ id: group.id }),
-                method: api_services_1.Endpoints.SubscribeToGroup.method,
-            })
-                .then((res) => {
-                if (res.status >= 300) {
-                    return Promise.reject(res);
-                }
-                updateCache([group.id]);
-                setData((prev) => getDataUpdated(prev, group.id, group.privacy === types_1.SCGroupPrivacyType.PRIVATE && group.subscription_status !== types_1.SCGroupSubscriptionStatusType.INVITED
-                    ? types_1.SCGroupSubscriptionStatusType.REQUESTED
-                    : types_1.SCGroupSubscriptionStatusType.SUBSCRIBED));
-                setUnLoading(group.id);
-                return Promise.resolve(res.data);
-            });
-        }
+        return api_services_1.http
+            .request({
+            url: api_services_1.Endpoints.SubscribeToGroup.url({ id: group.id }),
+            method: api_services_1.Endpoints.SubscribeToGroup.method,
+        })
+            .then((res) => {
+            if (res.status >= 300) {
+                return Promise.reject(res);
+            }
+            updateCache([group.id]);
+            setData((prev) => getDataUpdated(prev, group.id, group.privacy === types_1.SCGroupPrivacyType.PRIVATE && group.subscription_status !== types_1.SCGroupSubscriptionStatusType.INVITED
+                ? types_1.SCGroupSubscriptionStatusType.REQUESTED
+                : types_1.SCGroupSubscriptionStatusType.SUBSCRIBED));
+            setUnLoading(group.id);
+            return Promise.resolve(res.data);
+        });
     }, [data, loading, cache]);
     /**
      * Memoized subscribe Group
      * Toggle action
      */
     const unsubscribe = (0, react_1.useMemo)(() => (group) => {
-        if (group.subscription_status !== types_1.SCGroupSubscriptionStatusType.REQUESTED) {
+        if (data[group.id] !== types_1.SCGroupSubscriptionStatusType.REQUESTED) {
             setLoading(group.id);
             return api_services_1.http
                 .request({
@@ -251,7 +226,7 @@ function useSCSubscribedGroupsManager(user) {
         if (cache.includes(group.id)) {
             return getCurrentGroupCacheStatus(group);
         }
-        if (authUserId) {
+        if (authUserId && group) {
             if ('subscription_status' in group) {
                 return getSubscriptionStatus(group);
             }
@@ -260,7 +235,7 @@ function useSCSubscribedGroupsManager(user) {
             }
         }
         return null;
-    }, [loading, cache, authUserId]);
+    }, [loading, cache, authUserId, getSubscriptionStatus, getCurrentGroupCacheStatus]);
     /**
      * Empty cache on logout
      */

package/lib/cjs/hooks/useSCWebPushMessaging.js

@@ -7,7 +7,7 @@ const react_1 = require("react");
 const SCContextProvider_1 = require("../components/provider/SCContextProvider");
 const SCUserProvider_1 = require("../components/provider/SCUserProvider");
 const utils_1 = require("@selfcommunity/utils");
-const Button_1 = tslib_1.__importDefault(require("@mui/material/Button"));
+const material_1 = require("@mui/material");
 const utils_2 = require("@selfcommunity/utils");
 const Errors_1 = require("../constants/Errors");
 const api_services_1 = require("@selfcommunity/api-services");
@@ -61,7 +61,7 @@ function useSCWebPushMessaging() {
     const showCustomRequestNotificationSnackbar = () => {
         if (!js_cookie_1.default.get(Notifications_1.NOTIFICATIONS_WEB_PUSH_MESSAGING_DIALOG_COOKIE)) {
             enqueueSnackbar(intl.formatMessage({ id: 'ui.webPushNotification.requestPermission', defaultMessage: 'ui.webPushNotification.requestPermission' }), {
-                action: (snackbarId) => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Button_1.default, Object.assign({ size: "small", sx: { color: '#FFF' }, onClick: () => requestNotificationPermission(snackbarId) }, { children: intl.formatMessage({ id: 'ui.webPushNotification.allow', defaultMessage: 'ui.webPushNotification.allow' }) })), (0, jsx_runtime_1.jsx)(Button_1.default, Object.assign({ size: "small", sx: { color: '#FFF' }, onClick: () => closeRequestNotificationSnackbar(snackbarId) }, { children: intl.formatMessage({ id: 'ui.webPushNotification.block', defaultMessage: 'ui.webPushNotification.block' }) }))] })),
+                action: (snackbarId) => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, Object.assign({ size: "small", sx: { color: '#FFF' }, onClick: () => requestNotificationPermission(snackbarId) }, { children: intl.formatMessage({ id: 'ui.webPushNotification.allow', defaultMessage: 'ui.webPushNotification.allow' }) })), (0, jsx_runtime_1.jsx)(material_1.Button, Object.assign({ size: "small", sx: { color: '#FFF' }, onClick: () => closeRequestNotificationSnackbar(snackbarId) }, { children: intl.formatMessage({ id: 'ui.webPushNotification.block', defaultMessage: 'ui.webPushNotification.block' }) }))] })),
                 variant: 'default',
                 anchorOrigin: { horizontal: 'center', vertical: 'bottom' },
                 preventDuplicate: true,