diff --git a/webapp/components/admin_console/rate_settings.jsx b/webapp/components/admin_console/rate_settings.jsx index bb4f9d83c2..8159f4b0db 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={ } value={this.state.maxBurst} diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx index 968f246389..e609e4fdbb 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 2bf4248a86..512bff5a89 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 Configuration > Reload Configuration from Disk feature to load the new settings while the server is running. The administrator should then use Recycle Database Connections feature to recycle the database connections based on the new settings.",