From 9fa4ec56bbd59c604d5281f4fd9d688e44e8a01c Mon Sep 17 00:00:00 2001
From: Steve Howell <showell@zulipchat.com>
Date: Thu, 9 Apr 2020 15:43:30 +0000
Subject: [PATCH] local echo: Fix type errors for message_send_error.

The function message_send_error was messing up
on calls to message.get when we were passing in
string versions of `local_id`.  Now we pass in
float ids.

This fixes a traceback where we tried to set
`.failed_request` on to an `undefined` value
that we had instead expected to be a locally
echoed message from our message store.
---
 frontend_tests/node_tests/compose.js | 2 +-
 static/js/compose.js                 | 2 +-
 static/js/echo.js                    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend_tests/node_tests/compose.js b/frontend_tests/node_tests/compose.js
index bfd720632c..5734b984c1 100644
--- a/frontend_tests/node_tests/compose.js
+++ b/frontend_tests/node_tests/compose.js
@@ -697,7 +697,7 @@ run_test('send_message', () => {
     let echo_error_msg_checked;
 
     echo.message_send_error = function (local_id, error_response) {
-        assert.equal(local_id, '123.04');
+        assert.equal(local_id, 123.04);
         assert.equal(error_response, 'Error sending message: Server says 408');
         echo_error_msg_checked = true;
     };
diff --git a/static/js/compose.js b/static/js/compose.js
index c096b5b705..8402b39876 100644
--- a/static/js/compose.js
+++ b/static/js/compose.js
@@ -342,7 +342,7 @@ exports.send_message = function send_message(request) {
             return;
         }
 
-        echo.message_send_error(local_id, response);
+        echo.message_send_error(message.id, response);
     }
 
     transmit.send_message(request, success, error);
diff --git a/static/js/echo.js b/static/js/echo.js
index b556de17fa..fdcc584687 100644
--- a/static/js/echo.js
+++ b/static/js/echo.js
@@ -29,7 +29,7 @@ function resend_message(message, row) {
     }
 
     function on_error(response) {
-        exports.message_send_error(local_id, response);
+        exports.message_send_error(message.id, response);
         setTimeout(function () {
             retry_spinner.toggleClass('rotating', false);
         }, 300);
@@ -333,10 +333,10 @@ exports._patch_waiting_for_ack = function (data) {
     waiting_for_ack = data;
 };
 
-exports.message_send_error = function (local_id, error_response) {
+exports.message_send_error = function (message_id, error_response) {
     // Error sending message, show inline
-    message_store.get(local_id).failed_request = true;
-    ui.show_message_failed(local_id, error_response);
+    message_store.get(message_id).failed_request = true;
+    ui.show_message_failed(message_id, error_response);
 };
 
 function abort_message(message) {