diff --git a/app/soapbox/components/account.js b/app/soapbox/components/account.js index 623d22d47..afc5109c1 100644 --- a/app/soapbox/components/account.js +++ b/app/soapbox/components/account.js @@ -8,22 +8,12 @@ import DisplayName from './display_name'; import Permalink from './permalink'; import Icon from './icon'; import IconButton from './icon_button'; +import ActionButton from 'soapbox/features/ui/components/action_button'; import RelativeTimestamp from './relative_timestamp'; -import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import classNames from 'classnames'; import emojify from 'soapbox/features/emoji/emoji'; -const messages = defineMessages({ - follow: { id: 'account.follow', defaultMessage: 'Follow' }, - unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, - requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' }, - unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, - unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' }, - mute_notifications: { id: 'account.mute_notifications', defaultMessage: 'Mute notifications from @{name}' }, - unmute_notifications: { id: 'account.unmute_notifications', defaultMessage: 'Unmute notifications from @{name}' }, -}); - const mapStateToProps = state => { return { me: state.get('me'), @@ -31,7 +21,6 @@ const mapStateToProps = state => { }; export default @connect(mapStateToProps) -@injectIntl class Account extends ImmutablePureComponent { static propTypes = { @@ -80,7 +69,7 @@ class Account extends ImmutablePureComponent { } render() { - const { account, intl, hidden, onActionClick, actionIcon, actionTitle, me, withDate, withRelationship, reaction } = this.props; + const { account, hidden, onActionClick, actionIcon, actionTitle, me, withDate, withRelationship, reaction } = this.props; if (!account) { return
; @@ -102,33 +91,7 @@ class Account extends ImmutablePureComponent { if (onActionClick && actionIcon) { buttons =