merge devel

tinode · Jul 11, 2021 · 6b85957 · 6b85957
2 parents 07aa38e + aa45194
commit 6b85957
Show file tree

Hide file tree

Showing 14 changed files with 1,130 additions and 949 deletions.
diff --git a/index.html b/index.html
@@ -25,8 +25,8 @@
 <script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/[email protected]/umd/react.production.min.js"></script>
 <script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/[email protected]/umd/react-dom.production.min.js"></script>
 <script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/[email protected]/react-intl.iife.min.js"></script>
-<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-app.js"></script>
-<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-messaging.js"></script>
+<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-app.js"></script>
+<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-messaging.js"></script>
 </head>
 <body>
 <noscript><div id="noscript-message"><div id="noscript-title">Javascript support is required.</div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tinode-webapp",
   "description": "Tinode messenger for the web",
-  "version": "0.17.5",
+  "version": "0.17.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/tinode/example-react-js.git"
@@ -63,11 +63,11 @@
   "author": "Tinode Authors <[email protected]>",
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^8.6.7",
+    "firebase": "^8.7.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-intl": "^5.20.2",
-    "tinode-sdk": "^0.17.5"
+    "tinode-sdk": "^0.17.6"
   },
   "devDependencies": {
     "@babel/core": "^7.14.5",

diff --git a/service-worker.js b/service-worker.js
@@ -1,6 +1,6 @@
 // Must be located at the root.
-importScripts('https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-app.js');
-importScripts('https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-messaging.js');
+importScripts('https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-app.js');
+importScripts('https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-messaging.js');
 importScripts('firebase-init.js');
 importScripts('version.js');
 

diff --git a/src/index.js b/src/index.js
@@ -29,8 +29,10 @@ const messages =
   allMessages.en;
 
 ReactDOM.render(
-  <IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
-    <TinodeWeb />
-  </IntlProvider>,
+  <React.StrictMode>
+    <IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
+      <TinodeWeb />
+    </IntlProvider>
+  </React.StrictMode>,
   document.getElementById('mountPoint')
 );
diff --git a/src/version.js b/src/version.js
@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-export const PACKAGE_VERSION = "0.17.5";
+export const PACKAGE_VERSION = "0.17.6";
diff --git a/src/views/tinode-web.jsx b/src/views/tinode-web.jsx
@@ -1253,6 +1253,8 @@ class TinodeWeb extends React.Component {
       this.fbPush.deleteToken(this.state.firebaseToken)
     }
 
+    clearInterval(this.reconnectCountdown);
+
     if (this.tinode) {
       this.tinode.clearStorage();
       this.tinode.onDisconnect = undefined;

diff --git a/umd/index.dev.js b/umd/index.dev.js
diff --git a/umd/index.dev.js.map b/umd/index.dev.js.map
diff --git a/umd/index.prod.js b/umd/index.prod.js
diff --git a/umd/index.prod.js.map b/umd/index.prod.js.map
diff --git a/umd/tinode.dev.js b/umd/tinode.dev.js
diff --git a/umd/tinode.prod.js b/umd/tinode.prod.js
diff --git a/version.js b/version.js
@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-const PACKAGE_VERSION = "0.17.5";
+const PACKAGE_VERSION = "0.17.6";