mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Ensure conversation details flow down to Message Requests UI

Browse source
This commit is contained in:
Scott Nonnenberg 2020-09-01 13:14:29 -07:00 • committed by Josh Perez
parent bb7d9cec7e
commit 91ea69133b
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/models/conversations.js
View file

@ -1888,7 +1888,8 @@
if ( if (
this.hasDraft() && this.hasDraft() &&
this.get('draftTimestamp') && this.get('draftTimestamp') &&
previewMessage.get('sent_at') < this.get('draftTimestamp') (!previewMessage ||
previewMessage.get('sent_at') < this.get('draftTimestamp'))
) { ) {
return; return;
} }

7
ts/state/smart/CompositionArea.tsx
View file

@ -72,13 +72,8 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
showIntroduction, showIntroduction,
showPickerHint, showPickerHint,
// Message Requests // Message Requests
messageRequestsEnabled: conversation.messageRequestsEnabled, ...conversation,
acceptedMessageRequest: conversation.acceptedMessageRequest,
isBlocked: conversation.isBlocked,
conversationType: conversation.type, conversationType: conversation.type,
name: conversation.name,
profileName: conversation.profileName,
phoneNumber: conversation.phoneNumber,
}; };
}; };