about summary refs log tree commit diff
path: root/app/javascript/mastodon/features
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-05-22 13:11:31 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-05-22 13:11:31 +0200
commit5f334807d23146d58722d932442444238dbaa65d (patch)
treef6d41ae50ec7c1c56bffdbb808f94a45b1c4f167 /app/javascript/mastodon/features
parent03952c7d4980a008f6711d7f14b8808229d73524 (diff)
parent92a9fcf0e139f2e7c99feb0f6d7f2b71064a5592 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/features')
-rw-r--r--app/javascript/mastodon/features/ui/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 2b9fe1603..c1c6ac739 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -361,9 +361,9 @@ class UI extends React.PureComponent {
       this.props.dispatch(closeOnboarding());
     }
 
+    this.props.dispatch(fetchMarkers());
     this.props.dispatch(expandHomeTimeline());
     this.props.dispatch(expandNotifications());
-    setTimeout(() => this.props.dispatch(fetchMarkers()), 500);
     setTimeout(() => this.props.dispatch(fetchFilters()), 500);
 
     this.hotkeys.__mousetrap__.stopCallback = (e, element) => {