Page MenuHomePhabricator
Files F3385218

D4538.diff
No OneTemporary
Actions

D4538.diff
View Options

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}
/>
- <Text style={this.props.styles.joinButtonText}>Join Thread</Text>
+ <Text style={this.props.styles.joinButtonText}>Join Chat</Text>
</View>
);
}
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 @@
<View style={this.props.styles.existingThreads}>
<View style={this.props.styles.existingThreadsRow}>
<Text style={this.props.styles.existingThreadsLabel}>
- Existing threads
+ Existing channels
</Text>
</View>
<View style={this.props.styles.existingThreadList}>
@@ -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 (
<Modal modalStyle={this.props.styles.modal}>
- <Text style={this.props.styles.visibility}>Thread type</Text>
+ <Text style={this.props.styles.visibility}>Chat type</Text>
<Button style={this.props.styles.option} onPress={this.onPressOpen}>
<SWMansionIcon
name="globe-1"
diff --git a/native/chat/settings/delete-thread.react.js b/native/chat/settings/delete-thread.react.js
--- a/native/chat/settings/delete-thread.react.js
+++ b/native/chat/settings/delete-thread.react.js
@@ -110,7 +110,7 @@
this.props.loadingStatus === 'loading' ? (
<ActivityIndicator size="small" color="white" />
) : (
- <Text style={this.props.styles.deleteText}>Delete thread</Text>
+ <Text style={this.props.styles.deleteText}>Delete chat</Text>
);
const threadInfo = DeleteThread.getThreadInfo(this.props);
const { panelForegroundTertiaryLabel } = this.props.colors;
@@ -121,7 +121,7 @@
>
<View>
<Text style={this.props.styles.warningText}>
- {`The thread "${threadInfo.uiName}" will be permanently deleted. `}
+ {`The chat "${threadInfo.uiName}" will be permanently deleted. `}
There is no way to reverse this.
</Text>
</View>
diff --git a/native/chat/settings/thread-settings-delete-thread.react.js b/native/chat/settings/thread-settings-delete-thread.react.js
--- a/native/chat/settings/thread-settings-delete-thread.react.js
+++ b/native/chat/settings/thread-settings-delete-thread.react.js
@@ -38,7 +38,7 @@
iosFormat="highlight"
iosHighlightUnderlayColor={panelIosHighlightUnderlay}
>
- <Text style={styles.text}>Delete thread...</Text>
+ <Text style={styles.text}>Delete chat...</Text>
</Button>
</View>
);
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}
>
- <Text style={this.props.styles.text}>Leave thread...</Text>
+ <Text style={this.props.styles.text}>Leave chat...</Text>
{loadingIndicator}
</Button>
</View>
@@ -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}
>
- <Text style={this.props.styles.text}>Promote to full thread</Text>
+ <Text style={this.props.styles.text}>Promote to channel</Text>
{loadingIndicator}
</Button>
</View>
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 (
<View style={styles.container}>
- <Text style={styles.header}>Select thread color</Text>
+ <Text style={styles.header}>Select chat color</Text>
<View style={styles.colorButtons}>{firstRow}</View>
<View style={styles.colorButtons}>{secondRow}</View>
<TouchableOpacity
diff --git a/native/components/thread-list.react.js b/native/components/thread-list.react.js
--- a/native/components/thread-list.react.js
+++ b/native/components/thread-list.react.js
@@ -73,7 +73,7 @@
searchText={this.state.searchText}
onChangeText={this.onChangeSearchText}
containerStyle={this.props.styles.search}
- placeholder="Search threads"
+ placeholder="Search chats"
ref={this.searchRef}
/>
);

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 29, 11:49 PM (20 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2598659
Default Alt Text
D4538.diff (9 KB)

Event Timeline