Merge branch 'emoji-button-unauthorized' into 'develop'

Show unauthorized modal when touching emoji button if unauthorized

See merge request soapbox-pub/soapbox!1848
environments/review-develop-3zknud/deployments/1197
marcin mikołajczak 2022-10-25 05:33:33 +00:00
commit df7f2d4dca
1 zmienionych plików z 15 dodań i 7 usunięć

Wyświetl plik

@ -83,10 +83,7 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
if (ownAccount) {
dispatch(simpleEmojiReact(status, emoji));
} else {
dispatch(openModal('UNAUTHORIZED', {
action: 'FAVOURITE',
ap_id: status.url,
}));
handleUnauthorized();
}
setVisible(false);
@ -96,10 +93,14 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
const meEmojiReact = getReactForStatus(status, soapboxConfig.allowedEmoji) || '👍';
if (isUserTouching()) {
if (visible) {
handleReact(meEmojiReact);
if (ownAccount) {
if (visible) {
handleReact(meEmojiReact);
} else {
setVisible(true);
}
} else {
setVisible(true);
handleUnauthorized();
}
} else {
handleReact(meEmojiReact);
@ -109,6 +110,13 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
e.stopPropagation();
};
const handleUnauthorized = () => {
dispatch(openModal('UNAUTHORIZED', {
action: 'FAVOURITE',
ap_id: status.url,
}));
};
// const handleUnfocus: React.EventHandler<React.KeyboardEvent> = () => {
// setFocused(false);
// };