diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2021-04-19 14:45:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-19 14:45:15 +0200 |
commit | bf903dc51070f952ab64e43918e803fdaaa15e4d (patch) | |
tree | 5e3dcfd04190958f41c68c03f4b48e7fb234de1a /app/javascript/mastodon/containers/mastodon.js | |
parent | ca3bc1b09f344f38164aa65d2554cf50d5c10cc0 (diff) |
Change onboarding by replacing tutorial with follow recommendations in web UI (#16060)
Diffstat (limited to 'app/javascript/mastodon/containers/mastodon.js')
-rw-r--r-- | app/javascript/mastodon/containers/mastodon.js | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js index 3ac58cf7c..513b59908 100644 --- a/app/javascript/mastodon/containers/mastodon.js +++ b/app/javascript/mastodon/containers/mastodon.js @@ -1,12 +1,10 @@ import React from 'react'; -import { Provider, connect } from 'react-redux'; +import { Provider } from 'react-redux'; import PropTypes from 'prop-types'; import configureStore from '../store/configureStore'; -import { INTRODUCTION_VERSION } from '../actions/onboarding'; import { BrowserRouter, Route } from 'react-router-dom'; import { ScrollContext } from 'react-router-scroll-4'; import UI from '../features/ui'; -import Introduction from '../features/introduction'; import { fetchCustomEmojis } from '../actions/custom_emojis'; import { hydrateStore } from '../actions/store'; import { connectUserStream } from '../actions/streaming'; @@ -26,39 +24,6 @@ const hydrateAction = hydrateStore(initialState); store.dispatch(hydrateAction); store.dispatch(fetchCustomEmojis()); -const mapStateToProps = state => ({ - showIntroduction: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION, -}); - -@connect(mapStateToProps) -class MastodonMount extends React.PureComponent { - - static propTypes = { - showIntroduction: PropTypes.bool, - }; - - shouldUpdateScroll (_, { location }) { - return location.state !== previewMediaState && location.state !== previewVideoState; - } - - render () { - const { showIntroduction } = this.props; - - if (showIntroduction) { - return <Introduction />; - } - - return ( - <BrowserRouter basename='/web'> - <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}> - <Route path='/' component={UI} /> - </ScrollContext> - </BrowserRouter> - ); - } - -} - export default class Mastodon extends React.PureComponent { static propTypes = { @@ -76,6 +41,10 @@ export default class Mastodon extends React.PureComponent { } } + shouldUpdateScroll (_, { location }) { + return location.state !== previewMediaState && location.state !== previewVideoState; + } + render () { const { locale } = this.props; @@ -83,7 +52,11 @@ export default class Mastodon extends React.PureComponent { <IntlProvider locale={locale} messages={messages}> <Provider store={store}> <ErrorBoundary> - <MastodonMount /> + <BrowserRouter basename='/web'> + <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}> + <Route path='/' component={UI} /> + </ScrollContext> + </BrowserRouter> </ErrorBoundary> </Provider> </IntlProvider> |