Merge pull request #13257 from sadohpv/fix26b/web/fix-ctrl-K-thread

260608 - WEB/DESKTOP - fix archive thread hard code

Author: huybuidoanquang

apps/chat/src/app/pages/channel/index.tsx

@@ -53,6 +53,7 @@ import {
 	ONE_MILISECONDS,
 	ONE_MINUTE_MS,
 	SubPanelName,
+	ThreadStatus,
 	buildChannelAppLaunchUrl,
 	generateE2eId,
 	isBackgroundModeActive,
@@ -111,8 +112,8 @@ function useChannelSeen(channelId: string) {
 
 	const updateChannelSeenState = useCallback(
 		(_channelId: string) => {
-			if (currentChannel.type === ChannelType.CHANNEL_TYPE_THREAD) {
-				const channelWithActive = { ...currentChannel, active: 1 };
+			if (currentChannel.type === ChannelType.CHANNEL_TYPE_THREAD && currentChannel.active === ThreadStatus.archived) {
+				const channelWithActive = { ...currentChannel, active: ThreadStatus.activePublic };
 				dispatch(
 					channelsActions.upsertOne({
 						clanId: currentChannel?.clan_id || '0',

libs/store/src/lib/channels/channels.slice.ts

@@ -718,7 +718,7 @@ export const addThreadToChannels = createAsyncThunk(
 							clanId,
 							channel: {
 								...matchedThread,
-								active: matchedThread.active ? ThreadStatus.joined : ThreadStatus.activePublic
+								active: matchedThread.active
 							} as ChannelsEntity
 						})
 					);
@@ -809,7 +809,10 @@ export const fetchChannels = createAsyncThunk(
 							)
 							.unwrap();
 						if (data?.threads?.length > 0) {
-							response.channeldesc.push({ ...data.threads[0], active: 1 } as ChannelsEntity);
+							response.channeldesc.push({
+								...data.threads[0],
+								active: data.threads[0].active ? data.threads[0].active : ThreadStatus.activePublic
+							} as ChannelsEntity);
 						}
 					}
 				} catch (error) {