matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into next-colors

Browse Source
This commit is contained in:
Alex Gleason
2022-03-22 13:57:09 -05:00
parent a42ea0961a 9af141dd87
commit 9e16d992e6
17 changed files with 83 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/soapbox/features/ui/components/profile-dropdown.tsx
View File

@ -2,6 +2,7 @@ import throttle from 'lodash/throttle';
import React from 'react';
import { defineMessages, useIntl } from 'react-intl';
import { useDispatch } from 'react-redux';
import { Link } from 'react-router-dom';
import { logOut, switchAccount } from 'soapbox/actions/auth';
import { fetchOwnAccounts } from 'soapbox/actions/auth';
@ -42,16 +43,13 @@ const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
const isCurrentAccountStaff = isStaff(currentAccount) || false;
const otherAccounts = useAppSelector((state) => authUsers.map((authUser: any) => getAccount(state, authUser.get('id'))));
const handleLogOut = (event: React.MouseEvent) => {
event.preventDefault();
const handleLogOut = () => {
dispatch(logOut(intl));
};
const handleSwitchAccount = (account: AccountEntity) => {
return (event: React.MouseEvent) => {
return () => {
dispatch(switchAccount(account.id));
event.preventDefault();
};
};
@ -115,7 +113,7 @@ const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
return <MenuDivider key={idx} />;
} else {
const Comp: any = menuItem.action ? MenuItem : MenuLink;
const itemProps = menuItem.action ? { onSelect: menuItem.action } : { href: menuItem.to };
const itemProps = menuItem.action ? { onSelect: menuItem.action } : { to: menuItem.to, as: Link };
return (
<Comp key={idx} {...itemProps}>