Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream

2023-10-10 19:53:41 +02:00
parent 1a4a23b5c8 27e84c0691
commit 3735e6f79d
7 changed files with 40 additions and 21 deletions
@@ -619,7 +619,7 @@ class Status extends ImmutablePureComponent {

  shouldUpdateScroll = (prevRouterProps, { location }) => {
    // Do not change scroll when opening a modal
-    if (location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey) {
+    if (location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey) {
      return false;
    }