@messenger-box/platform-mobile 10.0.3-alpha.40 → 10.0.3-alpha.46

package/src/screens/inbox/containers/ThreadsView.tsx

@@ -6,9 +6,9 @@ import { useNavigation, useRoute, useIsFocused, useFocusEffect } from '@react-na
 import { orderBy, uniqBy, startCase } from 'lodash-es';
 import {
     useThreadMessagesQuery,
-    OnThreadCreatedUpdatedDocument as THREAD_CHAT_ADDED,
-    useOnThreadCreatedUpdatedSubscription,
-} from 'common/graphql';
+    THREAD_CREATED_UPDATED,
+    useThreadCreatedUpdatedSubscription,
+} from '../../../queries/inboxQueries';
 import { userSelector } from '@adminide-stack/user-auth0-client';
 import { CHANGE_SETTINGS_ACTION } from '@admin-layout/client';
 import { ThreadViewItem } from '../components/ThreadsViewItem';
@@ -52,14 +52,14 @@ const ThreadsViewComponent = ({
     const [refreshing, setRefresh] = useState<boolean>(false);
 
     // Use thread subscription for real-time updates
-    const { data: threadCreatedUpdated } = useOnThreadCreatedUpdatedSubscription({
+    const { data: threadCreatedUpdated } = useThreadCreatedUpdatedSubscription({
         variables: { channelId: channelId?.toString() },
     });
 
     // Subscribe to thread updates
     const subscribeToNewMessages = useCallback(() => {
         return subscribeToMore({
-            document: THREAD_CHAT_ADDED,
+            document: THREAD_CREATED_UPDATED,
             variables: { channelId: channelId?.toString() },
             updateQuery: (prev: any, { subscriptionData }: any) => {
                 if (!subscriptionData.data) return prev;

package/src/screens/inbox/hooks/useInboxMessages.ts

@@ -0,0 +1,34 @@
+import { useCallback } from 'react';
+
+/**
+ * useInboxMessages - a generic hook for fetching and subscribing to messages
+ *
+ * @param useQueryHook - Apollo query hook (e.g., useChannelMessagesQuery)
+ * @param queryVariables - variables for the query
+ * @param subscriptionDocument - GraphQL subscription document
+ * @param subscriptionVariables - variables for the subscription
+ * @param updateQuery - Apollo updateQuery function (optional)
+ * @param onError - error handler (optional)
+ * @returns { data, loading, error, refetch, subscribe }
+ */
+export function useInboxMessages({
+    useQueryHook,
+    queryVariables,
+    subscriptionDocument,
+    subscriptionVariables,
+    updateQuery,
+    onError,
+}) {
+    const { data, loading, error, refetch, subscribeToMore } = useQueryHook(queryVariables);
+
+    const subscribe = useCallback(() => {
+        return subscribeToMore({
+            document: subscriptionDocument,
+            variables: subscriptionVariables,
+            updateQuery,
+            onError,
+        });
+    }, [subscribeToMore, subscriptionDocument, subscriptionVariables, updateQuery, onError]);
+
+    return { data, loading, error, refetch, subscribe };
+}

package/src/screens/inbox/machines/threadsMachine.ts

@@ -1,6 +1,6 @@
 import { orderBy, uniqBy } from 'lodash-es';
 import { config } from '../config';
-import { OnThreadCreatedUpdatedDocument as THREAD_CHAT_ADDED } from 'common/graphql';
+import { THREAD_CREATED_UPDATED } from '../../../queries/inboxQueries';
 
 const { MESSAGES_PER_PAGE } = config;
 
@@ -126,7 +126,7 @@ export const setupThreadSubscription = (
     if (!subscribeToMore || !channelId) return undefined;
 
     return subscribeToMore({
-        document: THREAD_CHAT_ADDED,
+        document: THREAD_CREATED_UPDATED,
         variables: { channelId: channelId?.toString() },
         updateQuery: (prev, { subscriptionData }) => {
             if (!subscriptionData?.data) return prev;