Two small bugfixes

This commit is contained in:
Scott Nonnenberg 2020-09-25 09:59:45 -07:00 committed by Josh Perez
parent dabab60f56
commit d39ede068a
2 changed files with 9 additions and 6 deletions

View file

@ -66,8 +66,9 @@ export class MessageBody extends React.Component<Props> {
<AddNewLines <AddNewLines
key={key} key={key}
text={textWithNewLines} text={textWithNewLines}
renderNonNewLine={({ text }) => ( renderNonNewLine={({ text, key: innerKey }) => (
<AtMentionify <AtMentionify
key={innerKey}
direction={direction} direction={direction}
text={text} text={text}
bodyRanges={bodyRanges} bodyRanges={bodyRanges}

View file

@ -2119,12 +2119,14 @@ export class ConversationModel extends window.Backbone.Model<
async handleMessageSendResult( async handleMessageSendResult(
failoverIdentifiers: Array<string> | undefined, failoverIdentifiers: Array<string> | undefined,
unidentifiedDeliveries: Array<string> | undefined, unidentifiedDeliveries: Array<string> | undefined,
discoveredIdentifierPairs: Array<{ discoveredIdentifierPairs:
uuid: string | null; | Array<{
e164: string | null; uuid: string | null;
}> e164: string | null;
}>
| undefined
): Promise<void> { ): Promise<void> {
discoveredIdentifierPairs.forEach(item => { (discoveredIdentifierPairs || []).forEach(item => {
const { uuid, e164 } = item; const { uuid, e164 } = item;
window.ConversationController.ensureContactIds({ window.ConversationController.ensureContactIds({
uuid, uuid,