Page MenuHomePhorge

D10920.1768209315.diff
No OneTemporary

Size
1 KB
Referenced Files
None
Subscribers
None

D10920.1768209315.diff

diff --git a/web/settings/relationship/user-list-hooks.js b/web/settings/relationship/user-list-hooks.js
--- a/web/settings/relationship/user-list-hooks.js
+++ b/web/settings/relationship/user-list-hooks.js
@@ -3,20 +3,19 @@
import * as React from 'react';
import { useENSNames } from 'lib/hooks/ens-cache.js';
-import type {
- AccountUserInfo,
- GlobalAccountUserInfo,
-} from 'lib/types/user-types';
+import { stringForUser } from 'lib/shared/user-utils.js';
-function useSortedENSResolvedUsers(
- userInfos: $ReadOnlyArray<GlobalAccountUserInfo | AccountUserInfo>,
-): $ReadOnlyArray<GlobalAccountUserInfo | AccountUserInfo> {
+type BaseUserInfo = { +username?: ?string, +isViewer?: ?boolean, ... };
+
+function useSortedENSResolvedUsers<T: BaseUserInfo>(
+ userInfos: $ReadOnlyArray<T>,
+): $ReadOnlyArray<T> {
const ensResolvedUsers = useENSNames(userInfos);
return React.useMemo(
() =>
ensResolvedUsers.sort((userInfo1, userInfo2) =>
- userInfo1.username.localeCompare(userInfo2.username),
+ stringForUser(userInfo1).localeCompare(stringForUser(userInfo2)),
),
[ensResolvedUsers],
);

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 12, 9:15 AM (7 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5922590
Default Alt Text
D10920.1768209315.diff (1 KB)

Event Timeline