diff --git a/native/chat/chat-input-bar.react.js b/native/chat/chat-input-bar.react.js --- a/native/chat/chat-input-bar.react.js +++ b/native/chat/chat-input-bar.react.js @@ -428,7 +428,7 @@ name="plus" style={this.props.styles.joinButtonText} /> - Join Thread + Join Chat ); } diff --git a/native/chat/chat-thread-list.react.js b/native/chat/chat-thread-list.react.js --- a/native/chat/chat-thread-list.react.js +++ b/native/chat/chat-thread-list.react.js @@ -298,7 +298,7 @@ onChangeText={this.onChangeSearchText} containerStyle={this.props.styles.search} onBlur={this.onSearchBlur} - placeholder="Search threads" + placeholder="Search chats" ref={this.searchInputRef} {...additionalProps} /> diff --git a/native/chat/chat.react.js b/native/chat/chat.react.js --- a/native/chat/chat.react.js +++ b/native/chat/chat.react.js @@ -220,7 +220,7 @@ headerBackTitleVisible: false, }); const composeThreadOptions = { - headerTitle: 'Compose thread', + headerTitle: 'Compose chat', headerBackTitleVisible: false, }; const threadSettingsOptions = ({ route }) => ({ @@ -228,7 +228,7 @@ headerBackTitleVisible: false, }); const deleteThreadOptions = { - headerTitle: 'Delete thread', + headerTitle: 'Delete chat', headerBackTitleVisible: false, }; diff --git a/native/chat/compose-subchannel.react.js b/native/chat/compose-subchannel.react.js --- a/native/chat/compose-subchannel.react.js +++ b/native/chat/compose-subchannel.react.js @@ -218,7 +218,7 @@ - Existing threads + Existing channels @@ -305,7 +305,7 @@ if (this.state.userInfoInputArray.length === 0) { Alert.alert( 'Chatting to yourself?', - 'Are you sure you want to create a thread containing only yourself?', + 'Are you sure you want to create a channel containing only yourself?', [ { text: 'Cancel', style: 'cancel' }, { text: 'Confirm', onPress: this.dispatchNewChatThreadAction }, diff --git a/native/chat/settings/compose-subchannel-modal.react.js b/native/chat/settings/compose-subchannel-modal.react.js --- a/native/chat/settings/compose-subchannel-modal.react.js +++ b/native/chat/settings/compose-subchannel-modal.react.js @@ -33,7 +33,7 @@ render() { return ( - Thread type + Chat type ); diff --git a/native/chat/settings/thread-settings-leave-thread.react.js b/native/chat/settings/thread-settings-leave-thread.react.js --- a/native/chat/settings/thread-settings-leave-thread.react.js +++ b/native/chat/settings/thread-settings-leave-thread.react.js @@ -65,7 +65,7 @@ iosFormat="highlight" iosHighlightUnderlayColor={panelIosHighlightUnderlay} > - Leave thread... + Leave chat... {loadingIndicator} @@ -85,7 +85,7 @@ Alert.alert( 'Confirm action', - 'Are you sure you want to leave this thread?', + 'Are you sure you want to leave this chat?', [ { text: 'Cancel', style: 'cancel' }, { text: 'OK', onPress: this.onConfirmLeaveThread }, diff --git a/native/chat/settings/thread-settings-member-tooltip-modal.react.js b/native/chat/settings/thread-settings-member-tooltip-modal.react.js --- a/native/chat/settings/thread-settings-member-tooltip-modal.react.js +++ b/native/chat/settings/thread-settings-member-tooltip-modal.react.js @@ -47,7 +47,7 @@ const userText = stringForUser(memberInfo); Alert.alert( 'Confirm removal', - `Are you sure you want to remove ${userText} from this thread?`, + `Are you sure you want to remove ${userText} from this chat?`, [ { text: 'Cancel', style: 'cancel' }, { text: 'OK', onPress: onConfirmRemoveUser }, @@ -79,7 +79,7 @@ : `make ${userText} an admin`; Alert.alert( 'Confirm action', - `Are you sure you want to ${actionClause} of this thread?`, + `Are you sure you want to ${actionClause} of this chat?`, [ { text: 'Cancel', style: 'cancel' }, { text: 'OK', onPress: onConfirmMakeAdmin }, diff --git a/native/chat/settings/thread-settings-promote-sidebar.react.js b/native/chat/settings/thread-settings-promote-sidebar.react.js --- a/native/chat/settings/thread-settings-promote-sidebar.react.js +++ b/native/chat/settings/thread-settings-promote-sidebar.react.js @@ -26,7 +26,7 @@ onClick = () => { Alert.alert( 'Are you sure?', - 'Promoting a sidebar to a full thread cannot be undone.', + 'Promoting a sidebar to a channel cannot be undone.', [ { text: 'Cancel', @@ -58,7 +58,7 @@ iosFormat="highlight" iosHighlightUnderlayColor={panelIosHighlightUnderlay} > - Promote to full thread + Promote to channel {loadingIndicator} diff --git a/native/chat/settings/thread-settings-push-notifs.react.js b/native/chat/settings/thread-settings-push-notifs.react.js --- a/native/chat/settings/thread-settings-push-notifs.react.js +++ b/native/chat/settings/thread-settings-push-notifs.react.js @@ -103,12 +103,12 @@ let alertMessage; if (Platform.OS === 'ios' && this.state.currentValue) { alertMessage = - 'Notifs for this thread are enabled, but cannot be delivered ' + + 'Notifs for this chat are enabled, but cannot be delivered ' + 'to this device because you haven’t granted notif permissions to Comm. ' + 'Please enable them in Settings App → Notifications → Comm'; } else if (Platform.OS === 'ios') { alertMessage = - 'In order to enable push notifs for this thread, ' + + 'In order to enable push notifs for this chat, ' + 'you need to first grant notif permissions to Comm. ' + 'Please enable them in Settings App → Notifications → Comm'; } else { diff --git a/native/chat/thread-screen-pruner.react.js b/native/chat/thread-screen-pruner.react.js --- a/native/chat/thread-screen-pruner.react.js +++ b/native/chat/thread-screen-pruner.react.js @@ -65,8 +65,8 @@ } if (activeThreadID && pruneThreadIDs.includes(activeThreadID)) { Alert.alert( - 'Thread invalidated', - 'You no longer have permission to view this thread :(', + 'Chat invalidated', + 'You no longer have permission to view this chat :(', [{ text: 'OK' }], { cancelable: true }, ); diff --git a/native/components/color-selector.react.js b/native/components/color-selector.react.js --- a/native/components/color-selector.react.js +++ b/native/components/color-selector.react.js @@ -58,7 +58,7 @@ return ( - Select thread color + Select chat color {firstRow} {secondRow} );