From 45ca052482d42a535f399b149c7e26e99663ac15 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Wed, 28 Sep 2016 09:48:19 -0300
Subject: PLT-4298 Remove "Return to ongoing call" (#4101)

---
 webapp/components/admin_console/rate_settings.jsx | 2 +-
 webapp/components/webrtc/webrtc_controller.jsx    | 2 ++
 webapp/i18n/en.json                               | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/components/admin_console/rate_settings.jsx b/webapp/components/admin_console/rate_settings.jsx
index bb4f9d83c..8159f4b0d 100644
--- a/webapp/components/admin_console/rate_settings.jsx
+++ b/webapp/components/admin_console/rate_settings.jsx
@@ -112,7 +112,7 @@ export default class RateSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.rate.maxBurstDescription'
-                            defaultMessage='Maxumum number of requests allowed beyond the per second query limit.'
+                            defaultMessage='Maximum number of requests allowed beyond the per second query limit.'
                         />
                     }
                     value={this.state.maxBurst}
diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx
index 968f24638..e609e4fdb 100644
--- a/webapp/components/webrtc/webrtc_controller.jsx
+++ b/webapp/components/webrtc/webrtc_controller.jsx
@@ -734,7 +734,9 @@ export default class WebrtcController extends React.Component {
             this.onSessionError();
             return this.doCleanup();
         }
+
         WebrtcStore.setVideoCallWith(null);
+        WebrtcStore.emitRhsChanged(false);
 
         if (manual) {
             return this.close();
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 2bf4248a8..512bff5a8 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -545,7 +545,7 @@
   "admin.rate.title": "Rate Limit Settings",
   "admin.rate.maxBurst": "Max Burst:",
   "admin.rate.maxBurstExample": "Ex \"100\"",
-  "admin.rate.maxBurstDescription": "Maxumum number of requests allowed beyond the per second query limit.",
+  "admin.rate.maxBurstDescription": "Maximum number of requests allowed beyond the per second query limit.",
   "admin.recycle.button": "Recycle Database Connections",
   "admin.recycle.loading": " Recycling...",
   "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.",
-- 
cgit v1.2.3-1-g7c22