Page MenuHomePhabricator
Files F3707867

D4577.diff
No OneTemporary
Actions

D4577.diff
View Options

diff --git a/lib/selectors/chat-selectors.js b/lib/selectors/chat-selectors.js
--- a/lib/selectors/chat-selectors.js
+++ b/lib/selectors/chat-selectors.js
@@ -57,7 +57,6 @@
| {
+type: 'seeMore',
+unread: boolean,
- +showingSidebarsInline: boolean,
}
| { +type: 'spacer' };
@@ -178,7 +177,6 @@
sidebarItems.push({
type: 'seeMore',
unread: numUnreadSidebars > maxUnreadSidebars,
- showingSidebarsInline: sidebarItems.length !== 0,
});
}
if (sidebarItems.length !== 0) {
diff --git a/native/chat/chat-thread-list-item.react.js b/native/chat/chat-thread-list-item.react.js
--- a/native/chat/chat-thread-list-item.react.js
+++ b/native/chat/chat-thread-list-item.react.js
@@ -73,7 +73,6 @@
<ChatThreadListSeeMoreSidebars
threadInfo={data.threadInfo}
unread={sidebarItem.unread}
- showingSidebarsInline={sidebarItem.showingSidebarsInline}
onPress={onPressSeeMoreSidebars}
key="seeMore"
/>
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
@@ -13,11 +13,10 @@
type Props = {
+threadInfo: ThreadInfo,
+unread: boolean,
- +showingSidebarsInline: boolean,
+onPress: (threadInfo: ThreadInfo) => void,
};
function ChatThreadListSeeMoreSidebars(props: Props): React.Node {
- const { onPress, threadInfo, unread, showingSidebarsInline } = props;
+ const { onPress, threadInfo, unread } = props;
const onPressButton = React.useCallback(() => onPress(threadInfo), [
onPress,
threadInfo,
@@ -26,7 +25,6 @@
const colors = useColors();
const styles = useStyles(unboundStyles);
const unreadStyle = unread ? styles.unread : null;
- const buttonText = showingSidebarsInline ? 'See more...' : 'See threads...';
return (
<Button
iosFormat="highlight"
@@ -36,7 +34,7 @@
onPress={onPressButton}
>
<Icon name="ios-more" size={28} style={styles.icon} />
- <Text style={[styles.text, unreadStyle]}>{buttonText}</Text>
+ <Text style={[styles.text, unreadStyle]}>See more...</Text>
</Button>
);
}
diff --git a/web/chat/chat-thread-list-item.react.js b/web/chat/chat-thread-list-item.react.js
--- a/web/chat/chat-thread-list-item.react.js
+++ b/web/chat/chat-thread-list-item.react.js
@@ -104,7 +104,6 @@
<ChatThreadListSeeMoreSidebars
threadInfo={item.threadInfo}
unread={sidebarItem.unread}
- showingSidebarsInline={sidebarItem.showingSidebarsInline}
key="seeMore"
/>
);
diff --git a/web/chat/chat-thread-list-see-more-sidebars.react.js b/web/chat/chat-thread-list-see-more-sidebars.react.js
--- a/web/chat/chat-thread-list-see-more-sidebars.react.js
+++ b/web/chat/chat-thread-list-see-more-sidebars.react.js
@@ -12,17 +12,15 @@
type Props = {
+threadInfo: ThreadInfo,
+unread: boolean,
- +showingSidebarsInline: boolean,
};
function ChatThreadListSeeMoreSidebars(props: Props): React.Node {
- const { unread, showingSidebarsInline, threadInfo } = props;
+ const { unread, threadInfo } = props;
const { pushModal } = useModalContext();
const onClick = React.useCallback(
() => pushModal(<SidebarListModal threadInfo={threadInfo} />),
[pushModal, threadInfo],
);
- const buttonText = showingSidebarsInline ? 'See more...' : 'See threads...';
return (
<div className={classNames(css.thread, css.sidebar)} onClick={onClick}>
<a className={css.threadButton}>
@@ -34,7 +32,7 @@
[css.unread]: unread,
})}
>
- {buttonText}
+ See more...
</div>
</div>
</a>

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 9, 2:10 AM (4 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2825899
Default Alt Text
D4577.diff (3 KB)

Event Timeline