Merge branch 'fork' into pl-api

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-08-16 12:16:42 +02:00
5 changed files with 62 additions and 48 deletions

View File

@ -38,7 +38,6 @@ import { getVapidKey } from 'soapbox/utils/auth';
import { isStandalone } from 'soapbox/utils/state';
import BackgroundShapes from './components/background-shapes';
import FloatingActionButton from './components/floating-action-button';
import {
Status,
CommunityTimeline,
@ -444,11 +443,6 @@ const UI: React.FC<IUI> = ({ children }) => {
dispatch(registerPushNotifications());
}, [vapidKey]);
const shouldHideFAB = (): boolean => {
const path = location.pathname;
return Boolean(path.match(/^\/posts\/|^\/search|^\/getting-started|^\/chats/));
};
// Wait for login to succeed or fail
if (me === null) return null;
@ -478,12 +472,6 @@ const UI: React.FC<IUI> = ({ children }) => {
</SwitchingColumnsArea>
</Layout>
{(me && !shouldHideFAB()) && (
<div className='fixed bottom-24 right-4 z-40 transition-all lg:hidden rtl:left-4 rtl:right-auto'>
<FloatingActionButton />
</div>
)}
<Suspense>
<SidebarMenu />
</Suspense>