Merge pull request #3062 from withspectrum/2.2.11

2.2.11
withspectrum · May 10, 2018 · 6b0e4fd · 6b0e4fd
2 parents 5219872 + ebd0793
commit 6b0e4fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.2.10",
+  "version": "2.2.11",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "babel-cli": "^6.24.1",

diff --git a/src/components/message/view.js b/src/components/message/view.js
@@ -85,14 +85,18 @@ export class QuotedMessage extends React.Component<
   constructor(props: QuotedMessageProps) {
     super(props);
 
-    const jsonBody = JSON.parse(props.message.content.body);
-    const isShort =
-      !jsonBody.blocks.length > 1 ||
-      toPlainText(toState(jsonBody)).length <= 170;
+    const isShort = () => {
+      if (props.message.messageType === 'media') return false;
+      const jsonBody = JSON.parse(props.message.content.body);
+      return (
+        !jsonBody.blocks.length > 1 ||
+        toPlainText(toState(jsonBody)).length <= 170
+      );
+    };
 
     this.state = {
-      isShort,
-      isExpanded: isShort,
+      isShort: isShort(),
+      isExpanded: isShort(),
     };
   }