Page MenuHomePhorge
Files F33059419

D6592.1768432173.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D6592.1768432173.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
@@ -1495,6 +1495,7 @@
rawThreadInfoFromServerThreadInfo,
filterThreadEditDetailedPermissions,
robotextName,
+ threadUIName,
threadInfoFromRawThreadInfo,
rawThreadInfoFromThreadInfo,
threadTypeDescriptions,
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
@@ -13,8 +13,8 @@
import { getAvailableRelationshipButtons } from 'lib/shared/relationship-utils';
import {
threadHasPermission,
- robotextName,
getSingleOtherUser,
+ threadUIName,
} from 'lib/shared/thread-utils';
import {
type ThreadInfo,
@@ -22,6 +22,7 @@
threadPermissions,
type ThreadChanges,
} from 'lib/types/thread-types';
+import { useResolvedThreadInfo } from 'lib/utils/entity-helpers';
import Tabs from '../../../components/tabs.react';
import { useSelector } from '../../../redux/redux-utils';
@@ -67,10 +68,19 @@
Object.freeze({}),
);
- const namePlaceholder: string = React.useMemo(() => {
- invariant(threadInfo, 'threadInfo should exist in namePlaceholder');
- return robotextName(threadInfo, viewerID, userInfos);
- }, [threadInfo, userInfos, viewerID]);
+ const threadInfoWithNoName = React.useMemo(() => {
+ invariant(threadInfo, 'threadInfo should exist in threadInfoWithNoName');
+ if (threadInfo.name === null || threadInfo.name === undefined) {
+ return threadInfo;
+ }
+ const withNoName = { ...threadInfo, name: undefined };
+ return {
+ ...withNoName,
+ uiName: threadUIName(withNoName, viewerID, userInfos),
+ };
+ }, [threadInfo, viewerID, userInfos]);
+ const resolvedThreadInfo = useResolvedThreadInfo(threadInfoWithNoName);
+ const namePlaceholder = resolvedThreadInfo.uiName;
const otherMemberID = React.useMemo(() => {
if (!threadInfo) {
diff --git a/web/package.json b/web/package.json
--- a/web/package.json
+++ b/web/package.json
@@ -6,7 +6,7 @@
"license": "BSD-3-Clause",
"scripts": {
"clean": "rm -rf dist/ && rm -rf node_modules/",
- "dev": "yarn concurrently --names=\"NODESSR,BROWSER\" -c \"bgBlue.bold,bgMagenta.bold\" \"yarn webpack --config webpack.config.cjs --config-name=server --watch\" \"yarn webpack-dev-server --config webpack.config.cjs --config-name=browser\"",
+ "dev": "yarn concurrently --names=\"NODESSR,BROWSER\" -c \"bgBlue.bold,bgMagenta.bold\" \"COMM_ALCHEMY_KEY=1WOqngNjE2l1KtzYxsvuq3zB48ymnlDG yarn webpack --config webpack.config.cjs --config-name=server --watch\" \"COMM_ALCHEMY_KEY=1WOqngNjE2l1KtzYxsvuq3zB48ymnlDG yarn webpack-dev-server --config webpack.config.cjs --config-name=browser\"",
"prod": "yarn webpack --config webpack.config.cjs --env prod --progress",
"test": "jest"
},

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 14, 11:09 PM (13 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5934516
Default Alt Text
D6592.1768432173.diff (2 KB)

Event Timeline