From bb51f5b18d35d04ae3dd2105eeb49409c77f4c83 Mon Sep 17 00:00:00 2001 From: Federico Franco <81330093+FFederi@users.noreply.github.com> Date: Tue, 11 Aug 2026 00:42:48 +0900 Subject: [PATCH] Remove duplicate simplified layout check (#40060) --- app/javascript/mastodon/features/ui/index.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx index b743210afba..23f2fb9bd90 100644 --- a/app/javascript/mastodon/features/ui/index.jsx +++ b/app/javascript/mastodon/features/ui/index.jsx @@ -121,6 +121,7 @@ class SwitchingColumnsArea extends PureComponent { singleColumn: PropTypes.bool, layout: PropTypes.string.isRequired, forceOnboarding: PropTypes.bool, + minimalShell: PropTypes.bool, }; componentDidMount () { @@ -158,7 +159,7 @@ class SwitchingColumnsArea extends PureComponent { }; render () { - const { children, singleColumn, forceOnboarding } = this.props; + const { children, singleColumn, forceOnboarding, minimalShell } = this.props; const { signedIn } = this.props.identity; const pathName = this.props.location.pathname; @@ -185,7 +186,7 @@ class SwitchingColumnsArea extends PureComponent { return ( - + @@ -651,6 +652,7 @@ class UI extends PureComponent { singleColumn={layout === 'mobile' || layout === 'single-column'} layout={layout} forceOnboarding={firstLaunch && newAccount} + minimalShell={minimalShell} > {children}