- {newMentions ? (
-
99})}>
- {Math.min(newMentions, 99)}
- {newMentions > 99 && '+'}
-
- ) : (
-
+ <>
+
+
+ {Boolean(newMentions || newReplies) && (
+
+ {newMentions ? (
+
99})}>
+ {Math.min(newMentions, 99)}
+ {newMentions > 99 && '+'}
+
+ ) : (
+
+ )}
+
+ )}
+ {postAuthor}
+
+ {channel && postAuthor !== channel?.display_name && (
+
+ )}
+ {isPostPriorityEnabled && (
+ thread.is_urgent && (
+
+ )
)}
- )}
- {postAuthor}
-
- {channel && postAuthor !== channel?.display_name && (
-
+
+
+
+
+ )}
+ >
+
+
+
+
+
+
+
+ {/* The strange interaction here where we need a click/keydown handler messes with the ESLint rules, so we just disable it */}
+ {/*eslint-disable-next-line jsx-a11y/no-static-element-interactions*/}
+
+ {post.message ? (
+
- )}
- {isPostPriorityEnabled && (
- thread.is_urgent && (
-
- )
+ ) : (
+
)}
-
-
-
-
+ {participantIds?.length ? (
+
+ ) : null}
+ {Boolean(totalReplies) && (
+ <>
+ {newReplies ? (
+
+ ) : (
+
+ )}
+ >
+ )}
+
+ {showListTutorialTip && isFirstThreadInList && isMobileView && (
)}
+
-
- )}
- >
-
-
-
-
-
-
-
- {/* The strange interaction here where we need a click/keydown handler messes with the ESLint rules, so we just disable it */}
- {/*eslint-disable-next-line jsx-a11y/no-static-element-interactions*/}
-
- {post.message ? (
-
- ) : (
-
- )}
-
-
- {participantIds?.length ? (
-
- ) : null}
- {Boolean(totalReplies) && (
- <>
- {newReplies ? (
-
- ) : (
-
- )}
- >
- )}
+
- {showListTutorialTip && isFirstThreadInList && isMobileView && ( )}
-
+ >
);
}
diff --git a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
index a8ba0542b7..75d61cbb70 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
+++ b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
@@ -120,9 +120,7 @@ const ThreadList = ({
}
}
select(data[threadIdToSelect]);
-
- // hacky way to ensure the thread item loses focus.
- ref.current?.focus();
+ e.preventDefault();
}, [selectedThreadId, data]);
useEffect(() => {
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 51a87f50e8..c276012e5c 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -5497,6 +5497,7 @@
"threading.threadHeader.menu": "More Actions",
"threading.threadItem.ariaLabel": "Thread by {author}",
"threading.threadItem.menu": "Actions",
+ "threading.threadItem.timestamp": "Last reply ",
"threading.threadList.markRead": "Mark all threads as read",
"threading.threadList.tabsLabel": "Filter visible threads",
"threading.threadMenu.copy": "Copy link",