diff --git a/src/core/client/stream/tabs/comments/views/permalink/components/ConversationThread.css b/src/core/client/stream/tabs/comments/views/permalink/components/ConversationThread.css index 3074b5320..4fc79ebc4 100644 --- a/src/core/client/stream/tabs/comments/views/permalink/components/ConversationThread.css +++ b/src/core/client/stream/tabs/comments/views/permalink/components/ConversationThread.css @@ -5,3 +5,7 @@ padding-left: var(--spacing-unit); padding-bottom: var(--spacing-unit); } + +.showMoreButton { + text-transform: uppercase; +} diff --git a/src/core/client/stream/tabs/comments/views/permalink/components/ConversationThread.tsx b/src/core/client/stream/tabs/comments/views/permalink/components/ConversationThread.tsx index 157dd65f5..da5597eef 100644 --- a/src/core/client/stream/tabs/comments/views/permalink/components/ConversationThread.tsx +++ b/src/core/client/stream/tabs/comments/views/permalink/components/ConversationThread.tsx @@ -71,16 +71,16 @@ const ConversationThread: StatelessComponent< {props.remaining > 1 && {props.remaining}} diff --git a/src/core/client/stream/tabs/comments/views/permalink/components/__snapshots__/ConversationThread.spec.tsx.snap b/src/core/client/stream/tabs/comments/views/permalink/components/__snapshots__/ConversationThread.spec.tsx.snap index 146fc5679..03f314a5c 100644 --- a/src/core/client/stream/tabs/comments/views/permalink/components/__snapshots__/ConversationThread.spec.tsx.snap +++ b/src/core/client/stream/tabs/comments/views/permalink/components/__snapshots__/ConversationThread.spec.tsx.snap @@ -44,15 +44,15 @@ exports[`with 2 remaining parent comments renders correctly 1`] = ` > - Show hidden comments + Show more of this conversation @@ -108,15 +108,15 @@ exports[`with 2 remaining parent comments renders with disabled load more 1`] = > - Show hidden comments + Show more of this conversation diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewLoadMoreParents.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewLoadMoreParents.spec.tsx.snap index d63332eb1..229626e96 100644 --- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewLoadMoreParents.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewLoadMoreParents.spec.tsx.snap @@ -76,9 +76,8 @@ exports[`renders conversation thread 1`] = ` className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignCenter" > `; -exports[`shows hidden comments 1`] = ` +exports[`shows more of this conversation 1`] = `
{ expect(within(conversationThread).toJSON()).toMatchSnapshot(); }); -it("shows hidden comments", async () => { +it("shows more of this conversation", async () => { const conversationThread = await waitForElement(() => within(testRenderer.root).getByTestID( "comments-permalinkView-conversationThread" @@ -108,13 +108,13 @@ it("shows hidden comments", async () => { // Show hidden comments. within(conversationThread) - .getByText("SHOW HIDDEN COMMENTS") + .getByText("Show More of This Conversation") .props.onClick(); // Wait until button disappears. await wait(() => expect( - within(conversationThread).queryByText("SHOW HIDDEN COMMENTS") + within(conversationThread).queryByText("Show More of This Conversation") ).toBeNull() ); diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl index 2ce799658..68947be39 100644 --- a/src/locales/en-US/stream.ftl +++ b/src/locales/en-US/stream.ftl @@ -74,11 +74,8 @@ comments-editCommentForm-editRemainingTime = Edit: remaining comments-editCommentForm-editTimeExpired = Edit time has expired. You can no longer edit this comment. Why not post another one? comments-editedMarker-edited = Edited comments-showConversationLink-readMore = Read More of this Conversation > -comments-conversationThread-showHiddenComments = - { $count -> - [1] SHOW HIDDEN COMMENT - *[other] SHOW HIDDEN COMMENTS - } +comments-conversationThread-showMoreOfThisConversation = + Show More of This Conversation comments-permalinkView-currentViewing = You are currently viewing a comments-permalinkView-singleConversation = SINGLE CONVERSATION