From bb01218e8379390da26f5b0e4d92bbef889b44f2 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 8 May 2018 10:11:40 -0700
Subject: [PATCH] MessageView: Get rid of 'let' for hasSignalAccount

---
 js/views/message_view.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/js/views/message_view.js b/js/views/message_view.js
index 8a6db544d0..2740ed84c7 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -457,7 +457,7 @@
         contact.number && contact.number[0] && contact.number[0].value;
       const haveConversation =
         number && Boolean(window.ConversationController.get(number));
-      let hasSignalAccount = number && haveConversation;
+      const hasLocalSignalAccount = number && haveConversation;
 
       const onSendMessage = number
         ? () => {
@@ -468,7 +468,7 @@
         this.model.trigger('show-contact-detail', contact);
       };
 
-      const getProps = () => ({
+      const getProps = ({ hasSignalAccount }) => ({
         contact: contactSelector(contact, {
           regionCode,
           getAbsoluteAttachmentPath,
@@ -486,13 +486,15 @@
       this.contactView = new Whisper.ReactWrapperView({
         className: 'contact-wrapper',
         Component: window.Signal.Components.EmbeddedContact,
-        props: getProps(),
+        props: getProps({
+          hasSignalAccount: hasLocalSignalAccount,
+        }),
       });
 
       this.$('.inner-bubble').prepend(this.contactView.el);
 
       // If we can't verify a signal account locally, we'll go to the Signal Server.
-      if (number && !hasSignalAccount) {
+      if (number && !hasLocalSignalAccount) {
         // eslint-disable-next-line more/no-then
         window.textsecure.messaging
           .getProfile(number)
@@ -501,8 +503,7 @@
               return;
             }
 
-            hasSignalAccount = true;
-            this.contactView.update(getProps());
+            this.contactView.update(getProps({ hasSignalAccount: true }));
           })
           .catch(() => {
             // No account available, or network connectivity problem