Skip to content

Commit

Permalink
fixup bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaxim committed Jan 8, 2020
1 parent 1d7ab2c commit f7027a7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions shared/chat/conversation/messages/wrapper/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,13 +246,13 @@ class _WrapperMessage extends React.Component<Props & Kb.OverlayParentProps, Sta
</Kb.Text>
)

private _isFailed = () =>
private isFailed = () =>
// hide error messages if the exploding message already exploded
!!this.props.failureDescription &&
!(this._isExploding() && this.props.exploded) && (
!(this.isExploding() && this.props.exploded) && (
<Kb.Text key="isFailed" type="BodySmall">
<Kb.Text type="BodySmall" style={this._isExploding() ? styles.failExploding : styles.fail}>
{this._isExploding() && (
<Kb.Text type="BodySmall" style={this.isExploding() ? styles.failExploding : styles.fail}>
{this.isExploding() && (
<>
<Kb.Icon fontSize={16} boxStyle={styles.failExplodingIcon} type="iconfont-block" />{' '}
</>
Expand Down

0 comments on commit f7027a7

Please sign in to comment.