diff --git a/app/javascript/mastodon/features/compose/redesign/trigger.tsx b/app/javascript/mastodon/features/compose/redesign/trigger.tsx index 0e99a16b7fc..8b40526882e 100644 --- a/app/javascript/mastodon/features/compose/redesign/trigger.tsx +++ b/app/javascript/mastodon/features/compose/redesign/trigger.tsx @@ -6,21 +6,10 @@ import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; import { useRouteMatch } from 'react-router'; -import { - ChatCircleDotsIcon, - NewspaperIcon, - PenNibIcon, - ReadCvLogoIcon, -} from '@phosphor-icons/react'; +import { PenNibIcon, ReadCvLogoIcon } from '@phosphor-icons/react'; import type { IconButtonProps } from '@/mastodon/components/button/redesign'; import { IconButton } from '@/mastodon/components/button/redesign'; -import { - Menu, - MenuTrigger, - MenuList, - MenuItem, -} from '@/mastodon/components/menu'; import { MenuCard } from '@/mastodon/components/menu/card'; import { useIdentity } from '@/mastodon/identity_context'; import { @@ -70,17 +59,9 @@ export const ComposeRedesignButton: React.FC<{ const dispatch = useAppDispatch(); const handleComposerOpen: React.MouseEventHandler = - useCallback( - (event) => { - const { - currentTarget: { name }, - } = event; - if (name === 'post' || name === 'message') { - dispatch(openNewComposer({ type: name })); - } - }, - [dispatch], - ); + useCallback(() => { + dispatch(openNewComposer({ type: 'post' })); + }, [dispatch]); const toggleMinimize = useCallback(() => { dispatch(minimizeComposerToggle()); @@ -104,6 +85,7 @@ export const ComposeRedesignButton: React.FC<{ onClick={toggleMinimize} {...floatingButtonProps} hidden={false} // never hide minimized composer button + color='neutral' > @@ -140,36 +122,13 @@ export const ComposeRedesignButton: React.FC<{ } return ( - - - - - - - - - - - - - - - + + + ); }; @@ -190,7 +149,7 @@ const FloatingActionButton: React.FC< )} inert={hidden} > - + ); }; @@ -221,8 +180,9 @@ function useHasMobileFloatingActionButton({ isMobile }: { isMobile: boolean }) { }); const shouldHideMobileComposeButton = - isMobile && - (!isRouteWithMobileComposeButton || isRouteWithoutMobileComposeButton); + !isMobile || + !isRouteWithMobileComposeButton || + isRouteWithoutMobileComposeButton; return !shouldHideMobileComposeButton; } diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 2d2249a9b25..668623eeb60 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -536,8 +536,6 @@ "compose.message.saved.body": "Message saved", "compose.minimize": "Minimize composer", "compose.new": "Write a new post or messsage", - "compose.new.message": "Message", - "compose.new.post": "Post", "compose.poll.add": "Add another option", "compose.poll.delete": "Delete poll", "compose.poll.duration": "Duration:",