Page MenuHomePhabricator
Files F3528953

D10646.diff
No OneTemporary
Actions

D10646.diff
View Options

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
@@ -908,23 +908,16 @@
: rawThreadInfo;
}
-function threadUIName(
- threadInfo: LegacyThreadInfo | ThreadInfo,
-): string | ThreadEntity {
+function threadUIName(threadInfo: ThreadInfo): string | ThreadEntity {
if (threadInfo.name) {
return firstLine(threadInfo.name);
}
- let threadMembers: $ReadOnlyArray<RelativeMemberInfo>;
- let memberEntities: $ReadOnlyArray<UserEntity>;
- // Branching below is to appease flow
- if (threadInfo.minimallyEncoded) {
- threadMembers = threadInfo.members.filter(memberInfo => memberInfo.role);
- memberEntities = threadMembers.map(member => ET.user({ userInfo: member }));
- } else {
- threadMembers = threadInfo.members.filter(memberInfo => memberInfo.role);
- memberEntities = threadMembers.map(member => ET.user({ userInfo: member }));
- }
+ const threadMembers: $ReadOnlyArray<RelativeMemberInfo> =
+ threadInfo.members.filter(memberInfo => memberInfo.role);
+ const memberEntities: $ReadOnlyArray<UserEntity> = threadMembers.map(member =>
+ ET.user({ userInfo: member }),
+ );
return {
type: 'thread',
diff --git a/web/modals/threads/settings/thread-settings-modal.react.js b/web/modals/threads/settings/thread-settings-modal.react.js
--- a/web/modals/threads/settings/thread-settings-modal.react.js
+++ b/web/modals/threads/settings/thread-settings-modal.react.js
@@ -54,7 +54,7 @@
deleteThreadLoadingStatusSelector(state) === 'loading' ||
changeThreadSettingsLoadingStatusSelector(state) === 'loading',
);
- const threadInfo: ?LegacyThreadInfo | ?ThreadInfo = useSelector(
+ const threadInfo: ?ThreadInfo = useSelector(
state => threadInfoSelector(state)[props.threadID],
);
const modalContext = useModalContext();
@@ -70,10 +70,7 @@
if (threadInfo.name === null || threadInfo.name === undefined) {
return threadInfo;
}
- // Branching on `minimallyEncoded` to appease `flow`.
- const withNoName = threadInfo.minimallyEncoded
- ? { ...threadInfo, name: undefined }
- : { ...threadInfo, name: undefined };
+ const withNoName = { ...threadInfo, name: undefined };
return {
...withNoName,
uiName: threadUIName(withNoName),

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 11:35 AM (41 m, 14 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2702601
Default Alt Text
D10646.diff (2 KB)

Event Timeline