Page MenuHomePhorge
Files F33031121

D9458.1768403012.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D9458.1768403012.diff
View Options

diff --git a/web/modals/user-profile/user-profile-modal.react.js b/web/modals/user-profile/user-profile-modal.react.js
--- a/web/modals/user-profile/user-profile-modal.react.js
+++ b/web/modals/user-profile/user-profile-modal.react.js
@@ -3,8 +3,10 @@
import * as React from 'react';
import { useModalContext } from 'lib/components/modal-provider.react.js';
+import { useUserProfileThreadInfo } from 'lib/shared/thread-utils.js';
import type { UserInfo } from 'lib/types/user-types.js';
+import UserProfileMenu from './user-profile-menu.react.js';
import UserProfile from './user-profile.react.js';
import { useSelector } from '../../redux/redux-utils.js';
import Modal from '../modal.react.js';
@@ -22,13 +24,30 @@
state => state.userStore.userInfos[userID],
);
+ const userProfileThreadInfo = useUserProfileThreadInfo(userInfo);
+
+ const menuButton = React.useMemo(() => {
+ if (!userProfileThreadInfo) {
+ // The case for anonymous users
+ return null;
+ }
+ return <UserProfileMenu threadInfo={userProfileThreadInfo.threadInfo} />;
+ }, [userProfileThreadInfo]);
+
const userProfileModal = React.useMemo(
() => (
- <Modal size="fit-content" onClose={popModal}>
- <UserProfile userInfo={userInfo} />
+ <Modal
+ size="fit-content"
+ onClose={popModal}
+ secondaryHeaderButton={menuButton}
+ >
+ <UserProfile
+ userInfo={userInfo}
+ userProfileThreadInfo={userProfileThreadInfo}
+ />
</Modal>
),
- [popModal, userInfo],
+ [menuButton, popModal, userInfo, userProfileThreadInfo],
);
return userProfileModal;
diff --git a/web/modals/user-profile/user-profile.react.js b/web/modals/user-profile/user-profile.react.js
--- a/web/modals/user-profile/user-profile.react.js
+++ b/web/modals/user-profile/user-profile.react.js
@@ -4,8 +4,8 @@
import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
import { relationshipBlockedInEitherDirection } from 'lib/shared/relationship-utils.js';
-import { useUserProfileThreadInfo } from 'lib/shared/thread-utils.js';
import { stringForUserExplicit } from 'lib/shared/user-utils.js';
+import type { UserProfileThreadInfo } from 'lib/types/thread-types';
import type { UserInfo } from 'lib/types/user-types';
import sleep from 'lib/utils/sleep.js';
@@ -15,12 +15,11 @@
type Props = {
+userInfo: ?UserInfo,
+ +userProfileThreadInfo: ?UserProfileThreadInfo,
};
function UserProfile(props: Props): React.Node {
- const { userInfo } = props;
-
- const userProfileThreadInfo = useUserProfileThreadInfo(userInfo);
+ const { userInfo, userProfileThreadInfo } = props;
const usernameText = stringForUserExplicit(userInfo);

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 14, 3:03 PM (5 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5929449
Default Alt Text
D9458.1768403012.diff (2 KB)

Event Timeline