@planningcenter/chat-react-native 3.18.0-rc.0 → 3.18.0-rc.10

package/build/utils/cache/messages_cache.js

@@ -0,0 +1,89 @@
+import { deleteRecordInPagesData } from './page_mutations';
+import { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations';
+import { transformReactionEventDataToReactionCountResource } from '../jolt/transform_reaction_event_data_to_reaction_count_resource';
+import { getMessagesRequestArgs } from '../request/get_messages';
+import { getRequestQueryKey } from '../../hooks/use_suspense_api';
+export function updateCacheWithMessage(queryClient, queryKey, message, event) {
+    queryClient.setQueryData(queryKey, prev => {
+        if (event === 'message.created') {
+            // Before adding the new message, remove any pending temporary messages
+            // with matching text to prevent duplicates from race conditions
+            let dataAfterTempRemoval = prev;
+            if (prev && message.text && message.mine) {
+                dataAfterTempRemoval = deleteRecordInPagesData({
+                    data: prev,
+                    record: message,
+                    matchFn: (existingMessage, _record) => {
+                        return (isTemporaryMessageId(existingMessage.id) &&
+                            existingMessage.text === message.text &&
+                            existingMessage.mine);
+                    },
+                });
+            }
+            return updateOrCreateRecordInPagesData({
+                data: dataAfterTempRemoval,
+                record: message,
+                processRecord: (record, current) => {
+                    return { ...current, ...record };
+                },
+            });
+        }
+        else {
+            return updateRecordInPagesData({
+                data: prev,
+                record: message,
+                processRecord: (record, current) => {
+                    return { ...current, ...record };
+                },
+            });
+        }
+    });
+}
+export function updateCacheWithReaction(queryClient, queryKey, event, currentPersonId) {
+    const message = { id: event.data.data.message_sort_key };
+    queryClient.setQueryData(queryKey, prev => updateRecordInPagesData({
+        data: prev,
+        record: message,
+        processRecord: (record, oldMessage) => {
+            const reactionCounts = oldMessage.reactionCounts || [];
+            let foundMatch = false;
+            let newReactionCounts = reactionCounts.map(reactionCount => {
+                if (reactionCount.value === event.data.data.value) {
+                    foundMatch = true;
+                    return transformReactionEventDataToReactionCountResource({
+                        data: event.data.data,
+                        oldData: reactionCount,
+                        event: event.event,
+                        currentPersonId,
+                    });
+                }
+                return reactionCount;
+            });
+            if (!foundMatch) {
+                const newReactionCount = transformReactionEventDataToReactionCountResource({
+                    data: event.data.data,
+                    event: event.event,
+                    currentPersonId,
+                });
+                if (newReactionCount?.count) {
+                    newReactionCounts = [...newReactionCounts, newReactionCount];
+                }
+            }
+            return { ...oldMessage, reactionCounts: newReactionCounts };
+        },
+    }));
+}
+export function isTemporaryMessageId(messageId) {
+    return !!messageId && messageId.endsWith('-temp');
+}
+export function isNewMessage(message) {
+    return !message?.id || isTemporaryMessageId(message.id);
+}
+export function getThreadedMessagesQueryKey(conversationId, replyRootId) {
+    const requestArgs = getMessagesRequestArgs({
+        conversation_id: conversationId,
+        reply_root_id: replyRootId,
+    });
+    return getRequestQueryKey(requestArgs);
+}
+//# sourceMappingURL=messages_cache.js.map

package/build/utils/cache/messages_cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"messages_cache.js","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"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","sourcesContent":["import { InfiniteData, QueryClient } from '@tanstack/react-query'\nimport { ApiCollection, MessageResource } from '../../types'\nimport { deleteRecordInPagesData } from './page_mutations'\nimport { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations'\nimport { JoltReactionEvent } from '../../types/jolt_events'\nimport { transformReactionEventDataToReactionCountResource } from '../jolt/transform_reaction_event_data_to_reaction_count_resource'\nimport { getMessagesRequestArgs } from '../request/get_messages'\nimport { getRequestQueryKey } from '../../hooks/use_suspense_api'\n\nexport function updateCacheWithMessage(\n  queryClient: QueryClient,\n  queryKey: unknown[],\n  message: MessageResource,\n  event: 'message.created' | 'message.updated'\n) {\n  queryClient.setQueryData<MessagesQueryData>(queryKey, prev => {\n    if (event === 'message.created') {\n      // Before adding the new message, remove any pending temporary messages\n      // with matching text to prevent duplicates from race conditions\n      let dataAfterTempRemoval = prev\n      if (prev && message.text && message.mine) {\n        dataAfterTempRemoval = deleteRecordInPagesData({\n          data: prev,\n          record: message,\n          matchFn: (existingMessage, _record) => {\n            return (\n              isTemporaryMessageId(existingMessage.id) &&\n              existingMessage.text === message.text &&\n              existingMessage.mine\n            )\n          },\n        })\n      }\n\n      return updateOrCreateRecordInPagesData({\n        data: dataAfterTempRemoval,\n        record: message,\n        processRecord: (record, current) => {\n          return { ...current, ...record }\n        },\n      })\n    } else {\n      return updateRecordInPagesData({\n        data: prev,\n        record: message,\n        processRecord: (record, current) => {\n          return { ...current, ...record }\n        },\n      })\n    }\n  })\n}\n\nexport function updateCacheWithReaction(\n  queryClient: QueryClient,\n  queryKey: unknown[],\n  event: JoltReactionEvent,\n  currentPersonId: number\n) {\n  const message = { id: event.data.data.message_sort_key } as MessageResource\n  queryClient.setQueryData<MessagesQueryData>(queryKey, prev =>\n    updateRecordInPagesData({\n      data: prev,\n      record: message,\n      processRecord: (record, oldMessage) => {\n        const reactionCounts = oldMessage.reactionCounts || []\n        let foundMatch = false\n        let newReactionCounts = reactionCounts.map(reactionCount => {\n          if (reactionCount.value === event.data.data.value) {\n            foundMatch = true\n            return transformReactionEventDataToReactionCountResource({\n              data: event.data.data,\n              oldData: reactionCount,\n              event: event.event,\n              currentPersonId,\n            })\n          }\n          return reactionCount\n        })\n\n        if (!foundMatch) {\n          const newReactionCount = transformReactionEventDataToReactionCountResource({\n            data: event.data.data,\n            event: event.event,\n            currentPersonId,\n          })\n\n          if (newReactionCount?.count) {\n            newReactionCounts = [...newReactionCounts, newReactionCount]\n          }\n        }\n\n        return { ...oldMessage, reactionCounts: newReactionCounts }\n      },\n    })\n  )\n}\n\ntype MessagesQueryData = InfiniteData<ApiCollection<MessageResource>>\nexport function isTemporaryMessageId(messageId?: string | null): boolean {\n  return !!messageId && messageId.endsWith('-temp')\n}\nexport function isNewMessage(message?: MessageResource): boolean {\n  return !message?.id || isTemporaryMessageId(message.id)\n}\n\nexport function getThreadedMessagesQueryKey(conversationId: number, replyRootId: string) {\n  const requestArgs = getMessagesRequestArgs({\n    conversation_id: conversationId,\n    reply_root_id: replyRootId,\n  })\n  return getRequestQueryKey(requestArgs)\n}\n"]}

package/build/utils/cache/optimistically_create_message.d.ts

@@ -1,10 +1,11 @@
 import { CurrentPersonResource, MessageResource } from '../../types';
 import { DenormalizedAttachmentResourceForCreate } from '../../types/resources/denormalized_attachment_resource_for_create';
-export declare function optimisticallyCreateMessage({ conversationId, text, attachments, currentPerson, message, }: {
+export declare function optimisticallyCreateMessage({ conversationId, text, attachments, currentPerson, message, replyRootId, }: {
     conversationId: number;
     text: string;
     attachments?: DenormalizedAttachmentResourceForCreate[];
     currentPerson: CurrentPersonResource;
     message?: MessageResource;
+    replyRootId?: string | null;
 }): MessageResource;
 //# sourceMappingURL=optimistically_create_message.d.ts.map

package/build/utils/cache/optimistically_create_message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optimistically_create_message.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/optimistically_create_message.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,qBAAqB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAKnF,OAAO,EAAE,uCAAuC,EAAE,MAAM,mEAAmE,CAAA;AAI3H,wBAAgB,2BAA2B,CAAC,EAC1C,cAAc,EACd,IAAI,EACJ,WAAW,EACX,aAAa,EACb,OAAO,GACR,EAAE;IACD,cAAc,EAAE,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,uCAAuC,EAAE,CAAA;IACvD,aAAa,EAAE,qBAAqB,CAAA;IACpC,OAAO,CAAC,EAAE,eAAe,CAAA;CAC1B,mBA4CA"}
+{"version":3,"file":"optimistically_create_message.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/optimistically_create_message.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,qBAAqB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAKnF,OAAO,EAAE,uCAAuC,EAAE,MAAM,mEAAmE,CAAA;AAI3H,wBAAgB,2BAA2B,CAAC,EAC1C,cAAc,EACd,IAAI,EACJ,WAAW,EACX,aAAa,EACb,OAAO,EACP,WAAW,GACZ,EAAE;IACD,cAAc,EAAE,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,uCAAuC,EAAE,CAAA;IACvD,aAAa,EAAE,qBAAqB,CAAA;IACpC,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC5B,mBA+CA"}

package/build/utils/cache/optimistically_create_message.js

@@ -3,7 +3,7 @@ import { chatQueryClient } from '../../contexts/api_provider';
 import { updateOrCreateRecordInPagesData } from './page_mutations';
 import { convertAttachmentsForCreate } from '../convert_attachments_for_create';
 import { generatePlaceholderUlid } from '../generate_placeholder_ulid';
-export function optimisticallyCreateMessage({ conversationId, text, attachments, currentPerson, message, }) {
+export function optimisticallyCreateMessage({ conversationId, text, attachments, currentPerson, message, replyRootId, }) {
     const id = message?.id || generateTempMessageId();
     // Convert attachments to denormalized format for optimistic UI
     const decoratedAttachments = convertAttachmentsForCreate(attachments || []);
@@ -28,9 +28,12 @@ export function optimisticallyCreateMessage({ conversationId, text, attachments,
         lastInGroup: true,
         pending: true,
         replyCount: 0,
-        replyRootId: null,
+        replyRootId: replyRootId || null,
     };
-    const queryKey = getMessagesQueryKey({ conversation_id: conversationId });
+    const queryKey = getMessagesQueryKey({
+        conversation_id: conversationId,
+        reply_root_id: replyRootId,
+    });
     chatQueryClient.setQueryData(queryKey, data => updateOrCreateRecordInPagesData({
         data,
         record: optimisticMessage,

package/build/utils/cache/optimistically_create_message.js.map

@@ -1 +1 @@
-{"version":3,"file":"optimistically_create_message.js","sourceRoot":"","sources":["../../../src/utils/cache/optimistically_create_message.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,+BAA+B,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAA;AAG/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAEtE,MAAM,UAAU,2BAA2B,CAAC,EAC1C,cAAc,EACd,IAAI,EACJ,WAAW,EACX,aAAa,EACb,OAAO,GAOR;IACC,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,IAAI,qBAAqB,EAAE,CAAA;IAEjD,+DAA+D;IAC/D,MAAM,oBAAoB,GAAqC,2BAA2B,CACxF,WAAW,IAAI,EAAE,CAClB,CAAA;IAED,+BAA+B;IAC/B,MAAM,iBAAiB,GAAoB;QACzC,GAAG,OAAO;QACV,IAAI,EAAE,SAAS;QACf,EAAE;QACF,IAAI;QACJ,IAAI,EAAE,EAAE,EAAE,2BAA2B;QACrC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS,EAAE,IAAI;QACf,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,oBAAoB;QACjC,oBAAoB,EAAE,WAAW,IAAI,EAAE;QACvC,MAAM,EAAE,aAAa;QACrB,cAAc,EAAE,EAAE;QAClB,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,IAAI;QAChB,sBAAsB,EAAE,IAAI;QAC5B,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,IAAI;KAClB,CAAA;IAID,MAAM,QAAQ,GAAG,mBAAmB,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAA;IAEzE,eAAe,CAAC,YAAY,CAAY,QAAQ,EAAE,IAAI,CAAC,EAAE,CACvD,+BAA+B,CAAC;QAC9B,IAAI;QACJ,MAAM,EAAE,iBAAoC;KAC7C,CAAC,CACH,CAAA;IAED,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AAED,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACjC,0FAA0F;IAC1F,sEAAsE;IACtE,OAAO,GAAG,uBAAuB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,OAAO,CAAA;AAC9D,CAAC,CAAA","sourcesContent":["import { InfiniteData } from '@tanstack/react-query'\nimport { ApiCollection, CurrentPersonResource, MessageResource } from '../../types'\nimport { getMessagesQueryKey } from '../../utils/request/get_messages'\nimport { chatQueryClient } from '../../contexts/api_provider'\nimport { updateOrCreateRecordInPagesData } from './page_mutations'\nimport { convertAttachmentsForCreate } from '../convert_attachments_for_create'\nimport { DenormalizedAttachmentResourceForCreate } from '../../types/resources/denormalized_attachment_resource_for_create'\nimport { DenormalizedAttachmentResource } from '../../types/resources/denormalized_attachment_resource'\nimport { generatePlaceholderUlid } from '../generate_placeholder_ulid'\n\nexport function optimisticallyCreateMessage({\n  conversationId,\n  text,\n  attachments,\n  currentPerson,\n  message,\n}: {\n  conversationId: number\n  text: string\n  attachments?: DenormalizedAttachmentResourceForCreate[]\n  currentPerson: CurrentPersonResource\n  message?: MessageResource\n}) {\n  const id = message?.id || generateTempMessageId()\n\n  // Convert attachments to denormalized format for optimistic UI\n  const decoratedAttachments: DenormalizedAttachmentResource[] = convertAttachmentsForCreate(\n    attachments || []\n  )\n\n  // Create an optimistic message\n  const optimisticMessage: MessageResource = {\n    ...message,\n    type: 'Message',\n    id,\n    text,\n    html: '', // Will be filled by server\n    createdAt: new Date().toISOString(),\n    deletedAt: null,\n    textEditedAt: null,\n    mine: true,\n    attachments: decoratedAttachments,\n    attachmentsForCreate: attachments || [],\n    author: currentPerson,\n    reactionCounts: [],\n    renderAuthor: false,\n    renderTime: true,\n    myLatestInConversation: true,\n    lastInGroup: true,\n    pending: true,\n    replyCount: 0,\n    replyRootId: null,\n  }\n\n  // Add the optimistic message to the cache\n  type QueryData = InfiniteData<ApiCollection<MessageResource>>\n  const queryKey = getMessagesQueryKey({ conversation_id: conversationId })\n\n  chatQueryClient.setQueryData<QueryData>(queryKey, data =>\n    updateOrCreateRecordInPagesData({\n      data,\n      record: optimisticMessage as MessageResource,\n    })\n  )\n\n  return optimisticMessage\n}\n\nconst generateTempMessageId = () => {\n  // Put it 5 seconds in the future to account for server lag of previously created messages\n  // that are still pending. This gets overwritten by the server anyway.\n  return `${generatePlaceholderUlid({ offsetMs: 5000 })}-temp`\n}\n"]}
+{"version":3,"file":"optimistically_create_message.js","sourceRoot":"","sources":["../../../src/utils/cache/optimistically_create_message.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,+BAA+B,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAA;AAG/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAEtE,MAAM,UAAU,2BAA2B,CAAC,EAC1C,cAAc,EACd,IAAI,EACJ,WAAW,EACX,aAAa,EACb,OAAO,EACP,WAAW,GAQZ;IACC,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,IAAI,qBAAqB,EAAE,CAAA;IAEjD,+DAA+D;IAC/D,MAAM,oBAAoB,GAAqC,2BAA2B,CACxF,WAAW,IAAI,EAAE,CAClB,CAAA;IAED,+BAA+B;IAC/B,MAAM,iBAAiB,GAAoB;QACzC,GAAG,OAAO;QACV,IAAI,EAAE,SAAS;QACf,EAAE;QACF,IAAI;QACJ,IAAI,EAAE,EAAE,EAAE,2BAA2B;QACrC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS,EAAE,IAAI;QACf,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,oBAAoB;QACjC,oBAAoB,EAAE,WAAW,IAAI,EAAE;QACvC,MAAM,EAAE,aAAa;QACrB,cAAc,EAAE,EAAE;QAClB,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,IAAI;QAChB,sBAAsB,EAAE,IAAI;QAC5B,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,WAAW,IAAI,IAAI;KACjC,CAAA;IAID,MAAM,QAAQ,GAAG,mBAAmB,CAAC;QACnC,eAAe,EAAE,cAAc;QAC/B,aAAa,EAAE,WAAW;KAC3B,CAAC,CAAA;IAEF,eAAe,CAAC,YAAY,CAAY,QAAQ,EAAE,IAAI,CAAC,EAAE,CACvD,+BAA+B,CAAC;QAC9B,IAAI;QACJ,MAAM,EAAE,iBAAoC;KAC7C,CAAC,CACH,CAAA;IAED,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AAED,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACjC,0FAA0F;IAC1F,sEAAsE;IACtE,OAAO,GAAG,uBAAuB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,OAAO,CAAA;AAC9D,CAAC,CAAA","sourcesContent":["import { InfiniteData } from '@tanstack/react-query'\nimport { ApiCollection, CurrentPersonResource, MessageResource } from '../../types'\nimport { getMessagesQueryKey } from '../../utils/request/get_messages'\nimport { chatQueryClient } from '../../contexts/api_provider'\nimport { updateOrCreateRecordInPagesData } from './page_mutations'\nimport { convertAttachmentsForCreate } from '../convert_attachments_for_create'\nimport { DenormalizedAttachmentResourceForCreate } from '../../types/resources/denormalized_attachment_resource_for_create'\nimport { DenormalizedAttachmentResource } from '../../types/resources/denormalized_attachment_resource'\nimport { generatePlaceholderUlid } from '../generate_placeholder_ulid'\n\nexport function optimisticallyCreateMessage({\n  conversationId,\n  text,\n  attachments,\n  currentPerson,\n  message,\n  replyRootId,\n}: {\n  conversationId: number\n  text: string\n  attachments?: DenormalizedAttachmentResourceForCreate[]\n  currentPerson: CurrentPersonResource\n  message?: MessageResource\n  replyRootId?: string | null\n}) {\n  const id = message?.id || generateTempMessageId()\n\n  // Convert attachments to denormalized format for optimistic UI\n  const decoratedAttachments: DenormalizedAttachmentResource[] = convertAttachmentsForCreate(\n    attachments || []\n  )\n\n  // Create an optimistic message\n  const optimisticMessage: MessageResource = {\n    ...message,\n    type: 'Message',\n    id,\n    text,\n    html: '', // Will be filled by server\n    createdAt: new Date().toISOString(),\n    deletedAt: null,\n    textEditedAt: null,\n    mine: true,\n    attachments: decoratedAttachments,\n    attachmentsForCreate: attachments || [],\n    author: currentPerson,\n    reactionCounts: [],\n    renderAuthor: false,\n    renderTime: true,\n    myLatestInConversation: true,\n    lastInGroup: true,\n    pending: true,\n    replyCount: 0,\n    replyRootId: replyRootId || null,\n  }\n\n  // Add the optimistic message to the cache\n  type QueryData = InfiniteData<ApiCollection<MessageResource>>\n  const queryKey = getMessagesQueryKey({\n    conversation_id: conversationId,\n    reply_root_id: replyRootId,\n  })\n\n  chatQueryClient.setQueryData<QueryData>(queryKey, data =>\n    updateOrCreateRecordInPagesData({\n      data,\n      record: optimisticMessage as MessageResource,\n    })\n  )\n\n  return optimisticMessage\n}\n\nconst generateTempMessageId = () => {\n  // Put it 5 seconds in the future to account for server lag of previously created messages\n  // that are still pending. This gets overwritten by the server anyway.\n  return `${generatePlaceholderUlid({ offsetMs: 5000 })}-temp`\n}\n"]}

package/build/utils/index.d.ts

@@ -9,5 +9,4 @@ export * from './pluralize';
 export * from './destructure_chat_group_graph_id';
 export * from './convert_attachments_for_create';
 export * from './assert_keys_are_numbers';
-export * from './replies_local_feature_flag';
 //# sourceMappingURL=index.d.ts.map

package/build/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,mCAAmC,CAAA;AACjD,cAAc,kCAAkC,CAAA;AAChD,cAAc,2BAA2B,CAAA;AACzC,cAAc,8BAA8B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,mCAAmC,CAAA;AACjD,cAAc,kCAAkC,CAAA;AAChD,cAAc,2BAA2B,CAAA"}

package/build/utils/index.js

@@ -9,5 +9,4 @@ export * from './pluralize';
 export * from './destructure_chat_group_graph_id';
 export * from './convert_attachments_for_create';
 export * from './assert_keys_are_numbers';
-export * from './replies_local_feature_flag';
 //# sourceMappingURL=index.js.map

package/build/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,mCAAmC,CAAA;AACjD,cAAc,kCAAkC,CAAA;AAChD,cAAc,2BAA2B,CAAA;AACzC,cAAc,8BAA8B,CAAA","sourcesContent":["export * from './session'\nexport * from './theme'\nexport * from './styles'\nexport * from './client'\nexport * from './uri'\nexport * from './cache'\nexport * from './native_adapters'\nexport * from './pluralize'\nexport * from './destructure_chat_group_graph_id'\nexport * from './convert_attachments_for_create'\nexport * from './assert_keys_are_numbers'\nexport * from './replies_local_feature_flag'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,mBAAmB,CAAA;AACjC,cAAc,aAAa,CAAA;AAC3B,cAAc,mCAAmC,CAAA;AACjD,cAAc,kCAAkC,CAAA;AAChD,cAAc,2BAA2B,CAAA","sourcesContent":["export * from './session'\nexport * from './theme'\nexport * from './styles'\nexport * from './client'\nexport * from './uri'\nexport * from './cache'\nexport * from './native_adapters'\nexport * from './pluralize'\nexport * from './destructure_chat_group_graph_id'\nexport * from './convert_attachments_for_create'\nexport * from './assert_keys_are_numbers'\n"]}

package/build/utils/request/get_features.d.ts

@@ -0,0 +1,11 @@
+export declare const getFeaturesRequestArgs: () => {
+    url: string;
+    data: {
+        perPage: number;
+        fields: {
+            Feature: string[];
+        };
+    };
+};
+export declare const getFeaturesQueryKey: () => import("../../hooks/use_suspense_api").RequestQueryKey;
+//# sourceMappingURL=get_features.d.ts.map

package/build/utils/request/get_features.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get_features.d.ts","sourceRoot":"","sources":["../../../src/utils/request/get_features.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB;;;;;;;;CAYlC,CAAA;AAED,eAAO,MAAM,mBAAmB,8DAG/B,CAAA"}

package/build/utils/request/get_features.js

@@ -0,0 +1,18 @@
+import { getRequestQueryKey } from '../../hooks/use_suspense_api';
+export const getFeaturesRequestArgs = () => {
+    const url = '/me/features';
+    return {
+        url,
+        data: {
+            perPage: 100,
+            fields: {
+                Feature: ['name', 'enabled'],
+            },
+        },
+    };
+};
+export const getFeaturesQueryKey = () => {
+    const requestArgs = getFeaturesRequestArgs();
+    return getRequestQueryKey(requestArgs);
+};
+//# sourceMappingURL=get_features.js.map

package/build/utils/request/get_features.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get_features.js","sourceRoot":"","sources":["../../../src/utils/request/get_features.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,EAAE;IACzC,MAAM,GAAG,GAAG,cAAc,CAAA;IAE1B,OAAO;QACL,GAAG;QACH,IAAI,EAAE;YACJ,OAAO,EAAE,GAAG;YACZ,MAAM,EAAE;gBACN,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;aAC7B;SACF;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,WAAW,GAAG,sBAAsB,EAAE,CAAA;IAC5C,OAAO,kBAAkB,CAAC,WAAW,CAAC,CAAA;AACxC,CAAC,CAAA","sourcesContent":["import { getRequestQueryKey } from '../../hooks/use_suspense_api'\n\nexport const getFeaturesRequestArgs = () => {\n  const url = '/me/features'\n\n  return {\n    url,\n    data: {\n      perPage: 100,\n      fields: {\n        Feature: ['name', 'enabled'],\n      },\n    },\n  }\n}\n\nexport const getFeaturesQueryKey = () => {\n  const requestArgs = getFeaturesRequestArgs()\n  return getRequestQueryKey(requestArgs)\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "3.18.0-rc.0",
+  "version": "3.18.0-rc.10",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -29,7 +29,6 @@
     "@react-navigation/elements": "*",
     "@react-navigation/native": ">=7.0.0",
     "@react-navigation/native-stack": ">=7.0.0",
-    "@shopify/flash-list": "<2.0.0",
     "@tanstack/react-query": "^5.0.0",
     "color": "^3.1.2",
     "lodash": "*",
@@ -59,5 +58,5 @@
     "react-native-url-polyfill": "^2.0.0",
     "typescript": "<5.6.0"
   },
-  "gitHead": "287575911f3f115e39925babf52624759860167a"
+  "gitHead": "20b1107e3efd3b9e108ccaada901e34ab49546fa"
 }

package/src/components/conversation/message.tsx

@@ -22,11 +22,12 @@ import {
 import Animated from 'react-native-reanimated'
 import { useLiveRelativeTime } from '../../hooks/use_live_relative_time'
 import { MessageReadReceipts } from './message_read_receipts'
-import { isNewMessage, useMessageCreateOrUpdate } from '../../hooks/use_message_create_or_update'
+import { useMessageCreateOrUpdate } from '../../hooks/use_message_create_or_update'
 import { Haptic } from '../../utils/native_adapters'
 import { TheirReplyConnector, MyReplyConnector, AVATAR_CONNECTOR_SPACING } from './reply_connectors'
-import { pluralize, REPLIES_FEATURE_ENABLED } from '../../utils'
+import { pluralize } from '../../utils'
 import { useConversationMessage } from '../../hooks/use_conversation_message'
+import { isNewMessage } from '../../utils/cache/messages_cache'
 
 /** Message
  * Component for display of a message within a conversation list
@@ -36,6 +37,7 @@ interface MessageProps extends MessageResource {
   conversation_id: number
   latestReadMessageSortKey?: string
   inReplyScreen?: boolean
+  repliesEnabled?: boolean
 }
 
 export function Message({
@@ -43,6 +45,7 @@ export function Message({
   conversation_id,
   latestReadMessageSortKey,
   inReplyScreen,
+  repliesEnabled,
   ...message
 }: MessageProps) {
   const { text, reactionCounts, pending, error } = message
@@ -73,11 +76,10 @@ export function Message({
 
   const renderAuthor = (!message.mine && message.renderAuthor) || false
   const showReplyCountButton =
-    !inReplyScreen && message.replyRootId === message.id && REPLIES_FEATURE_ENABLED
+    !inReplyScreen && message.replyRootId === message.id && repliesEnabled
   const isReplyRootMessage = message.replyRootId === message.id
   const isDeletedReplyRootMessage = isReplyRootMessage && !!message.deletedAt
 
-  const messageText = isDeletedReplyRootMessage ? 'Message deleted' : text
   const replyCountText = pluralize(message.replyCount, 'reply')
   const messagePendingLabel = isPersisted ? 'Saving' : 'Sending'
   const replyRootAuthorName = message.replyRootId
@@ -115,6 +117,10 @@ export function Message({
     }
   }
 
+  const handleMessagePress = () => {
+    setShowMessageMetaToggle(!showMessageMetaToggle)
+  }
+
   const handleMessageLongPress = () => {
     if (!isPersisted) return
 
@@ -127,6 +133,7 @@ export function Message({
       reply_root_author_name: replyRootAuthorName,
     })
   }
+
   const handleReactionLongPress = (reaction: ReactionCountResource) => {
     Haptic.impactLight()
     navigation.navigate('Reactions', {
@@ -159,11 +166,12 @@ export function Message({
   return (
     <Pressable
       onLongPress={handleMessageLongPress}
-      onPress={() => setShowMessageMetaToggle(!showMessageMetaToggle)}
+      onPress={handleMessagePress}
       onPressIn={handleMessagePressIn}
       onPressOut={handleMessagePressOut}
       android_ripple={{ color: colors.androidRippleNeutral, borderless: false, foreground: true }}
       accessibilityHint="Long press to view message actions like reacting and copying."
+      disabled={isDeletedReplyRootMessage}
     >
       <Animated.View style={[styles.message, animatedBackgroundColor]}>
         {!message.mine && (
@@ -181,11 +189,13 @@ export function Message({
             ) : (
               <View style={styles.avatarPlaceholder} />
             )}
-            <TheirReplyConnector message={message} messageBubbleHeight={messageBubbleHeight} />
+            {repliesEnabled && (
+              <TheirReplyConnector message={message} messageBubbleHeight={messageBubbleHeight} />
+            )}
           </View>
         )}
         <View style={[styles.messageContent, { marginBottom: messageBottomMargin }]}>
-          {renderAuthor && (
+          {renderAuthor && !isDeletedReplyRootMessage && (
             <Text variant="footnote" style={styles.authorName}>
               {message.author.name}
             </Text>
@@ -194,18 +204,26 @@ export function Message({
             style={styles.messageBubble}
             onLayout={e => setMessageBubbleHeight(e.nativeEvent.layout.height)}
           >
-            <ErrorBoundary>
-              <MessageAttachments
-                attachments={message.attachments}
-                metaProps={metaProps}
-                onMessageAttachmentLongPress={handleMessageAttachmentLongPress}
-                onMessageLongPress={handleMessageLongPress}
-              />
-            </ErrorBoundary>
-            {messageText && (
+            {isDeletedReplyRootMessage ? (
               <View style={styles.messageText}>
-                <MessageMarkdown text={messageText} />
+                <Text style={styles.replyRootDeletedText}>Message deleted</Text>
               </View>
+            ) : (
+              <>
+                <ErrorBoundary>
+                  <MessageAttachments
+                    attachments={message.attachments}
+                    metaProps={metaProps}
+                    onMessageAttachmentLongPress={handleMessageAttachmentLongPress}
+                    onMessageLongPress={handleMessageLongPress}
+                  />
+                </ErrorBoundary>
+                {text && (
+                  <View style={styles.messageText}>
+                    <MessageMarkdown text={text} />
+                  </View>
+                )}
+              </>
             )}
           </View>
           {showReplyCountButton && (
@@ -219,7 +237,7 @@ export function Message({
               {replyCountText}
             </TextButton>
           )}
-          {hasReactions && (
+          {hasReactions && !isDeletedReplyRootMessage && (
             <View style={styles.messageReactions}>
               {reactionCounts.map(reaction => (
                 <MessageReaction
@@ -232,7 +250,7 @@ export function Message({
               ))}
             </View>
           )}
-          {showMessageMeta && (
+          {showMessageMeta && !isDeletedReplyRootMessage && (
             <View style={styles.messageMeta}>
               {message.mine && !pending && !error && (
                 <MessageReadReceipts
@@ -282,7 +300,7 @@ export function Message({
             </View>
           )}
         </View>
-        {message.mine && (
+        {repliesEnabled && message.mine && (
           <MyReplyConnector message={message} messageBubbleHeight={messageBubbleHeight} />
         )}
       </Animated.View>
@@ -360,5 +378,9 @@ const useMessageStyles = ({ mine }: MessageResource) => {
     errorText: {
       color: colors.statusErrorText,
     },
+    replyRootDeletedText: {
+      color: colors.textColorDefaultSecondary,
+      fontStyle: 'italic',
+    },
   })
 }

package/src/components/conversation/message_form.tsx

@@ -1,9 +1,4 @@
-import {
-  RouteProp,
-  useNavigation,
-  useTheme as useNavigationTheme,
-  useRoute,
-} from '@react-navigation/native'
+import { useNavigation, useTheme as useNavigationTheme, useRoute } from '@react-navigation/native'
 import React, { useCallback, useContext, useEffect, useState } from 'react'
 import {
   Platform,
@@ -30,10 +25,10 @@ import { ChatContext } from '../../contexts/chat_context'
 import { Haptic, ImagePicker, ImagePickerResult } from '../../utils/native_adapters'
 import {
   MAX_FONT_SIZE_MULTIPLIER_LANDMARK,
-  REPLIES_FEATURE_ENABLED,
   platformFontWeightMedium,
   platformPressedOpacityStyle,
 } from '../../utils'
+import { availableFeatures, useFeatures } from '../../hooks/use_features'
 import { useAttachmentUploader } from '../../hooks/use_attachment_uploader'
 import { useMessageDraft } from '../../hooks/use_message_draft'
 import {
@@ -319,9 +314,7 @@ function MessageFormInput() {
     React.useContext(MessageFormContext)
   const attachmentError = attachmentUploader?.errorMessage
 
-  const route = useRoute<RouteProp<ConversationScreenProps['route']>>()
-  const conversationId = route.params.conversation_id
-  const broadcastTypingStatus = useBroadcastTypingStatus(conversationId)
+  const broadcastTypingStatus = useBroadcastTypingStatus()
 
   const handleTextChange = (newText: string) => {
     setText(newText)
@@ -566,9 +559,11 @@ function EditingIndicator() {
 function ReplyIndicator() {
   const { replyRootId, replyRootAuthorFirstName } = React.useContext(MessageFormContext)
   const navigation = useNavigation()
+  const { featureEnabled } = useFeatures()
+  const repliesEnabled = featureEnabled(availableFeatures.threaded_replies)
   const title = replyRootAuthorFirstName ? `Reply to ${replyRootAuthorFirstName}` : 'Reply'
 
-  if (!REPLIES_FEATURE_ENABLED || !replyRootId) return null
+  if (!repliesEnabled || !replyRootId) return null
 
   return (
     <FormIndicatorRow

package/src/components/conversation/messages_disabled_banners.tsx

@@ -0,0 +1,69 @@
+import { StyleSheet, View, type ViewStyle } from 'react-native'
+import { useTheme } from '../../hooks'
+import { Text } from '../display'
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { useFeatures } from '../../hooks/use_features'
+import { availableFeatures } from '../../hooks/use_features'
+
+export const LeaderMessagesDisabledBanner = () => {
+  const { featureEnabled } = useFeatures()
+  const repliesEnabled = featureEnabled(availableFeatures.threaded_replies)
+
+  const description = repliesEnabled
+    ? 'Only leaders can send messages in this conversation.'
+    : 'Replies are frozen for everyone else.'
+
+  return <MessagesDisabledBanner description={description} />
+}
+
+export const MemberMessagesDisabledBanner = () => {
+  const styles = useStyles()
+  const { featureEnabled } = useFeatures()
+  const repliesEnabled = featureEnabled(availableFeatures.threaded_replies)
+
+  const description = repliesEnabled
+    ? 'Only leaders can send messages, but you can still add reactions.'
+    : 'Replies have been disabled by a leader, but you can still add reactions.'
+
+  return <MessagesDisabledBanner description={description} style={styles.memberBanner} />
+}
+
+interface MessagesDisabledBannerProps {
+  description: string
+  style?: ViewStyle
+}
+
+const MessagesDisabledBanner = ({ description, style }: MessagesDisabledBannerProps) => {
+  const styles = useStyles()
+
+  return (
+    <View style={[styles.baseBanner, style]}>
+      <Text style={styles.text} variant="tertiary">
+        {description}
+      </Text>
+    </View>
+  )
+}
+
+const useStyles = () => {
+  const { colors } = useTheme()
+  const { bottom } = useSafeAreaInsets()
+
+  return StyleSheet.create({
+    baseBanner: {
+      paddingHorizontal: 16,
+      paddingVertical: 4,
+      backgroundColor: colors.statusNeutralComposedBackground,
+      borderTopWidth: 1,
+      borderTopColor: colors.borderColorDefaultBase,
+    },
+    text: {
+      textAlign: 'center',
+    },
+    memberBanner: {
+      paddingTop: 16,
+      paddingBottom: 16 + bottom,
+      marginBottom: -bottom,
+    },
+  })
+}

package/src/components/conversation/reply_connectors.tsx

@@ -6,7 +6,6 @@ import {
   CONVERSATION_MESSAGE_LIST_PADDING_HORIZONTAL,
   MESSAGE_AUTHOR_AVATAR_COLUMN_WIDTH,
 } from '../../utils/styles'
-import { REPLIES_FEATURE_ENABLED } from '../../utils'
 
 const MY_REPLY_CONNECTOR_WIDTH = 38
 const CONNECTOR_BORDER_WIDTH = 4
@@ -22,7 +21,6 @@ export function TheirReplyConnector({ message, messageBubbleHeight }: ReplyConne
   const styles = useStyles()
   const { nextRendersAuthor, threadPosition, renderAuthor, isReplyShadowMessage } = message
 
-  if (!REPLIES_FEATURE_ENABLED) return null
   if (messageBubbleHeight === 0) return null // Prevents UI shifting
 
   const connectorMap: Record<string, React.ReactNode | null> = {
@@ -59,7 +57,6 @@ export function MyReplyConnector({ message, messageBubbleHeight }: ReplyConnecto
   const { nextRendersAuthor, threadPosition, prevIsMyReply, nextIsMyReply, isReplyShadowMessage } =
     message
 
-  if (!REPLIES_FEATURE_ENABLED) return null
   if (messageBubbleHeight === 0) return null // Prevents UI shifting
 
   const connectorMap: Record<string, React.ReactNode | null> = {

package/src/components/conversation/typing_indicator.tsx

@@ -41,16 +41,12 @@ const TypingDots = () => {
   )
 }
 
-interface TypingIndicatorProps {
-  conversationId: number
-}
-
 /**
  * Component to display typing indicators in a conversation
  * Shows "X is typing..." with animated dots
  */
-export const TypingIndicator = ({ conversationId }: TypingIndicatorProps) => {
-  const typingPeople = useTypingIndicators(conversationId)
+export const TypingIndicator = () => {
+  const typingPeople = useTypingIndicators()
   const styles = useStyles()
   const enabled = typingPeople.length > 0
 

package/src/components/conversations/conversations.tsx

@@ -1,7 +1,6 @@
 import { useNavigation } from '@react-navigation/native'
-import { FlashList } from '@shopify/flash-list'
 import React, { useMemo } from 'react'
-import { StyleSheet, View } from 'react-native'
+import { FlatList, StyleSheet, View } from 'react-native'
 import { useConversationsContext } from '../../contexts/conversations_context'
 import { useTheme } from '../../hooks'
 import { ConversationResource } from '../../types'
@@ -35,7 +34,7 @@ export const Conversations = ({ ListHeaderComponent }: ConversationsProps) => {
 
   const showBadges = !chat_group_graph_id
 
-  const data: FlashListItem[] = useMemo(() => {
+  const data: FlatListItem[] = useMemo(() => {
     if (isLoading) {
       return loadingPlaceholder
     }
@@ -54,9 +53,8 @@ export const Conversations = ({ ListHeaderComponent }: ConversationsProps) => {
 
   return (
     <View style={styles.container}>
-      <FlashList
+      <FlatList
         data={data}
-        estimatedItemSize={97}
         keyExtractor={item => item.id.toString()}
         contentContainerStyle={styles.contentContainer}
         onRefresh={refetch}
@@ -114,18 +112,18 @@ const useStyles = () => {
   })
 }
 
-interface FlashListLoadingItem {
+interface FlatListLoadingItem {
   type: 'loading'
   id: string
 }
-interface FlashListConversationItem {
+interface FlatListConversationItem {
   type: 'conversation'
   resource: ConversationResource
   id: number
 }
-type FlashListItem = FlashListLoadingItem | FlashListConversationItem
+type FlatListItem = FlatListLoadingItem | FlatListConversationItem
 
-const loadingPlaceholder: FlashListItem[] = Array.from({ length: 5 }, (_, i) => ({
+const loadingPlaceholder: FlatListItem[] = Array.from({ length: 5 }, (_, i) => ({
   type: 'loading',
   id: `loading${i}`,
 }))