From 32e5e50ff549ed39b4a2de53df8763aacde4c8f9 Mon Sep 17 00:00:00 2001 From: Manish Sharma Date: Tue, 21 Dec 2021 14:28:46 +0600 Subject: [PATCH] fix jest issue for sponsor (#311) --- .../mastodon/components/__tests__/display_name-test.js | 1 + app/javascript/mastodon/components/display_name.js | 4 ++-- app/javascript/mastodon/components/sponsor.js | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/components/__tests__/display_name-test.js b/app/javascript/mastodon/components/__tests__/display_name-test.js index 0d040c4cd8cc0..5b66e60cd1fa1 100644 --- a/app/javascript/mastodon/components/__tests__/display_name-test.js +++ b/app/javascript/mastodon/components/__tests__/display_name-test.js @@ -9,6 +9,7 @@ describe('', () => { username: 'bar', acct: 'bar@baz', display_name_html: '

Foo

', + sponsor: 'free_tier', }); const component = renderer.create(); const tree = component.toJSON(); diff --git a/app/javascript/mastodon/components/display_name.js b/app/javascript/mastodon/components/display_name.js index 484180c0a2f21..8da6b70c8f9b4 100644 --- a/app/javascript/mastodon/components/display_name.js +++ b/app/javascript/mastodon/components/display_name.js @@ -1,8 +1,8 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; +import Sponsor from './sponsor'; import { autoPlayGif } from 'mastodon/initial_state'; -import Sponsor from "./sponsor"; export default class DisplayName extends React.PureComponent { @@ -63,7 +63,7 @@ export default class DisplayName extends React.PureComponent { } displayName = ; - suffix = @{acct} ; + suffix = @{acct}; } return ( diff --git a/app/javascript/mastodon/components/sponsor.js b/app/javascript/mastodon/components/sponsor.js index 6de563d6c5f7c..6eb6912a48fba 100644 --- a/app/javascript/mastodon/components/sponsor.js +++ b/app/javascript/mastodon/components/sponsor.js @@ -1,6 +1,5 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {FormattedMessage} from 'react-intl'; export default class Sponsor extends React.PureComponent { @@ -19,14 +18,14 @@ export default class Sponsor extends React.PureComponent { } render () { - if(this.props.sponsor_category === 'free_tier') { + if(!this.props.sponsor_category || this.props.sponsor_category === 'free_tier') { return null; } let background = this.colors[this.props.sponsor_category]; return ( -
+
Sponsor
); }