diff --git a/lib/shared/messages/create-sidebar-message-spec.js b/lib/shared/messages/create-sidebar-message-spec.js --- a/lib/shared/messages/create-sidebar-message-spec.js +++ b/lib/shared/messages/create-sidebar-message-spec.js @@ -170,7 +170,7 @@ ): string { let text = `started ${params.encodedThreadEntity( messageInfo.threadID, - `this sidebar`, + `this thread`, )}`; const users = messageInfo.initialThreadState.otherMembers.filter( member => member.id !== messageInfo.sourceMessageAuthor.id, @@ -198,7 +198,7 @@ threadID: rawMessageInfo.threadID, creatorID: rawMessageInfo.creatorID, time: rawMessageInfo.time, - robotext: 'created a sidebar', + robotext: 'created a thread', unsupportedMessageInfo: rawMessageInfo, }; }, @@ -225,7 +225,7 @@ ? 'your' : `${stringForUser(messageInfo.sourceMessageAuthor)}'s`; const body = - `started a sidebar in response to ${sourceMessageAuthorPossessive} ` + + `started a thread in response to ${sourceMessageAuthorPossessive} ` + `message "${messageInfo.initialThreadState.name ?? ''}"`; const merged = `${prefix} ${body}`; return { diff --git a/lib/shared/messages/create-sub-thread-message-spec.js b/lib/shared/messages/create-sub-thread-message-spec.js --- a/lib/shared/messages/create-sub-thread-message-spec.js +++ b/lib/shared/messages/create-sub-thread-message-spec.js @@ -125,7 +125,7 @@ const childName = messageInfo.childThreadInfo.name; const childNoun = messageInfo.childThreadInfo.type === threadTypes.SIDEBAR - ? 'sidebar' + ? 'thread' : 'subchannel'; if (childName) { return ( diff --git a/lib/shared/messages/sidebar-source-message-spec.js b/lib/shared/messages/sidebar-source-message-spec.js --- a/lib/shared/messages/sidebar-source-message-spec.js +++ b/lib/shared/messages/sidebar-source-message-spec.js @@ -149,7 +149,7 @@ threadID: rawMessageInfo.threadID, creatorID: rawMessageInfo.creatorID, time: rawMessageInfo.time, - robotext: 'first message in sidebar', + robotext: 'first message in thread', dontPrefixCreator: true, unsupportedMessageInfo: rawMessageInfo, }; diff --git a/lib/shared/search-utils.js b/lib/shared/search-utils.js --- a/lib/shared/search-utils.js +++ b/lib/shared/search-utils.js @@ -113,7 +113,7 @@ if (!isMemberOfParentThread && threadType === threadTypes.SIDEBAR) { notice = 'not in parent chat'; alertTitle = 'Not in parent chat'; - alertText = 'You can only add members of the parent chat to a sidebar'; + alertText = 'You can only add members of the parent chat to a thread'; } else if ( relationshipStatus === userRelationshipStatus.BLOCKED_BY_VIEWER ) { diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js --- a/lib/shared/thread-utils.js +++ b/lib/shared/thread-utils.js @@ -932,7 +932,7 @@ }; function threadNoun(threadType: ThreadType): string { - return threadType === threadTypes.SIDEBAR ? 'sidebar' : 'chat'; + return threadType === threadTypes.SIDEBAR ? 'thread' : 'chat'; } function threadLabel(threadType: ThreadType): string { @@ -944,7 +944,7 @@ } else if (threadType === threadTypes.PERSONAL) { return 'Personal'; } else if (threadType === threadTypes.SIDEBAR) { - return 'Sidebar'; + return 'Thread'; } else if (threadType === threadTypes.PRIVATE) { return 'Private'; } else if ( diff --git a/native/chat/chat-thread-list-see-more-sidebars.react.js b/native/chat/chat-thread-list-see-more-sidebars.react.js --- a/native/chat/chat-thread-list-see-more-sidebars.react.js +++ b/native/chat/chat-thread-list-see-more-sidebars.react.js @@ -26,7 +26,7 @@ const colors = useColors(); const styles = useStyles(unboundStyles); const unreadStyle = unread ? styles.unread : null; - const buttonText = showingSidebarsInline ? 'See more...' : 'See sidebars...'; + const buttonText = showingSidebarsInline ? 'See more...' : 'See threads...'; return (