From f98fe910d5fc3e756884f9db2b7230526a3af78d Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Thu, 13 Dec 2018 12:48:33 +1100
Subject: [PATCH] Fix friend request retry not working.

---
 js/models/messages.js    | 5 ++++-
 js/views/message_view.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index f2735349f..70f036966 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -334,7 +334,8 @@
       const conversation = this.getConversation();
 
       const onAccept = () => this.acceptFriendRequest();
-      const onDecline = () => this.declineFriendRequest()
+      const onDecline = () => this.declineFriendRequest();
+      const onRetrySend = () => this.retrySend();
 
       const onDeleteConversation = async () => {
         // Delete the whole conversation
@@ -362,6 +363,7 @@
         onDeleteConversation,
         onBlockUser,
         onUnblockUser,
+        onRetrySend,
       }
     },
     findContact(phoneNumber) {
@@ -795,6 +797,7 @@
 
       const conversation = this.getConversation();
       const options = conversation.getSendOptions();
+      options.messageType = this.get('type');
 
       let promise;
 
diff --git a/js/views/message_view.js b/js/views/message_view.js
index 91b4b662b..0897f12cd 100644
--- a/js/views/message_view.js
+++ b/js/views/message_view.js
@@ -73,7 +73,7 @@
         return {
           Component: Components.FriendRequest,
           props: this.model.getPropsForFriendRequest(),
-        }; 
+        };
       }
 
       return {