Page MenuHomePhabricator
Files F3362525

D5451.id17856.diff
No OneTemporary
Actions

D5451.id17856.diff
View Options

diff --git a/native/chat/multimedia-message-tooltip-modal.react.js b/native/chat/multimedia-message-tooltip-modal.react.js
--- a/native/chat/multimedia-message-tooltip-modal.react.js
+++ b/native/chat/multimedia-message-tooltip-modal.react.js
@@ -21,13 +21,8 @@
const spec = {
entries: [
{
- id: 'create_sidebar',
- text: 'Create thread',
- onPress: navigateToSidebar,
- },
- {
- id: 'open_sidebar',
- text: 'Go to thread',
+ id: 'sidebar',
+ text: 'Thread',
onPress: navigateToSidebar,
},
{
diff --git a/native/chat/multimedia-message.react.js b/native/chat/multimedia-message.react.js
--- a/native/chat/multimedia-message.react.js
+++ b/native/chat/multimedia-message.react.js
@@ -83,10 +83,11 @@
visibleEntryIDs() {
const result = [];
- if (this.props.item.threadCreatedFromMessage) {
- result.push('open_sidebar');
- } else if (this.props.canCreateSidebarFromMessage) {
- result.push('create_sidebar');
+ if (
+ this.props.item.threadCreatedFromMessage ||
+ this.props.canCreateSidebarFromMessage
+ ) {
+ result.push('sidebar');
}
if (!this.props.item.messageInfo.creator.isViewer) {
diff --git a/native/chat/robotext-message-tooltip-modal.react.js b/native/chat/robotext-message-tooltip-modal.react.js
--- a/native/chat/robotext-message-tooltip-modal.react.js
+++ b/native/chat/robotext-message-tooltip-modal.react.js
@@ -18,13 +18,8 @@
const spec = {
entries: [
{
- id: 'create_sidebar',
- text: 'Create thread',
- onPress: navigateToSidebar,
- },
- {
- id: 'open_sidebar',
- text: 'Go to thread',
+ id: 'sidebar',
+ text: 'Thread',
onPress: navigateToSidebar,
},
],
diff --git a/native/chat/robotext-message.react.js b/native/chat/robotext-message.react.js
--- a/native/chat/robotext-message.react.js
+++ b/native/chat/robotext-message.react.js
@@ -78,10 +78,8 @@
item.messageInfo,
);
const visibleEntryIDs = React.useMemo(() => {
- if (item.threadCreatedFromMessage) {
- return ['open_sidebar'];
- } else if (canCreateSidebarFromMessage) {
- return ['create_sidebar'];
+ if (item.threadCreatedFromMessage || canCreateSidebarFromMessage) {
+ return ['sidebar'];
}
return [];
}, [item.threadCreatedFromMessage, canCreateSidebarFromMessage]);
diff --git a/native/chat/text-message-tooltip-modal.react.js b/native/chat/text-message-tooltip-modal.react.js
--- a/native/chat/text-message-tooltip-modal.react.js
+++ b/native/chat/text-message-tooltip-modal.react.js
@@ -54,12 +54,7 @@
onPress: onPressReport,
},
{
- id: 'create_sidebar',
- text: 'Thread',
- onPress: navigateToSidebar,
- },
- {
- id: 'open_sidebar',
+ id: 'sidebar',
text: 'Thread',
onPress: navigateToSidebar,
},
diff --git a/native/chat/text-message.react.js b/native/chat/text-message.react.js
--- a/native/chat/text-message.react.js
+++ b/native/chat/text-message.react.js
@@ -119,10 +119,11 @@
result.push('reply');
}
- if (this.props.item.threadCreatedFromMessage) {
- result.push('open_sidebar');
- } else if (this.props.canCreateSidebarFromMessage) {
- result.push('create_sidebar');
+ if (
+ this.props.item.threadCreatedFromMessage ||
+ this.props.canCreateSidebarFromMessage
+ ) {
+ result.push('sidebar');
}
if (!this.props.item.messageInfo.creator.isViewer) {
diff --git a/native/navigation/tooltip.react.js b/native/navigation/tooltip.react.js
--- a/native/navigation/tooltip.react.js
+++ b/native/navigation/tooltip.react.js
@@ -128,10 +128,7 @@
icon = (
<SWMansionIcon name="warning-circle" style={styles.icon} size={16} />
);
- } else if (
- this.props.spec.id === 'create_sidebar' ||
- this.props.spec.id === 'open_sidebar'
- ) {
+ } else if (this.props.spec.id === 'sidebar') {
icon = (
<SWMansionIcon
name="message-circle-lines"

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 11:00 PM (11 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2581258
Default Alt Text
D5451.id17856.diff (3 KB)

Event Timeline