From 6163b8e913ee134a7fcc3fe9cf10656d65727cab Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Fri, 30 Nov 2018 06:17:34 -0800
Subject: [PATCH] File image attachments sometimes do not open the image
 preview (#2397)

---
 app/components/file_attachment_list/file_attachment.js      | 2 ++
 app/components/file_attachment_list/file_attachment_list.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/components/file_attachment_list/file_attachment.js b/app/components/file_attachment_list/file_attachment.js
index 628f3b231..f190cf0ee 100644
--- a/app/components/file_attachment_list/file_attachment.js
+++ b/app/components/file_attachment_list/file_attachment.js
@@ -23,6 +23,7 @@ export default class FileAttachment extends PureComponent {
         canDownloadFiles: PropTypes.bool.isRequired,
         deviceWidth: PropTypes.number.isRequired,
         file: PropTypes.object.isRequired,
+        id: PropTypes.string.isRequired,
         index: PropTypes.number.isRequired,
         onCaptureRef: PropTypes.func,
         onLongPress: PropTypes.func,
@@ -102,6 +103,7 @@ export default class FileAttachment extends PureComponent {
         if ((data && data.has_preview_image) || file.loading || isGif(data)) {
             fileAttachmentComponent = (
                 <TouchableOpacity
+                    key={`${this.props.id}${file.loading}`}
                     onPress={this.handlePreviewPress}
                     onLongPress={onLongPress}
                 >
diff --git a/app/components/file_attachment_list/file_attachment_list.js b/app/components/file_attachment_list/file_attachment_list.js
index b52385f86..5b6117a97 100644
--- a/app/components/file_attachment_list/file_attachment_list.js
+++ b/app/components/file_attachment_list/file_attachment_list.js
@@ -133,6 +133,7 @@ export default class FileAttachmentList extends Component {
                     canDownloadFiles={canDownloadFiles}
                     deviceWidth={deviceWidth}
                     file={{loading: true}}
+                    id={id}
                     index={idx}
                     theme={this.props.theme}
                 />
@@ -151,6 +152,7 @@ export default class FileAttachmentList extends Component {
                     canDownloadFiles={canDownloadFiles}
                     deviceWidth={deviceWidth}
                     file={f}
+                    id={file.id}
                     index={idx}
                     navigator={navigator}
                     onCaptureRef={this.handleCaptureRef}