fix jest issue for sponsor (mastodon#311)

ClearlyClaire · Dec 21, 2021 · 32e5e50 · 32e5e50
1 parent fc29280
commit 32e5e50
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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('<DisplayName />', () => {
       username: 'bar',
       acct: 'bar@baz',
       display_name_html: '<p>Foo</p>',
+      sponsor: 'free_tier',
     });
     const component = renderer.create(<DisplayName account={account} />);
     const tree      = component.toJSON();

diff --git 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 = <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>;
-      suffix      = <span className='display-name__account'>@{acct} <Sponsor sponsor_category={account.get('sponsor')} /></span>;
+      suffix      = <span className='display-name__account'>@{acct}<Sponsor sponsor_category={account.get('sponsor')} /></span>;
     }
 
     return (

diff --git 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 (
-      <div className='account-role admin sponsor-badge' style={{ background: background }}><FormattedMessage id='account.badges.sponsor' defaultMessage='Sponsor' /></div>
+      <div className='account-role admin sponsor-badge' style={{ background: background }}><span>Sponsor</span></div>
     );
   }