Merge branch 'master' into glitch-soc/merge-upstream

2020-08-08 19:10:40 +02:00
parent a3806ec6ba bd3420b139
commit 5d5b9e2f62
6 changed files with 551 additions and 386 deletions
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -315,7 +315,7 @@ class EmojiPickerDropdown extends React.PureComponent {

        this.setState({ loading: false });
      }).catch(() => {
-        this.setState({ loading: false });
+        this.setState({ loading: false, active: false });
      });
    }