MessageDetails: contact status fallbacks to message status

this is used for medium groups
pull/1381/head
Audric Ackermann 5 years ago
parent 80523a9a3e
commit 22b4f39e52
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -860,7 +860,9 @@
: `${contact.profileName} (Secondary Device)`; : `${contact.profileName} (Secondary Device)`;
return { return {
...contact, ...contact,
status: this.getStatus(id), // fallback to the message status if we do not have a status with a user
// this is useful for medium groups.
status: this.getStatus(id) || this.getMessagePropStatus(),
errors: errorsForContact, errors: errorsForContact,
isOutgoingKeyError, isOutgoingKeyError,
isUnidentifiedDelivery, isUnidentifiedDelivery,

@ -1212,6 +1212,8 @@
} }
.module-message-detail__contact__status-icon { .module-message-detail__contact__status-icon {
min-width: 12px;
min-height: 12px;
width: 12px; width: 12px;
height: 12px; height: 12px;
display: inline-block; display: inline-block;

@ -833,6 +833,7 @@ export class SessionConversation extends React.Component<Props, State> {
private async showMessageDetails(messageProps: any) { private async showMessageDetails(messageProps: any) {
messageProps.onDeleteMessage = (id: string) => { messageProps.onDeleteMessage = (id: string) => {
this.deleteMessage(id); this.deleteMessage(id);
this.setState({ messageDetailShowProps: undefined });
}; };
this.setState({ messageDetailShowProps: messageProps }); this.setState({ messageDetailShowProps: messageProps });
} }

@ -407,6 +407,9 @@ const toPickFromMessageModel = [
'findContact', 'findContact',
'isUnidentifiedDelivery', 'isUnidentifiedDelivery',
'getStatus', 'getStatus',
'getMessagePropStatus',
'hasErrors',
'isOutgoing',
]; ];
function getEmptyState(): ConversationsStateType { function getEmptyState(): ConversationsStateType {

Loading…
Cancel
Save