Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6

This commit is contained in:
Claire committed 2026-06-16 21:49:17 +02:00
commit 6aca68e185
33 files changed
+380 -205

No files matched your search

@@ -323,10 +323,7 @@ class EmojiPickerDropdown extends PureComponent {
EmojiPickerAsync().then(EmojiMart => {
EmojiPicker = EmojiMart.Picker;
Emoji = EmojiMart.Emoji;
void EmojiMart.loadCustomEmojiData().then(() => {
this.setState({ loading: false });
});
this.setState({ loading: false });
}).catch(() => {
this.setState({ loading: false, active: false });
});