Page MenuHomePhorge
Files F32629877

D10819.1767480772.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D10819.1767480772.diff
View Options

diff --git a/web/settings/relationship/add-users-list-modal.react.js b/web/settings/relationship/add-users-list-modal.react.js
--- a/web/settings/relationship/add-users-list-modal.react.js
+++ b/web/settings/relationship/add-users-list-modal.react.js
@@ -12,6 +12,7 @@
UserRelationshipStatus,
RelationshipAction,
} from 'lib/types/relationship-types.js';
+import type { GlobalAccountUserInfo } from 'lib/types/user-types.js';
import { useLegacyAshoatKeyserverCall } from 'lib/utils/action-utils.js';
import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
@@ -47,8 +48,8 @@
const { popModal } = useModalContext();
const [pendingUsersToAdd, setPendingUsersToAdd] = React.useState<
- $ReadOnlySet<string>,
- >(new Set());
+ $ReadOnlyMap<string, GlobalAccountUserInfo>,
+ >(new Map());
const [errorMessage, setErrorMessage] = React.useState('');
@@ -75,7 +76,7 @@
setErrorMessage('');
const result = await callUpdateRelationships({
action: relationshipAction,
- userIDs: Array.from(pendingUsersToAdd),
+ userIDs: Array.from(pendingUsersToAdd.keys()),
});
popModal();
return result;
diff --git a/web/settings/relationship/add-users-list.react.js b/web/settings/relationship/add-users-list.react.js
--- a/web/settings/relationship/add-users-list.react.js
+++ b/web/settings/relationship/add-users-list.react.js
@@ -21,8 +21,8 @@
type Props = {
+searchText: string,
+excludedStatuses?: $ReadOnlySet<UserRelationshipStatus>,
- +pendingUsersToAdd: $ReadOnlySet<string>,
- +setPendingUsersToAdd: SetState<$ReadOnlySet<string>>,
+ +pendingUsersToAdd: $ReadOnlyMap<string, GlobalAccountUserInfo>,
+ +setPendingUsersToAdd: SetState<$ReadOnlyMap<string, GlobalAccountUserInfo>>,
+errorMessage: string,
};
@@ -95,16 +95,22 @@
const toggleUser = React.useCallback(
(userID: string) => {
setPendingUsersToAdd(pendingUsers => {
- const newPendingUsers = new Set(pendingUsers);
+ const newPendingUsers = new Map(pendingUsers);
if (!newPendingUsers.delete(userID)) {
- newPendingUsers.add(userID);
+ const newPendingUser: GlobalAccountUserInfo = {
+ id: userID,
+ username: mergedUserInfos[userID].username,
+ avatar: mergedUserInfos[userID].avatar,
+ };
+
+ newPendingUsers.set(userID, newPendingUser);
}
return newPendingUsers;
});
},
- [setPendingUsersToAdd],
+ [mergedUserInfos, setPendingUsersToAdd],
);
const sortedUsersWithENSNames = useENSNames(sortedUsers);
@@ -123,7 +129,7 @@
);
const onClickClearAll = React.useCallback(() => {
- setPendingUsersToAdd(new Set());
+ setPendingUsersToAdd(new Map());
}, [setPendingUsersToAdd]);
const clearAllButtonColor = React.useMemo(() => {

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 3, 10:52 PM (10 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5887819
Default Alt Text
D10819.1767480772.diff (2 KB)

Event Timeline