toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for duplicate text on message attachments, empty space when attachment has no title (#2460)

Browse source
This commit is contained in:
Chris Duarte 2018-12-28 03:31:10 -08:00 committed by Elias Nahum
parent 341d773e8a
commit fa10680ef3
No known key found for this signature in database
GPG key ID: E038DB71E0B61702
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/components/message_attachments/attachment_fields.js
View file

@ -66,16 +66,18 @@ export default class AttachmentFields extends PureComponent {
style={style.flex}
key={`attachment__field-${i}__${nrTables}`}
>
<View
style={style.headingContainer}
key={`attachment__field-caption-${i}__${nrTables}`}
>
<View>
<Text style={style.heading}>
{field.title}
</Text>
{Boolean(field.title) && (
<View
style={style.headingContainer}
key={`attachment__field-caption-${i}__${nrTables}`}
>
<View>
<Text style={style.heading}>
{field.title}
</Text>
</View>
</View>
</View>
)}
<View
style={style.flex}
key={`attachment__field-${i}__${nrTables}`}

2
app/components/message_attachments/message_attachment.js
View file

@ -97,7 +97,7 @@ export default class MessageAttachment extends PureComponent {
navigator={navigator}
onPermalinkPress={onPermalinkPress}
textStyles={textStyles}
value={attachment.text || attachment.fallback}
value={attachment.text}
/>
<AttachmentFields
baseTextStyle={baseTextStyle}