@amityco/ts-sdk-react-native 6.32.2-da6d23d.0 → 6.32.3-89ca939.0

package/dist/index.cjs.js

@@ -123,8 +123,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.32.1-cjs'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.32.1-cjs';
+        // the string ''v6.32.3-cjs'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.32.3-cjs';
     }
     catch (error) {
         return '__dev__';
@@ -1736,6 +1736,7 @@ const createHttpTransport = (endpoint) => {
          * https://github.com/axios/axios#request-config
          */
     });
+    instance.defaults.withCredentials = false;
     instance.interceptors.request.use(config => {
         // do not check expiration for token creation url
         if (config.url === '/api/v5/sessions') {
@@ -5646,6 +5647,7 @@ const reCalculateChannelUnreadInfo = (channelId) => {
     var _a;
     const cacheKeyChannelUnread = ['channelUnreadInfo', 'get', channelId];
     const cacheChannelUnreadInfo = (_a = pullFromCache(cacheKeyChannelUnread)) === null || _a === void 0 ? void 0 : _a.data;
+    console.log('[reCalculateChannelUnreadInfo] cacheChannelUnreadInfo => ', cacheChannelUnreadInfo);
     const cacheKeySubChannelUnread = ['subChannelUnreadInfo', 'get'];
     const cachedSubChannelUnreadInfo = queryCache(cacheKeySubChannelUnread);
     let channelUnreads = 0;
@@ -5654,9 +5656,11 @@ const reCalculateChannelUnreadInfo = (channelId) => {
         const subChannelUnreadsInfo = cachedSubChannelUnreadInfo === null || cachedSubChannelUnreadInfo === void 0 ? void 0 : cachedSubChannelUnreadInfo.filter(({ data }) => {
             return data.channelId === channelId && !data.isDeleted;
         });
+        console.log('[reCalculateChannelUnreadInfo] subChannelUnreadsInfo => ', subChannelUnreadsInfo);
         channelUnreads = subChannelUnreadsInfo
             .map(({ data }) => data.unreadCount)
             .reduce((acc, cur) => acc + cur, 0);
+        console.log('[reCalculateChannelUnreadInfo] channelUnreads => ', channelUnreads);
         isMentioned = subChannelUnreadsInfo.some(({ data }) => data.isMentioned);
     }
     const channelUnreadInfo = Object.assign(Object.assign({}, (cacheChannelUnreadInfo !== null && cacheChannelUnreadInfo !== void 0 ? cacheChannelUnreadInfo : {
@@ -5942,8 +5946,28 @@ const markAsRead = async (channelId) => {
     return true;
 };
 
+/**
+ * ```js
+ * import { shallowClone } from '~/utils/shallowClone'
+ * const newObj = shallowClone(obj)
+ * ```
+ *
+ * Clone an object with same prototype and properties
+ *
+ * @param obj the object to clone
+ * @returns new object with same prototype and properties
+ *
+ * @category utility
+ * @private
+ */
+function shallowClone(source, target) {
+    return Object.create(Object.getPrototypeOf(source), Object.assign(Object.assign({}, Object.getOwnPropertyDescriptors(source)), Object.getOwnPropertyDescriptors(target)));
+}
+
 const channelLinkedObject = (channel) => {
-    return Object.assign(Object.assign({}, channel), { markAsRead: () => markAsRead(channel.channelInternalId) });
+    return shallowClone(channel, {
+        markAsRead: () => markAsRead(channel.channelInternalId),
+    });
 };
 
 const adLinkedObject = (ad) => {
@@ -6114,31 +6138,10 @@ const updateSubChannelMessagePreviewCache = (rawPayload) => {
     ingestInCache(newData);
 };
 
-/**
- * ```js
- * import { shallowClone } from '~/utils/shallowClone'
- * const newObj = shallowClone(obj)
- * ```
- *
- * Clone an object with same prototype and properties
- *
- * @param obj the object to clone
- * @returns new object with same prototype and properties
- *
- * @category utility
- * @private
- */
-function shallowClone(obj) {
-    const clone = Object.create(Object.getPrototypeOf(obj));
-    const descriptors = Object.getOwnPropertyDescriptors(obj);
-    Object.defineProperties(clone, descriptors);
-    return clone;
-}
-
 function updateSubChannelCache(subChannelId, subChannel, params) {
     pushToCache(['subChannel', 'get', subChannelId], 
     // eslint-disable-next-line prefer-object-spread
-    Object.assign(shallowClone(subChannel), params));
+    shallowClone(subChannel, params));
 }
 
 const handleMessageCreated = async (message) => {
@@ -6317,81 +6320,6 @@ const handleSubChannelUpdated = async (subChannel) => {
     }
 };
 
-const getCachedMarker$1 = (entityId) => {
-    var _a;
-    const key = {
-        entityId,
-        userId: getActiveUser()._id,
-    };
-    return (_a = pullFromCache([
-        'channelMarker',
-        'get',
-        getResolver('channelMarker')(key),
-    ])) === null || _a === void 0 ? void 0 : _a.data;
-};
-const getUnreadInfoCached$1 = (channelId) => {
-    var _a;
-    return (_a = pullFromCache(['channelUnreadInfo', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
-};
-/**
- * The function use to get value of unreadCount field.
- * function will get the value from marker params first, if there is no hasMentioned field, will look in to the cache.
- *
- * If consistent mode is enabled, the function will return the value from the channelUnreadCountInfo cache.
- * If not, the function will return the value from the channelMarker cache.
- * If not found in the both cache, use `0` as defaul value.
- */
-const getSubChannelsUnreadCount = (channel, marker) => {
-    var _a, _b, _c, _d, _e;
-    const client = getActiveClient();
-    if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-        // Marker service API uses channelInternalId as channelId
-        return (_b = (_a = getUnreadInfoCached$1(channel.channelInternalId)) === null || _a === void 0 ? void 0 : _a.unreadCount) !== null && _b !== void 0 ? _b : 0;
-    }
-    if (marker === null || marker === void 0 ? void 0 : marker.isDeleted) {
-        // NOTE: This is a temporary solution to handle the channel marker when the user is forced to
-        // leave the channel because currently backend can't handle this, so every time a user is banned
-        // from a channel or the channel is deleted the channel's unread count will reset to zero
-        return 0;
-    }
-    return (_e = (_c = marker === null || marker === void 0 ? void 0 : marker.unreadCount) !== null && _c !== void 0 ? _c : (_d = getCachedMarker$1(channel.channelInternalId)) === null || _d === void 0 ? void 0 : _d.unreadCount) !== null && _e !== void 0 ? _e : 0;
-};
-
-const getCachedMarker = (entityId) => {
-    var _a;
-    const key = {
-        entityId,
-        userId: getActiveUser()._id,
-    };
-    return (_a = pullFromCache([
-        'channelMarker',
-        'get',
-        getResolver('channelMarker')(key),
-    ])) === null || _a === void 0 ? void 0 : _a.data;
-};
-const getUnreadInfoCached = (channelId) => {
-    var _a;
-    return (_a = pullFromCache(['channelUnreadInfo', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
-};
-/**
- * The function use to get value of hasMentioned or isMentioned field.
- * function will get the value from marker params first, if there is no hasMentioned field, will look in to the cache.
- *
- * If consistent mode is enabled, the function will return the value from the channelUnreadCountInfo cache.
- * If not, the function will return the value from the channelMarker cache.
- * If not found in the both cache, use `false` as defaul value.
- */
-const getChannelIsMentioned = (channel, marker) => {
-    var _a, _b, _c, _d;
-    const client = getActiveClient();
-    if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
-        return (_b = (_a = getUnreadInfoCached(channel.channelPublicId)) === null || _a === void 0 ? void 0 : _a.isMentioned) !== null && _b !== void 0 ? _b : false;
-    }
-    return (marker === null || marker === void 0 ? void 0 : marker.hasMentioned) !== undefined
-        ? marker === null || marker === void 0 ? void 0 : marker.hasMentioned
-        : (_d = (_c = getCachedMarker(channel.channelPublicId)) === null || _c === void 0 ? void 0 : _c.hasMentioned) !== null && _d !== void 0 ? _d : false;
-};
-
 function convertRawUserToInternalUser(rawUser) {
     return Object.assign(Object.assign({}, rawUser), { isGlobalBanned: (rawUser === null || rawUser === void 0 ? void 0 : rawUser.isGlobalBan) || false });
 }
@@ -6409,18 +6337,7 @@ function convertFromRaw$2(channel, options = { isMessagePreviewUpdated: true })
     if ((messagePreviewChannelCache === null || messagePreviewChannelCache === void 0 ? void 0 : messagePreviewChannelCache.messagePreviewId) && !options.isMessagePreviewUpdated) {
         messagePreviewId = messagePreviewChannelCache.messagePreviewId;
     }
-    return Object.assign(Object.assign({ get unreadCount() {
-            return getSubChannelsUnreadCount(channel);
-        },
-        get hasMentioned() {
-            return getChannelIsMentioned(channel);
-        },
-        get isMentioned() {
-            return getChannelIsMentioned(channel);
-        },
-        get subChannelsUnreadCount() {
-            return getSubChannelsUnreadCount(channel);
-        } }, channel), { defaultSubChannelId: channel.channelInternalId, isUnreadCountSupport: isUnreadCountSupport$2(channel), messagePreviewId });
+    return Object.assign(Object.assign({}, channel), { defaultSubChannelId: channel.channelInternalId, isUnreadCountSupport: isUnreadCountSupport$2(channel), messagePreviewId });
 }
 const preUpdateChannelCache = (rawPayload, options = { isMessagePreviewUpdated: true }) => {
     ingestInCache({
@@ -6542,6 +6459,98 @@ const prepareUnreadCountInfo = async (rawPayload) => {
     client.log('channel/prepareUnreadCountInfo', rawPayload.channels);
 };
 
+const getCachedMarker$1 = (entityId) => {
+    var _a;
+    const key = {
+        entityId,
+        userId: getActiveUser()._id,
+    };
+    return (_a = pullFromCache([
+        'channelMarker',
+        'get',
+        getResolver('channelMarker')(key),
+    ])) === null || _a === void 0 ? void 0 : _a.data;
+};
+const getUnreadInfoCached$1 = (channelId) => {
+    var _a;
+    return (_a = pullFromCache(['channelUnreadInfo', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
+};
+/**
+ * The function use to get value of hasMentioned or isMentioned field.
+ * function will get the value from marker params first, if there is no hasMentioned field, will look in to the cache.
+ *
+ * If consistent mode is enabled, the function will return the value from the channelUnreadCountInfo cache.
+ * If not, the function will return the value from the channelMarker cache.
+ * If not found in the both cache, use `false` as defaul value.
+ */
+const getChannelIsMentioned = (channel, marker) => {
+    var _a, _b, _c, _d;
+    const client = getActiveClient();
+    if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
+        return (_b = (_a = getUnreadInfoCached$1(channel.channelPublicId)) === null || _a === void 0 ? void 0 : _a.isMentioned) !== null && _b !== void 0 ? _b : false;
+    }
+    return (marker === null || marker === void 0 ? void 0 : marker.hasMentioned) !== undefined
+        ? marker === null || marker === void 0 ? void 0 : marker.hasMentioned
+        : (_d = (_c = getCachedMarker$1(channel.channelPublicId)) === null || _c === void 0 ? void 0 : _c.hasMentioned) !== null && _d !== void 0 ? _d : false;
+};
+
+const getCachedMarker = (entityId) => {
+    var _a;
+    const key = {
+        entityId,
+        userId: getActiveUser()._id,
+    };
+    return (_a = pullFromCache([
+        'channelMarker',
+        'get',
+        getResolver('channelMarker')(key),
+    ])) === null || _a === void 0 ? void 0 : _a.data;
+};
+const getUnreadInfoCached = (channelId) => {
+    var _a;
+    return (_a = pullFromCache(['channelUnreadInfo', 'get', channelId])) === null || _a === void 0 ? void 0 : _a.data;
+};
+/**
+ * The function use to get value of unreadCount field.
+ * function will get the value from marker params first, if there is no hasMentioned field, will look in to the cache.
+ *
+ * If consistent mode is enabled, the function will return the value from the channelUnreadCountInfo cache.
+ * If not, the function will return the value from the channelMarker cache.
+ * If not found in the both cache, use `0` as defaul value.
+ */
+const getSubChannelsUnreadCount = (channel, marker) => {
+    var _a, _b, _c, _d, _e;
+    const client = getActiveClient();
+    if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
+        // Marker service API uses channelInternalId as channelId
+        return (_b = (_a = getUnreadInfoCached(channel.channelInternalId)) === null || _a === void 0 ? void 0 : _a.unreadCount) !== null && _b !== void 0 ? _b : 0;
+    }
+    if (marker === null || marker === void 0 ? void 0 : marker.isDeleted) {
+        // NOTE: This is a temporary solution to handle the channel marker when the user is forced to
+        // leave the channel because currently backend can't handle this, so every time a user is banned
+        // from a channel or the channel is deleted the channel's unread count will reset to zero
+        return 0;
+    }
+    return (_e = (_c = marker === null || marker === void 0 ? void 0 : marker.unreadCount) !== null && _c !== void 0 ? _c : (_d = getCachedMarker(channel.channelInternalId)) === null || _d === void 0 ? void 0 : _d.unreadCount) !== null && _e !== void 0 ? _e : 0;
+};
+
+const constructChannelDynamicValue = (channel) => {
+    return shallowClone(channel, {
+        get unreadCount() {
+            return getSubChannelsUnreadCount(channel);
+        },
+        get hasMentioned() {
+            return getChannelIsMentioned(channel);
+        },
+        get isMentioned() {
+            return getChannelIsMentioned(channel);
+        },
+        get subChannelsUnreadCount() {
+            return getSubChannelsUnreadCount(channel);
+        },
+    });
+};
+
 /**
  * ```js
  * import { getChannelByIds } from '@amityco/ts-sdk-react-native'
@@ -6586,7 +6595,7 @@ const getChannelByIds = async (channelIds) => {
         ingestInCache(data, { cachedAt });
     fireEvent('local.channel.fetched', data.channels);
     return {
-        data: data.channels.map(channel => LinkedObject.channel(channel)),
+        data: data.channels.map(channel => LinkedObject.channel(constructChannelDynamicValue(channel))),
         cachedAt,
     };
 };
@@ -8676,12 +8685,14 @@ const updateSubChannelUnreadFromMessage = (message) => {
     const client = getActiveClient();
     const cacheKeyUnreadCount = ['subChannelUnreadInfo', 'get', message.messageFeedId];
     const cachedUnreadCount = (_a = pullFromCache(cacheKeyUnreadCount)) === null || _a === void 0 ? void 0 : _a.data;
+    console.log('[updateSubChannelUnreadFromMessage] cachedUnreadCount => ', cachedUnreadCount);
     if (!cachedUnreadCount)
         return;
     const lastSegment = cachedUnreadCount.lastSegment < message.segment
         ? message.segment
         : cachedUnreadCount.lastSegment;
     const unreadCount = lastSegment - cachedUnreadCount.readToSegment;
+    console.log('[updateSubChannelUnreadFromMessage] unreadCount => ', unreadCount);
     let { lastMentionSegment } = cachedUnreadCount;
     if (message.mentionedUsers && message.mentionedUsers.length > 0) {
         message.mentionedUsers.forEach(mention => {
@@ -8693,6 +8704,7 @@ const updateSubChannelUnreadFromMessage = (message) => {
     }
     const updatedCachedUnreadCount = Object.assign(Object.assign({}, cachedUnreadCount), { lastMentionSegment,
         lastSegment, isMentioned: !(cachedUnreadCount.readToSegment >= lastMentionSegment), unreadCount: Math.max(unreadCount, 0) });
+    console.log('[updateSubChannelUnreadFromMessage] updatedCachedUnreadCount => key', cacheKeyUnreadCount, 'value =>', updatedCachedUnreadCount);
     pushToCache(cacheKeyUnreadCount, updatedCachedUnreadCount);
 };
 
@@ -8753,6 +8765,7 @@ const onMessageCreatedMqtt = (callback) => {
     const user = getActiveUser();
     const filter = async (rawPayload) => {
         const payload = await prepareMessagePayload(rawPayload);
+        console.log('onMessageCreatedMqtt', payload);
         // update unreadCountInfo in cache
         if (client.isUnreadCountEnabled && client.getMarkerSyncConsistentMode()) {
             rawPayload.messages.forEach(message => {
@@ -13352,16 +13365,19 @@ function isCurrentUserPartOfCommunity(c, m) {
 }
 /*
  * For mqtt events server will not send user specific data as it's broadcasted
- * to multiple users. Althought this can be calculated, it's not scalable. Hence
- * the client SDK needs to calculate this info
+ * to multiple users and it also does not include communityUser
+ *
+ * Client SDK needs to check for the existing isJoined field in cache data before calculating.
+ * Althought this can be calculated, it's not scalable.
  */
 function updateMembershipStatus(communities, communityUsers) {
     return communities.map(c => {
-        if (c.isJoined == null) {
-            const isJoined = communityUsers.some(m => isCurrentUserPartOfCommunity(c, m) && isMember(m.communityMembership));
-            return Object.assign(Object.assign({}, c), { isJoined });
+        const cachedCommunity = pullFromCache(['community', 'get', c.communityId]);
+        if ((cachedCommunity === null || cachedCommunity === void 0 ? void 0 : cachedCommunity.data) && (cachedCommunity === null || cachedCommunity === void 0 ? void 0 : cachedCommunity.data.hasOwnProperty('isJoined'))) {
+            return Object.assign(Object.assign({}, cachedCommunity.data), c);
         }
-        return c;
+        const isJoined = communityUsers.some(m => isCurrentUserPartOfCommunity(c, m) && isMember(m.communityMembership));
+        return Object.assign(Object.assign({}, c), { isJoined });
     });
 }
 
@@ -13709,7 +13725,8 @@ const createPostEventSubscriber = (event, callback) => {
         else {
             const data = preparePostPayload(payload);
             const { communities } = data;
-            ingestInCache(data);
+            // NOTE: The event data should be merge with existing cache rather than replace it
+            ingestInCache(data, undefined, false);
             if ((communities === null || communities === void 0 ? void 0 : communities[0]) && !['post.updated'].includes(event)) {
                 fireEvent('community.updated', {
                     communities,
@@ -13975,7 +13992,8 @@ const createCommentEventSubscriber = (event, callback) => {
             const processed = ['comment.flagged', 'comment.unflagged'].includes(event)
                 ? prepareCommentFromFlaggedEvent(payload)
                 : payload;
-            ingestInCache(processed);
+            // NOTE: The event data should be merge with existing cache rather than replace it
+            ingestInCache(processed, undefined, false);
             const { comments } = processed;
             if (comments.length > 0) {
                 const comment = pullFromCache([
@@ -14853,7 +14871,7 @@ const createChannel = async (bundle) => {
         ingestInCache(data, { cachedAt });
     const { channels } = data;
     return {
-        data: channels[0],
+        data: constructChannelDynamicValue(channels[0]),
         cachedAt,
     };
 };
@@ -14887,7 +14905,7 @@ const updateChannel = async (channelId, patch) => {
         ingestInCache(data, { cachedAt });
     const { channels } = data;
     return {
-        data: channels.find(channel => channel.channelId === channelId),
+        data: constructChannelDynamicValue(channels.find(channel => channel.channelId === channelId)),
         cachedAt,
     };
 };
@@ -14931,7 +14949,7 @@ const getChannel$1 = async (channelId) => {
         ingestInCache(data, { cachedAt });
     const { channels } = data;
     return {
-        data: channels.find(channel => channel.channelId === channelId),
+        data: constructChannelDynamicValue(channels.find(channel => channel.channelId === channelId)),
         cachedAt,
     };
 };
@@ -14961,7 +14979,7 @@ getChannel$1.locally = (channelId) => {
     if (!cached || (cached === null || cached === void 0 ? void 0 : cached.length) === 0)
         return;
     return {
-        data: cached[0].data,
+        data: constructChannelDynamicValue(cached[0].data),
         cachedAt: cached[0].cachedAt,
     };
 };
@@ -15159,10 +15177,10 @@ const observeChannel = (channelId, callback) => {
         if (((_a = result.data) === null || _a === void 0 ? void 0 : _a.channelId) !== channelId)
             return;
         if (callback instanceof Function)
-            return callback(Object.assign(Object.assign({}, result), { data: LinkedObject.channel(result.data) }));
+            return callback(Object.assign(Object.assign({}, result), { data: LinkedObject.channel(constructChannelDynamicValue(result.data)) }));
         if (action !== 'onFetch')
-            (_b = callback.onEvent) === null || _b === void 0 ? void 0 : _b.call(callback, action, Object.assign(Object.assign({}, result), { data: LinkedObject.channel(result.data) }));
-        (_c = callback[action]) === null || _c === void 0 ? void 0 : _c.call(callback, Object.assign(Object.assign({}, result), { data: LinkedObject.channel(result.data) }));
+            (_b = callback.onEvent) === null || _b === void 0 ? void 0 : _b.call(callback, action, Object.assign(Object.assign({}, result), { data: LinkedObject.channel(constructChannelDynamicValue(result.data)) }));
+        (_c = callback[action]) === null || _c === void 0 ? void 0 : _c.call(callback, Object.assign(Object.assign({}, result), { data: LinkedObject.channel(constructChannelDynamicValue(result.data)) }));
     };
     const disposers = [];
     disposers.push(onChannelUpdated(data => router({ data, loading: false, origin: 'event' }, "onUpdate" /* Amity.ChannelActionType.OnUpdate */)), onChannelDeleted(data => router({ data, loading: false, origin: 'event' }, "onDelete" /* Amity.ChannelActionType.OnDelete */)), onChannelJoined(data => router({ data, loading: false, origin: 'event' }, "onJoin" /* Amity.ChannelActionType.OnJoin */)), onChannelLeft(data => router({ data, loading: false, origin: 'event' }, "onLeft" /* Amity.ChannelActionType.OnLeft */)), onChannelMuted(data => router({ data, loading: false, origin: 'event' }, "onMute" /* Amity.ChannelActionType.OnMute */)), onChannelMemberAdded(data => router({ data, loading: false, origin: 'event' }, "onMemberAdded" /* Amity.ChannelActionType.OnMemberAdded */)), onChannelMemberRemoved(data => router({ data, loading: false, origin: 'event' }, "onMemberRemoved" /* Amity.ChannelActionType.OnMemberRemoved */)), convertEventPayload(onChannelMarkerFetched, 'entityId', 'channel')(data => router({ data, loading: false, origin: 'event' }, "onUpdate" /* Amity.ChannelActionType.OnUpdate */)));
@@ -15196,9 +15214,9 @@ const observeChannels = (callback) => {
     const router = (channel, action) => {
         var _a, _b;
         if (callback instanceof Function)
-            return callback(LinkedObject.channel(channel));
-        (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, LinkedObject.channel(channel));
-        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, LinkedObject.channel(channel));
+            return callback(LinkedObject.channel(constructChannelDynamicValue(channel)));
+        (_a = callback.onEvent) === null || _a === void 0 ? void 0 : _a.call(callback, action, LinkedObject.channel(constructChannelDynamicValue(channel)));
+        (_b = callback[action]) === null || _b === void 0 ? void 0 : _b.call(callback, LinkedObject.channel(constructChannelDynamicValue(channel)));
     };
     disposers.push(onChannelCreated(data => router(data, "onCreate" /* Amity.ChannelActionType.OnCreate */)), onChannelUpdated(data => router(data, "onUpdate" /* Amity.ChannelActionType.OnUpdate */)), onChannelDeleted(data => router(data, "onDelete" /* Amity.ChannelActionType.OnDelete */)), onChannelJoined(data => router(data, "onJoin" /* Amity.ChannelActionType.OnJoin */)), onChannelLeft(data => router(data, "onLeft" /* Amity.ChannelActionType.OnLeft */)), onChannelMuted(data => router(data, "onMute" /* Amity.ChannelActionType.OnMute */)), onChannelMemberAdded(data => router(data, "onMemberAdded" /* Amity.ChannelActionType.OnMemberAdded */)), onChannelMemberRemoved(data => router(data, "onMemberRemoved" /* Amity.ChannelActionType.OnMemberRemoved */)), convertEventPayload(onChannelMarkerFetched, 'entityId', 'channel')(data => router(data, "onUpdate" /* Amity.ChannelActionType.OnUpdate */)));
     return () => {
@@ -15303,7 +15321,7 @@ const onSubChannelUpdated = (callback) => {
 function updateChannelCache(channel, params) {
     pushToCache(['channel', 'get', channel.channelId], 
     // eslint-disable-next-line prefer-object-spread
-    Object.assign(shallowClone(channel), params));
+    shallowClone(channel, params));
 }
 
 /**
@@ -17785,6 +17803,7 @@ class ChannelLiveCollectionController extends LiveCollectionController {
             .filter(Boolean)
             .map(({ data }) => data)
             .map(getChannelMessagePreviewWithUser)
+            .map(constructChannelDynamicValue)
             .map(LinkedObject.channel)) !== null && _b !== void 0 ? _b : [];
         if (this.paginationController instanceof ChannelPaginationController) {
             data = this.applyFilter(data);
@@ -17875,6 +17894,7 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                             'get',
                             message.channelId,
                         ])) === null || _a === void 0 ? void 0 : _a.data;
+                        console.log('channel cache data => ', cacheData);
                         if (!cacheData) {
                             const objectResolverEngine = ObjectResolverEngine$1.getInstance();
                             // channelId from message event payload is channelInternalId
@@ -18327,7 +18347,11 @@ const onUserDeleted$1 = (channelId) => (callback) => {
             channelUserCacheKey,
         ])) === null || _a === void 0 ? void 0 : _a.data;
         upsertInCache(['channelUsers', 'get', channelUserCacheKey], Object.assign(Object.assign({}, cacheData), { user }));
-        const channel = (_b = pullFromCache(['channel', 'get', channelId])) === null || _b === void 0 ? void 0 : _b.data;
+        const channel = (_b = pullFromCache([
+            'channel',
+            'get',
+            channelId,
+        ])) === null || _b === void 0 ? void 0 : _b.data;
         if (!channel)
             return;
         callback(channel, cacheData);
@@ -19265,7 +19289,8 @@ const createCommunityMemberEventSubscriber = (event, callback) => {
             callback(preparedPayload.communities[0], getEventRelatedMember(event, preparedPayload));
         }
         else {
-            ingestInCache(preparedPayload);
+            // NOTE: The event payload should be merge with existing cache data
+            ingestInCache(preparedPayload, undefined, false);
             const community = pullFromCache([
                 'community',
                 'get',
@@ -19302,7 +19327,8 @@ const createLocalCommunityMemberEventSubscriber = (event, callback) => {
             callback(preparedPayload.communities[0], getEventRelatedMember(event, preparedPayload));
         }
         else {
-            ingestInCache(preparedPayload);
+            // NOTE: The event payload should be merge with existing cache data
+            ingestInCache(preparedPayload, undefined, false);
             const community = pullFromCache([
                 'community',
                 'get',