bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into chats

Browse source
This commit is contained in:
Alex Gleason 2020-08-24 22:54:43 -05:00
commit 8823743605
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/soapbox/containers/soapbox.js
View file

@ -14,6 +14,8 @@ import { ScrollContext } from 'react-router-scroll-4';
import UI from '../features/ui'; import UI from '../features/ui';
// import Introduction from '../features/introduction'; // import Introduction from '../features/introduction';
import { fetchCustomEmojis } from '../actions/custom_emojis'; import { fetchCustomEmojis } from '../actions/custom_emojis';
import { hydrateStore } from '../actions/store';
import initialState from '../initial_state';
import { preload } from '../actions/preload'; import { preload } from '../actions/preload';
import { IntlProvider } from 'react-intl'; import { IntlProvider } from 'react-intl';
import ErrorBoundary from '../components/error_boundary'; import ErrorBoundary from '../components/error_boundary';
@ -30,6 +32,9 @@ const validLocale = locale => Object.keys(messages).includes(locale);
export const store = configureStore(); export const store = configureStore();
const hydrateAction = hydrateStore(initialState);
store.dispatch(hydrateAction);
store.dispatch(preload()); store.dispatch(preload());
store.dispatch(fetchMe()); store.dispatch(fetchMe());
store.dispatch(fetchInstance()); store.dispatch(fetchInstance());