Merge remote-tracking branch 'upstream/develop' into fix/focus-composer-reaction/11023

This commit is contained in:
Šimon Brandner 2021-07-08 13:19:46 +02:00
commit 14687f3630
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
96 changed files with 269 additions and 499 deletions

View file

@ -33,7 +33,7 @@ export const EMOJI_HEIGHT = 37;
export const EMOJIS_PER_ROW = 8;
interface IProps {
selectedEmojis: Set<string>;
selectedEmojis?: Set<string>;
showQuickReactions?: boolean;
onChoose(unicode: string): boolean;
}