Fix recent sorting difference with webapp (#7632)

mattermost · Oct 26, 2023 · 01fdd1f · 01fdd1f
1 parent 196372e
commit 01fdd1f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/utils/categories.ts b/app/utils/categories.ts
@@ -180,7 +180,9 @@ const sortChannelsByName = (notifyPropsPerChannel: Record<string, Partial<Channe
 export const sortChannels = (sorting: CategorySorting, channelsWithMyChannel: ChannelWithMyChannel[], notifyPropsPerChannel: Record<string, Partial<ChannelNotifyProps>>, locale: string) => {
     if (sorting === 'recent') {
         return channelsWithMyChannel.sort((cwmA, cwmB) => {
-            return cwmB.myChannel.lastPostAt - cwmA.myChannel.lastPostAt;
+            const a = Math.max(cwmA.myChannel.lastPostAt, cwmA.channel.createAt);
+            const b = Math.max(cwmB.myChannel.lastPostAt, cwmB.channel.createAt);
+            return b - a;
         }).map((cwm) => cwm.channel);
     } else if (sorting === 'manual') {
         return channelsWithMyChannel.sort((cwmA, cwmB) => {