Merge pull request #734 from matrix-org/luke/fix-resend

Fix resend bar and "send anyway" in UDD

src/Resend.js

@@ -18,18 +18,19 @@ var MatrixClientPeg = require('./MatrixClientPeg');
 var dis = require('./dispatcher');
 var sdk = require('./index');
 var Modal = require('./Modal');
+import { EventStatus } from 'matrix-js-sdk';
 
 module.exports = {
     resendUnsentEvents: function(room) {
         room.getPendingEvents().filter(function(ev) {
-            return ev.status === Matrix.EventStatus.NOT_SENT;
+            return ev.status === EventStatus.NOT_SENT;
         }).forEach(function(event) {
             module.exports.resend(event);
         });
     },
     cancelUnsentEvents: function(room) {
         room.getPendingEvents().filter(function(ev) {
-            return ev.status === Matrix.EventStatus.NOT_SENT;
+            return ev.status === EventStatus.NOT_SENT;
         }).forEach(function(event) {
             module.exports.removeFromQueue(event);
         });

src/components/views/dialogs/UnknownDeviceDialog.js

@@ -19,6 +19,7 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import GeminiScrollbar from 'react-gemini-scrollbar';
+import Resend from '../../../Resend';
 
 function DeviceListEntry(props) {
     const {userId, device} = props;