pull/253/head
Beaudan 6 years ago
parent d0d57ea8c7
commit 14367620d9

@ -1808,7 +1808,8 @@
}, },
"copiedMessage": { "copiedMessage": {
"message": "Copied message text", "message": "Copied message text",
"description": "A toast message telling the user that the message text was copied" "description":
"A toast message telling the user that the message text was copied"
}, },
"editDisplayName": { "editDisplayName": {
"message": "Edit display name", "message": "Edit display name",

@ -624,13 +624,21 @@
}); });
Whisper.events.on('showToast', options => { Whisper.events.on('showToast', options => {
if (appView && appView.inboxView && appView.inboxView.conversation_stack) { if (
appView &&
appView.inboxView &&
appView.inboxView.conversation_stack
) {
appView.inboxView.conversation_stack.showToast(options); appView.inboxView.conversation_stack.showToast(options);
} }
}); });
Whisper.events.on('showConfirmationDialog', options => { Whisper.events.on('showConfirmationDialog', options => {
if (appView && appView.inboxView && appView.inboxView.conversation_stack) { if (
appView &&
appView.inboxView &&
appView.inboxView.conversation_stack
) {
appView.inboxView.conversation_stack.showConfirmationDialog(options); appView.inboxView.conversation_stack.showConfirmationDialog(options);
} }
}); });

@ -235,13 +235,13 @@
this.model.unblock(); this.model.unblock();
}, },
onChangeNickname: () => { onChangeNickname: () => {
this.model.changeNickname() this.model.changeNickname();
}, },
onClearNickname: async () => { onClearNickname: async () => {
this.model.setNickname(null); this.model.setNickname(null);
}, },
onCopyPublicKey: () => { onCopyPublicKey: () => {
this.model.copyPublicKey() this.model.copyPublicKey();
}, },
}; };
}; };

@ -819,11 +819,7 @@ export class Message extends React.Component<Props, State> {
{i18n('downloadAttachment')} {i18n('downloadAttachment')}
</MenuItem> </MenuItem>
) : null} ) : null}
<MenuItem <MenuItem onClick={onCopyText}>{i18n('copyMessage')}</MenuItem>
onClick={onCopyText}
>
{i18n('copyMessage')}
</MenuItem>
<MenuItem <MenuItem
attributes={{ attributes={{
className: 'module-message__context__reply', className: 'module-message__context__reply',

Loading…
Cancel
Save