merge with master

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tinode-webapp",
   "description": "Tinode messenger for the web",
-  "version": "0.18.1-beta1",
+  "version": "0.18.2-beta1",
   "repository": {
     "type": "git",
     "url": "https://github.com/tinode/example-react-js.git"
@@ -70,7 +70,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-intl": "^5.20.2",
-    "tinode-sdk": "^0.18.1-beta1"
+    "tinode-sdk": "^0.18.1"
   },
   "devDependencies": {
     "@babel/core": "^7.14.5",

src/version.js

@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-export const PACKAGE_VERSION = "0.18.1-beta1";
+export const PACKAGE_VERSION = "0.18.2-beta1";

src/widgets/contact-list.jsx

@@ -84,9 +84,11 @@ class ContactList extends React.Component {
             if (msg) {
               forwarded = msg.head ? msg.head.forwarded : null;
               deliveryStatus = msg._status || c.msgStatus(msg, true);
-              preview = typeof msg.content == 'string' ?
+              if (msg.content) {
-                msg.content.substr(0, MESSAGE_PREVIEW_LENGTH) :
+                preview = typeof msg.content == 'string' ?
-                Drafty.preview(msg.content, MESSAGE_PREVIEW_LENGTH);
+                  msg.content.substr(0, MESSAGE_PREVIEW_LENGTH) :
+                  Drafty.preview(msg.content, MESSAGE_PREVIEW_LENGTH);
+              }
             }
           }
 

src/widgets/topic-desc-edit.jsx

@@ -109,7 +109,7 @@ export default class TopicDescEdit extends React.Component {
   // for uploading it to the server out of band.
   uploadAvatar(mime, blob, width, height) {
     const readyToUpload = (image) => {
-      let {mime, blob, width, height} = image;
+      let {mime, blob} = image;
       if (blob.size > MAX_AVATAR_BYTES) {
         // Too large to send inband - uploading out of band and sending as a link.
         const uploader = this.props.tinode.getLargeFileHelper();

umd/index.dev.js

@@ -1355,7 +1355,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "PACKAGE_VERSION": () => (/* binding */ PACKAGE_VERSION)
 /* harmony export */ });
-const PACKAGE_VERSION = "0.18.1-beta1";
+const PACKAGE_VERSION = "0.18.2-beta1";
 
 /***/ }),
 
@@ -8538,7 +8538,10 @@ class ContactList extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
             if (msg) {
               forwarded = msg.head ? msg.head.forwarded : null;
               deliveryStatus = msg._status || c.msgStatus(msg, true);
-              preview = typeof msg.content == 'string' ? msg.content.substr(0, _config_js__WEBPACK_IMPORTED_MODULE_6__.MESSAGE_PREVIEW_LENGTH) : tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.preview(msg.content, _config_js__WEBPACK_IMPORTED_MODULE_6__.MESSAGE_PREVIEW_LENGTH);
+
+              if (msg.content) {
+                preview = typeof msg.content == 'string' ? msg.content.substr(0, _config_js__WEBPACK_IMPORTED_MODULE_6__.MESSAGE_PREVIEW_LENGTH) : tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.preview(msg.content, _config_js__WEBPACK_IMPORTED_MODULE_6__.MESSAGE_PREVIEW_LENGTH);
+              }
             }
           }
 
@@ -12767,9 +12770,7 @@ class TopicDescEdit extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compon
     const readyToUpload = image => {
       let {
         mime,
-        blob,
+        blob
-        width,
-        height
       } = image;
 
       if (blob.size > _config_js__WEBPACK_IMPORTED_MODULE_7__.MAX_AVATAR_BYTES) {

version.js

@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-const PACKAGE_VERSION = "0.18.1-beta1";
+const PACKAGE_VERSION = "0.18.2-beta1";