From 70190be65cfab451b998bc4b7f7730f0c15fd7f7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 25 Jan 2017 19:06:15 +0000
Subject: [PATCH] Factor out common onSendMessageFailed

---
 .../views/rooms/MessageComposerInput.js       | 15 +++--------
 .../views/rooms/MessageComposerInputOld.js    | 26 ++++++++++---------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 4a6e36b854..80e41555a2 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -40,6 +40,7 @@ import * as HtmlUtils from '../../../HtmlUtils';
 import Autocomplete from './Autocomplete';
 import {Completion} from "../../../autocomplete/Autocompleter";
 import Markdown from '../../../Markdown';
+import {onSendMessageFailed} from './MessageComposerInputOld';
 
 const TYPING_USER_TIMEOUT = 10000, TYPING_SERVER_TIMEOUT = 30000;
 
@@ -553,21 +554,11 @@ export default class MessageComposerInput extends React.Component {
             sendMessagePromise = sendTextFn.call(this.client, this.props.room.roomId, contentText);
         }
 
-        sendMessagePromise.then((res) => {
+        sendMessagePromise.done((res) => {
             dis.dispatch({
                 action: 'message_sent',
             });
-        }, (err) => {
-            if (err.name === "UnknownDeviceError") {
-                var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
-                Modal.createDialog(UnknownDeviceDialog, {
-                    devices: err.devices
-                });
-            }
-            dis.dispatch({
-                action: 'message_send_failed',
-            });
-        });
+        }, onSendMessageFailed);
 
         this.setState({
             editorState: this.createEditorState(),
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index a5b1f6b786..d81f89a3c3 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -29,10 +29,22 @@ var TYPING_USER_TIMEOUT = 10000;
 var TYPING_SERVER_TIMEOUT = 30000;
 var MARKDOWN_ENABLED = true;
 
+export function onSendMessageFailed(err) {
+    if (err.name === "UnknownDeviceError") {
+        const UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
+        Modal.createDialog(UnknownDeviceDialog, {
+            devices: err.devices,
+        });
+    }
+    dis.dispatch({
+        action: 'message_send_failed',
+    });
+}
+
 /*
  * The textInput part of the MessageComposer
  */
-module.exports = React.createClass({
+export default React.createClass({
     displayName: 'MessageComposerInput',
 
     statics: {
@@ -341,18 +353,8 @@ module.exports = React.createClass({
             dis.dispatch({
                 action: 'message_sent'
             });
-        }, function(err) {
-            if (err.name === "UnknownDeviceError") {
-                var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
-                Modal.createDialog(UnknownDeviceDialog, {
-                    devices: err.devices
-                });
-            }
+        }, onSendMessageFailed);
 
-            dis.dispatch({
-                action: 'message_send_failed'
-            });
-        });
         this.refs.textarea.value = '';
         this.resizeInput();
         ev.preventDefault();