Skip to content

Regression: UserCard "See full profile" link broken #19941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 3 commits into from
Dec 22, 2020
Merged

Regression: UserCard "See full profile" link broken #19941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
509a65a
fix UserCard see profile link
Dec 22, 2020
37cdaeb
fix instance call
Dec 22, 2020
e5a195d
Fix review
ggazzo Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/threads/client/components/ThreadComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const ThreadComponent: FC<{
const channelRoute = useRoute(roomTypes.getConfig(room.t).route.name);
const threadMessage = useThreadMessage(mid);

const open = useTabBarOpenUserInfo();
const openUserInfo = useTabBarOpenUserInfo();

const ref = useRef<Element>(null);
const uid = useUserId();
Expand Down Expand Up @@ -107,7 +107,7 @@ const ThreadComponent: FC<{
following,
subscription,
rid: room._id,
openProfileTab: open,
tabBar: { openUserInfo },
}));

useEffect(() => {
Expand All @@ -122,10 +122,10 @@ const ThreadComponent: FC<{
following,
subscription,
rid: room._id,
openProfileTab: open,
tabBar: { openUserInfo },
};
});
}, [following, jump, open, room._id, subscription, threadMessage]);
}, [following, jump, openUserInfo, room._id, subscription, threadMessage]);

useEffect(() => {
if (!ref.current || !viewData.mainMessage) {
Expand Down
4 changes: 2 additions & 2 deletions app/ui/client/views/app/lib/getCommonRoomEvents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export const getCommonRoomEvents = () => ({
target: e.currentTarget,
open: (e) => {
e.preventDefault();
instance.data.openProfileTab(username);
instance.data.tabBar.openUserInfo(username);
},
});
}
Expand Down Expand Up @@ -309,7 +309,7 @@ export const getCommonRoomEvents = () => ({
target: e.currentTarget,
open: (e) => {
e.preventDefault();
instance.data.openProfileTab(username);
instance.data.tabBar.openUserInfo(username);
},
});
}
Expand Down
3 changes: 1 addition & 2 deletions client/components/UserCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ const Roles = ({ children }) => <Info rcx-user-card__roles m='neg-x2' flexWrap='
{children}
</Info>;

const Role = ({ children }) => <Box m='x2'><Tag
const Role = ({ children }) => <Box m='x2' fontScale='c2'><Tag
disabled
fontScale='c2'
children={children}
/></Box>;

Expand Down