From 307745913352811b18072aa2c0d2c4dce339ead6 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Mon, 27 Jun 2022 17:58:50 -0700
Subject: [PATCH] Fix sending to embedded contact

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
---
 ts/components/conversation/Message.tsx  | 12 +++++++++---
 ts/components/conversation/Timeline.tsx |  4 +++-
 ts/state/ducks/accounts.ts              |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index dfccf9bd5..8aa5e80b8 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -1626,7 +1626,11 @@ export class Message extends React.PureComponent<Props, State> {
     return (
       <button
         type="button"
-        onClick={() => startConversation(firstNumber, uuid)}
+        onClick={e => {
+          e.preventDefault();
+          e.stopPropagation();
+          startConversation(firstNumber, uuid);
+        }}
         className={classNames(
           'module-message__send-message-button',
           noBottomLeftCurve &&
@@ -2662,7 +2666,7 @@ export class Message extends React.PureComponent<Props, State> {
       isTapToView,
       isTapToViewExpired,
       kickOffAttachmentDownload,
-      openConversation,
+      startConversation,
       openGiftBadge,
       showContactDetail,
       showVisualAttachment,
@@ -2773,13 +2777,15 @@ export class Message extends React.PureComponent<Props, State> {
       event.stopPropagation();
 
       this.audioButtonRef.current.click();
+      return;
     }
 
     if (contact && contact.firstNumber && contact.uuid) {
-      openConversation(contact.firstNumber);
+      startConversation(contact.firstNumber, contact.uuid);
 
       event.preventDefault();
       event.stopPropagation();
+      return;
     }
 
     if (contact) {
diff --git a/ts/components/conversation/Timeline.tsx b/ts/components/conversation/Timeline.tsx
index fe1888c56..451dc3989 100644
--- a/ts/components/conversation/Timeline.tsx
+++ b/ts/components/conversation/Timeline.tsx
@@ -564,8 +564,10 @@ export class Timeline extends React.Component<
   public override componentDidMount(): void {
     const containerEl = this.containerRef.current;
     const messagesEl = this.messagesRef.current;
+    const { isConversationSelected } = this.props;
     strictAssert(
-      containerEl && messagesEl,
+      // We don't render anything unless the conversation is selected
+      (containerEl && messagesEl) || !isConversationSelected,
       '<Timeline> mounted without some refs'
     );
 
diff --git a/ts/state/ducks/accounts.ts b/ts/state/ducks/accounts.ts
index 21a10efa9..9b91f4732 100644
--- a/ts/state/ducks/accounts.ts
+++ b/ts/state/ducks/accounts.ts
@@ -54,7 +54,7 @@ function checkForAccount(
 
     const conversation = window.ConversationController.get(phoneNumber);
     if (conversation && conversation.get('uuid')) {
-      log.error(`checkForAccount: found ${phoneNumber} in existing contacts`);
+      log.info(`checkForAccount: found ${phoneNumber} in existing contacts`);
       const uuid = conversation.get('uuid');
 
       dispatch({
@@ -81,7 +81,7 @@ function checkForAccount(
 
     let uuid: UUIDStringType | undefined;
 
-    log.error(`checkForAccount: looking ${phoneNumber} up on server`);
+    log.info(`checkForAccount: looking ${phoneNumber} up on server`);
     try {
       const uuidLookup = await window.textsecure.messaging.getUuidsForE164s([
         phoneNumber,