From 4925970b8618d653bd0da223207df70d305b8b42 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 26 Nov 2018 20:26:46 -0300
Subject: [PATCH] Fix crash when message attachment does not have images
 (#2377)

* Fix crash when message attachment does not have images

* optional chaining
---
 app/components/message_attachments/attachment_image.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/components/message_attachments/attachment_image.js b/app/components/message_attachments/attachment_image.js
index 1eafb2c02..5dede251a 100644
--- a/app/components/message_attachments/attachment_image.js
+++ b/app/components/message_attachments/attachment_image.js
@@ -37,7 +37,7 @@ export default class AttachmentImage extends PureComponent {
         const {imageUrl, metadata} = this.props;
 
         this.setViewPortMaxWidth();
-        if (metadata?.images[imageUrl]) {
+        if (metadata?.images?.[imageUrl]) {
             const img = metadata.images[imageUrl];
             this.setImageDimensionsFromMeta(null, img);
         }
@@ -96,7 +96,7 @@ export default class AttachmentImage extends PureComponent {
     setImageUrl = (imageURL) => {
         const {imageUrl: attachmentImageUrl, metadata} = this.props;
 
-        if (metadata?.images[attachmentImageUrl]) {
+        if (metadata?.images?.[attachmentImageUrl]) {
             this.setImageDimensionsFromMeta(imageURL, metadata.images[attachmentImageUrl]);
             return;
         }