From 68bee0b08de6fc63404be4c8502acefeca52e352 Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Wed, 18 Jan 2023 22:54:01 +0100 Subject: [PATCH] Remove timelinePreview variable from landing page decision, instead change default explore tab --- app/javascript/flavours/glitch/features/ui/index.js | 4 ++-- app/javascript/mastodon/features/ui/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js index 0b2cb46146..cc01c445fd 100644 --- a/app/javascript/flavours/glitch/features/ui/index.js +++ b/app/javascript/flavours/glitch/features/ui/index.js @@ -57,7 +57,7 @@ import { PrivacyPolicy, } from './util/async-components'; import { HotKeys } from 'react-hotkeys'; -import initialState, { me, owner, singleUserMode, showTrends, trendsAsLanding } from '../../initial_state'; +import initialState, { me, owner, singleUserMode, showTrends, trendsAsLanding, timelinePreview } from '../../initial_state'; import { closeOnboarding, INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding'; import { defineMessages, FormattedMessage, injectIntl } from 'react-intl'; import { Helmet } from 'react-helmet'; @@ -178,7 +178,7 @@ class SwitchingColumnsArea extends React.PureComponent { } else if (singleUserMode && owner && initialState?.accounts[owner]) { redirect = ; } else if (showTrends && trendsAsLanding) { - redirect = ; + redirect = ; } else { redirect = ; } diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js index 78dc9ea40b..5fae3a7655 100644 --- a/app/javascript/mastodon/features/ui/index.js +++ b/app/javascript/mastodon/features/ui/index.js @@ -55,7 +55,7 @@ import { About, PrivacyPolicy, } from './util/async-components'; -import initialState, { me, owner, singleUserMode, showTrends, trendsAsLanding } from '../../initial_state'; +import initialState, { me, owner, singleUserMode, showTrends, trendsAsLanding, timelinePreview } from '../../initial_state'; import { closeOnboarding, INTRODUCTION_VERSION } from 'mastodon/actions/onboarding'; import Header from './components/header'; @@ -165,7 +165,7 @@ class SwitchingColumnsArea extends React.PureComponent { } else if (singleUserMode && owner && initialState?.accounts[owner]) { redirect = ; } else if (showTrends && trendsAsLanding) { - redirect = ; + redirect = ; } else { redirect = ; }