@amityco/ts-sdk 7.28.1-ff89ba3b.0 → 7.29.1-0cb2e19.0

package/dist/channelRepository/observers/getChannels/ChannelLiveCollectionController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChannelLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/channelRepository/observers/getChannels/ChannelLiveCollectionController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AA6C1F,OAAO,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AAcvF,qBAAa,+BAAgC,SAAQ,wBAAwB,CAC3E,SAAS,EACT,KAAK,CAAC,qBAAqB,EAC3B,KAAK,CAAC,OAAO,EACb,2BAA2B,GAAG,iCAAiC,CAChE;IACC,OAAO,CAAC,qBAAqB,CAA+B;IAE5D,OAAO,CAAC,KAAK,CAA8B;gBAGzC,KAAK,EAAE,KAAK,CAAC,qBAAqB,EAClC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC;IAgCvD,SAAS,CAAC,KAAK;cAUC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,UAAU;IAI9E,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,SAAS,CAAC;IAI1D,iBAAiB;IAIjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAkCzE,OAAO,CAAC,WAAW;IAuDnB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAKvC,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAQtC,OAAO,CAAC,gBAAgB;CA0YzB"}
+{"version":3,"file":"ChannelLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/channelRepository/observers/getChannels/ChannelLiveCollectionController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AA6C1F,OAAO,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AAcvF,qBAAa,+BAAgC,SAAQ,wBAAwB,CAC3E,SAAS,EACT,KAAK,CAAC,qBAAqB,EAC3B,KAAK,CAAC,OAAO,EACb,2BAA2B,GAAG,iCAAiC,CAChE;IACC,OAAO,CAAC,qBAAqB,CAA+B;IAE5D,OAAO,CAAC,KAAK,CAA8B;gBAGzC,KAAK,EAAE,KAAK,CAAC,qBAAqB,EAClC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC;IAgCvD,SAAS,CAAC,KAAK;cAUC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,UAAU;IAI9E,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,SAAS,CAAC;IAI1D,iBAAiB;IAIjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAkCzE,OAAO,CAAC,WAAW;IAgEnB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAKvC,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAQtC,OAAO,CAAC,gBAAgB;CA0YzB"}

package/dist/channelRepository/utils/updateChannelActivityTimestamps.d.ts

@@ -2,6 +2,14 @@ declare type ActivityFields = {
     lastActivity?: boolean;
     lastMessageAt?: boolean;
 };
+/**
+ * The channel cache is keyed by `channelInternalId`, but a message names its
+ * channel by whichever id the producer had: the raw MQTT payload carries the
+ * internal id, a converted `Amity.InternalMessage` carries the public id, and
+ * the optimistic message carries the sub-channel's `channelId`. Try the direct
+ * key first, then match any of the three ids.
+ */
+export declare const findCachedChannel: (channelId: string) => Amity.StaticInternalChannel | undefined;
 /**
  * Single owner of every local write to a channel's ordering timestamps,
  * `lastActivity` and `lastMessageAt` (ChannelActivityService v1).

package/dist/channelRepository/utils/updateChannelActivityTimestamps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateChannelActivityTimestamps.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/utils/updateChannelActivityTimestamps.ts"],"names":[],"mappings":"AAOA,aAAK,cAAc,GAAG;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAoDF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,+BAA+B,cAC/B,MAAM,GAAG,SAAS,MACzB,MAAM,SAAS,GAAG,SAAS,WACvB,cAAc,KACrB,OAaF,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,cACjB,MAAM,GAAG,SAAS,WACpB,MAAM,SAAS,GAAG,SAAS,YAC1B,MAAM,SAAS,GAAG,SAAS,KACpC,OAcF,CAAC"}
+{"version":3,"file":"updateChannelActivityTimestamps.d.ts","sourceRoot":"","sources":["../../../src/channelRepository/utils/updateChannelActivityTimestamps.ts"],"names":[],"mappings":"AAOA,aAAK,cAAc,GAAG;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAIF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,cAAe,MAAM,KAAG,MAAM,qBAAqB,GAAG,SAUnF,CAAC;AA+BF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,+BAA+B,cAC/B,MAAM,GAAG,SAAS,MACzB,MAAM,SAAS,GAAG,SAAS,WACvB,cAAc,KACrB,OAaF,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,cACjB,MAAM,GAAG,SAAS,WACpB,MAAM,SAAS,GAAG,SAAS,YAC1B,MAAM,SAAS,GAAG,SAAS,KACpC,OAcF,CAAC"}

package/dist/core/query/sorting.d.ts

@@ -71,15 +71,6 @@ export declare const sortByLastMessage: SortingFunc<{
     lastMessageAt?: Date | number | string | null;
     createdAt: Date | number | string;
 }>;
-/**
- * Code-point ordering of objects having a displayName, empty or missing names
- * first. This is the server's `sortBy=displayName` order for channels
- * (case-sensitive, uppercase before lowercase); a localized or case-insensitive
- * comparison would disagree with the page order.
- */
-export declare const sortByDisplayNameCodePoint: SortingFunc<{
-    displayName?: string | null;
-}>;
 /**
  * Filter items by untilAt timestamp based on sort direction
  * - For 'lastCreated' (newest first): untilAt acts as lower bound, excludes items older than boundary

package/dist/core/query/sorting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sorting.d.ts","sourceRoot":"","sources":["../../../src/core/query/sorting.ts"],"names":[],"mappings":"AAIA,aAAK,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAMnE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAGrD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,WAAW,CAAC;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAG/D,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAG7D,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC;IAAE,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAGhC,CAAC;AAEnD;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,WAAW,CAAC;IAC/C,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CAC1C,CAC8C,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC;IAAE,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAG/B,CAAC;AAEnD;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC;IAAE,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAGjC,CAAC;AAEnD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC;IAAE,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAGhC,CAAC;AAEnD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC;IAAE,YAAY,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAGnC,CAAC;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC;IAC1C,aAAa,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC9C,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CACnC,CAQA,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,EAAE,WAAW,CAAC;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAUnF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe;eAA2B,IAAI,GAAG,MAAM,GAAG,MAAM;wBAElE,IAAI,GAAG,MAAM,GAAG,MAAM,UACvB,aAAa,GAAG,cAAc,QAWvC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,YAAa,MAAM,KAAG,MAAM,GAAG,SAW1D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,cACtB,IAAI,GAAG,MAAM,GAAG,MAAM,WACxB,IAAI,GAAG,MAAM,GAAG,MAAM,UACvB,aAAa,GAAG,cAAc,KACrC,OAWF,CAAC"}
+{"version":3,"file":"sorting.d.ts","sourceRoot":"","sources":["../../../src/core/query/sorting.ts"],"names":[],"mappings":"AAIA,aAAK,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC;AAEvE;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAMnE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAGrD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,WAAW,CAAC;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAG/D,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAG7D,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC;IAAE,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAGhC,CAAC;AAEnD;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,WAAW,CAAC;IAC/C,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CAC1C,CAC8C,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC;IAAE,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAG/B,CAAC;AAEnD;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC;IAAE,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAGjC,CAAC;AAEnD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC;IAAE,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAGhC,CAAC;AAEnD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC;IAAE,YAAY,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAGnC,CAAC;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC;IAC1C,aAAa,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC9C,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CACnC,CAQA,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe;eAA2B,IAAI,GAAG,MAAM,GAAG,MAAM;wBAElE,IAAI,GAAG,MAAM,GAAG,MAAM,UACvB,aAAa,GAAG,cAAc,QAWvC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,YAAa,MAAM,KAAG,MAAM,GAAG,SAW1D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,cACtB,IAAI,GAAG,MAAM,GAAG,MAAM,WACxB,IAAI,GAAG,MAAM,GAAG,MAAM,UACvB,aAAa,GAAG,cAAc,KACrC,OAWF,CAAC"}

package/dist/index.cjs.js

@@ -344,8 +344,8 @@ exports.AmityLiveViewerCountMode = void 0;
 
 function getVersion() {
     try {
-        // the string ''v7.28.0-cjs'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v7.28.0-cjs';
+        // the string ''v7.29.0-cjs'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v7.29.0-cjs';
     }
     catch (error) {
         return '__dev__';
@@ -1649,23 +1649,6 @@ const sortByLastMessage = (a, b) => {
         return 1;
     return new Date(b.createdAt).valueOf() - new Date(a.createdAt).valueOf();
 };
-/**
- * Code-point ordering of objects having a displayName, empty or missing names
- * first. This is the server's `sortBy=displayName` order for channels
- * (case-sensitive, uppercase before lowercase); a localized or case-insensitive
- * comparison would disagree with the page order.
- */
-const sortByDisplayNameCodePoint = ({ displayName: a }, { displayName: b }) => {
-    const x = a !== null && a !== void 0 ? a : '';
-    const y = b !== null && b !== void 0 ? b : '';
-    if (x === y)
-        return 0;
-    if (!x)
-        return -1;
-    if (!y)
-        return 1;
-    return x < y ? -1 : 1;
-};
 /**
  * Filter items by untilAt timestamp based on sort direction
  * - For 'lastCreated' (newest first): untilAt acts as lower bound, excludes items older than boundary
@@ -19844,7 +19827,7 @@ const getLocalId = () => `LOCAL_${uuid()}`;
 // FIXME: temp solution
 let uniqueId;
 const createMessageOptimistic = (bundle) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const client = getActiveClient();
     if (!client.cache)
         return;
@@ -19876,9 +19859,13 @@ const createMessageOptimistic = (bundle) => {
     // as reused to update created and updated time, which should be the same
     const createdTime = new Date().toISOString();
     const message = Object.assign({ 
-        // The optimistic message must name its channel so the session-wide channel
-        // activity handler can move lastActivity / lastMessageAt at send time.
-        channelId: subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.channelId, creatorId: client.userId, creatorPrivateId: getActiveUser()._id, channelSegment: ((_b = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _b !== void 0 ? _b : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime, syncState: "syncing" /* Amity.SyncState.Syncing */, isDeleted: false }, bundleWithMessageId);
+        // The optimistic message must name its channel (public id) so the own-send
+        // update can move lastActivity / lastMessageAt at send time. Take it from the
+        // cached sub-channel; when that is not cached, resolve the sub-channel id
+        // through the channel cache, which for a channel's default sub-channel is
+        // the channel itself (ChannelActivityService migration row I2). A thread or
+        // unknown channel resolves to undefined, as before.
+        channelId: (_b = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.channelId) !== null && _b !== void 0 ? _b : (_c = findCachedChannel(bundle.subChannelId)) === null || _c === void 0 ? void 0 : _c.channelId, creatorId: client.userId, creatorPrivateId: getActiveUser()._id, channelSegment: ((_d = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _d !== void 0 ? _d : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime, syncState: "syncing" /* Amity.SyncState.Syncing */, isDeleted: false }, bundleWithMessageId);
     const cachedAt = UNSYNCED_OBJECT_CACHED_AT_VALUE;
     pushToCache(['message', 'get', message.messageId], message, { cachedAt });
     // Own-send update (ChannelActivityService row 1): move the channel at send
@@ -22375,11 +22362,15 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                 break;
             case 'displayName':
                 /*
-                 * The server returns channels with empty | null displayName's first, then
-                 * the rest in code-point order (case-sensitive). The comparator mirrors
-                 * that so the local order agrees with the page order.
+                 * The server returns channels with empty | null displayName's first before
+                 * returning sorted list of channels with displayNames
+                 *
+                 * This section needs to be updated as displayNames can be null as well
                  */
-                channels = channels.sort(sortByDisplayNameCodePoint);
+                channels = channels
+                    // this needs to be aligned with the backend data type
+                    .map(c => (c.displayName ? c : Object.assign(Object.assign({}, c), { displayName: '' })))
+                    .sort(sortByDisplayName);
                 break;
             default:
                 channels = channels.sort(sortByLastActivity);
@@ -37822,7 +37813,6 @@ exports.restoreCache = restoreCache;
 exports.runQuery = runQuery;
 exports.sortByChannelSegment = sortByChannelSegment;
 exports.sortByDisplayName = sortByDisplayName;
-exports.sortByDisplayNameCodePoint = sortByDisplayNameCodePoint;
 exports.sortByFirstCreated = sortByFirstCreated;
 exports.sortByFirstUpdated = sortByFirstUpdated;
 exports.sortByLastActivity = sortByLastActivity;

package/dist/index.esm.js

@@ -328,8 +328,8 @@ var AmityLiveViewerCountMode;
 
 function getVersion() {
     try {
-        // the string ''v7.28.0-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v7.28.0-esm';
+        // the string ''v7.29.0-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v7.29.0-esm';
     }
     catch (error) {
         return '__dev__';
@@ -1633,23 +1633,6 @@ const sortByLastMessage = (a, b) => {
         return 1;
     return new Date(b.createdAt).valueOf() - new Date(a.createdAt).valueOf();
 };
-/**
- * Code-point ordering of objects having a displayName, empty or missing names
- * first. This is the server's `sortBy=displayName` order for channels
- * (case-sensitive, uppercase before lowercase); a localized or case-insensitive
- * comparison would disagree with the page order.
- */
-const sortByDisplayNameCodePoint = ({ displayName: a }, { displayName: b }) => {
-    const x = a !== null && a !== void 0 ? a : '';
-    const y = b !== null && b !== void 0 ? b : '';
-    if (x === y)
-        return 0;
-    if (!x)
-        return -1;
-    if (!y)
-        return 1;
-    return x < y ? -1 : 1;
-};
 /**
  * Filter items by untilAt timestamp based on sort direction
  * - For 'lastCreated' (newest first): untilAt acts as lower bound, excludes items older than boundary
@@ -19844,7 +19827,7 @@ const getLocalId = () => `LOCAL_${uuid()}`;
 // FIXME: temp solution
 let uniqueId;
 const createMessageOptimistic = (bundle) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const client = getActiveClient();
     if (!client.cache)
         return;
@@ -19876,9 +19859,13 @@ const createMessageOptimistic = (bundle) => {
     // as reused to update created and updated time, which should be the same
     const createdTime = new Date().toISOString();
     const message = Object.assign({ 
-        // The optimistic message must name its channel so the session-wide channel
-        // activity handler can move lastActivity / lastMessageAt at send time.
-        channelId: subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.channelId, creatorId: client.userId, creatorPrivateId: getActiveUser()._id, channelSegment: ((_b = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _b !== void 0 ? _b : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime, syncState: "syncing" /* Amity.SyncState.Syncing */, isDeleted: false }, bundleWithMessageId);
+        // The optimistic message must name its channel (public id) so the own-send
+        // update can move lastActivity / lastMessageAt at send time. Take it from the
+        // cached sub-channel; when that is not cached, resolve the sub-channel id
+        // through the channel cache, which for a channel's default sub-channel is
+        // the channel itself (ChannelActivityService migration row I2). A thread or
+        // unknown channel resolves to undefined, as before.
+        channelId: (_b = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.channelId) !== null && _b !== void 0 ? _b : (_c = findCachedChannel(bundle.subChannelId)) === null || _c === void 0 ? void 0 : _c.channelId, creatorId: client.userId, creatorPrivateId: getActiveUser()._id, channelSegment: ((_d = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _d !== void 0 ? _d : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime, syncState: "syncing" /* Amity.SyncState.Syncing */, isDeleted: false }, bundleWithMessageId);
     const cachedAt = UNSYNCED_OBJECT_CACHED_AT_VALUE;
     pushToCache(['message', 'get', message.messageId], message, { cachedAt });
     // Own-send update (ChannelActivityService row 1): move the channel at send
@@ -22375,11 +22362,15 @@ class ChannelLiveCollectionController extends LiveCollectionController {
                 break;
             case 'displayName':
                 /*
-                 * The server returns channels with empty | null displayName's first, then
-                 * the rest in code-point order (case-sensitive). The comparator mirrors
-                 * that so the local order agrees with the page order.
+                 * The server returns channels with empty | null displayName's first before
+                 * returning sorted list of channels with displayNames
+                 *
+                 * This section needs to be updated as displayNames can be null as well
                  */
-                channels = channels.sort(sortByDisplayNameCodePoint);
+                channels = channels
+                    // this needs to be aligned with the backend data type
+                    .map(c => (c.displayName ? c : Object.assign(Object.assign({}, c), { displayName: '' })))
+                    .sort(sortByDisplayName);
                 break;
             default:
                 channels = channels.sort(sortByLastActivity);
@@ -37705,4 +37696,4 @@ class AmityAttachmentProductTags {
     }
 }
 
-export { API_REGIONS, index$6 as AdRepository, AmityAttachmentProductTags, AmityAutoSubscription, AmityChannelNotificationModeEnum, AmityCommunityType, AmityEventOrderOption, AmityEventOriginType, AmityEventResponseStatus, AmityEventSortOption, AmityEventStatus, AmityEventType, AmityLiveViewerCountMode, AmityModuleNotEntitledError, AmitySharableContentType, AnalyticsSourceTypeEnum, index$g as CategoryRepository, index$k as ChannelRepository, index$t as Client, index$f as CommentRepository, CommunityNotificationEventNameEnum, CommunityPostSettingMaps, CommunityPostSettings, index$h as CommunityRepository, ContentFeedType, ContentFlagReasonEnum, index as CuratedContentRepository, DefaultCommunityPostSetting, index$2 as EventRepository, FeedDataTypeEnum, index$e as FeedRepository, FeedSortByEnum, FeedSourceEnum, FeedTypeEnum, FileAccessTypeEnum, index$q as FileRepository, FileType, GET_WATCHER_URLS, index$4 as InvitationRepository, InvitationSortByEnum, InvitationStatusEnum, InvitationTargetTypeEnum, InvitationTypeEnum, JoinRequestStatusEnum, JoinResultStatusEnum, index$3 as LiveReactionRepository, index$8 as LiveStreamPlayer, MembershipAcceptanceTypeEnum, MessageContentType, index$o as MessageRepository, NotificationRolesFilterTypeEnum, NotificationSettingsLevelEnum, index$9 as PollRepository, PostContentType, index$c as PostRepository, PostStructureType, index$1 as ProductRepository, index$p as ReactionRepository, index$a as RoomPresenceRepository, index$d as RoomRepository, SearchUsersByEnum, index$7 as StoryRepository, index$b as StreamRepository, index$n as SubChannelRepository, SubscriptionLevels, UserNotificationModuleNameEnum, UserProfileFieldEnum, UserReportTypeEnum, index$r as UserRepository, UserTypeEnum, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, exceedsUntilAtBoundary, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, filterByUntilAt, filterCommentsByBlockUsers, filterPostsByBlockUsers, getBlockUsersId, getChannelTopic, getCommentTopic, getCommunityStoriesTopic, getCommunityTopic, getLiveReactionTopic, getLiveStreamTopic, getMarkedMessageTopic, getMarkerUserFeedTopic, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkId, getNetworkTopic, getPostTopic, getRole, getRoomStreamerTopic, getRoomWatcherTopic, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStoryTopic, getSubChannelTopic, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, index$5 as notificationTray, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, onUserMarkerFetchedLegacy, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, resolveModuleAvailability, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByDisplayNameCodePoint, sortByFirstCreated, sortByFirstUpdated, sortByLastActivity, sortByLastCreated, sortByLastMessage, sortByLastUpdated, sortByLocalSortingDate, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, validateUntilAt, wipeCache };
+export { API_REGIONS, index$6 as AdRepository, AmityAttachmentProductTags, AmityAutoSubscription, AmityChannelNotificationModeEnum, AmityCommunityType, AmityEventOrderOption, AmityEventOriginType, AmityEventResponseStatus, AmityEventSortOption, AmityEventStatus, AmityEventType, AmityLiveViewerCountMode, AmityModuleNotEntitledError, AmitySharableContentType, AnalyticsSourceTypeEnum, index$g as CategoryRepository, index$k as ChannelRepository, index$t as Client, index$f as CommentRepository, CommunityNotificationEventNameEnum, CommunityPostSettingMaps, CommunityPostSettings, index$h as CommunityRepository, ContentFeedType, ContentFlagReasonEnum, index as CuratedContentRepository, DefaultCommunityPostSetting, index$2 as EventRepository, FeedDataTypeEnum, index$e as FeedRepository, FeedSortByEnum, FeedSourceEnum, FeedTypeEnum, FileAccessTypeEnum, index$q as FileRepository, FileType, GET_WATCHER_URLS, index$4 as InvitationRepository, InvitationSortByEnum, InvitationStatusEnum, InvitationTargetTypeEnum, InvitationTypeEnum, JoinRequestStatusEnum, JoinResultStatusEnum, index$3 as LiveReactionRepository, index$8 as LiveStreamPlayer, MembershipAcceptanceTypeEnum, MessageContentType, index$o as MessageRepository, NotificationRolesFilterTypeEnum, NotificationSettingsLevelEnum, index$9 as PollRepository, PostContentType, index$c as PostRepository, PostStructureType, index$1 as ProductRepository, index$p as ReactionRepository, index$a as RoomPresenceRepository, index$d as RoomRepository, SearchUsersByEnum, index$7 as StoryRepository, index$b as StreamRepository, index$n as SubChannelRepository, SubscriptionLevels, UserNotificationModuleNameEnum, UserProfileFieldEnum, UserReportTypeEnum, index$r as UserRepository, UserTypeEnum, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, exceedsUntilAtBoundary, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, filterByUntilAt, filterCommentsByBlockUsers, filterPostsByBlockUsers, getBlockUsersId, getChannelTopic, getCommentTopic, getCommunityStoriesTopic, getCommunityTopic, getLiveReactionTopic, getLiveStreamTopic, getMarkedMessageTopic, getMarkerUserFeedTopic, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkId, getNetworkTopic, getPostTopic, getRole, getRoomStreamerTopic, getRoomWatcherTopic, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStoryTopic, getSubChannelTopic, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, index$5 as notificationTray, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, onUserMarkerFetchedLegacy, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, resolveModuleAvailability, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByFirstUpdated, sortByLastActivity, sortByLastCreated, sortByLastMessage, sortByLastUpdated, sortByLocalSortingDate, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, validateUntilAt, wipeCache };