Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Refactor initial state: "me" (#5563)

Browse source 
* Refactor initial state: "me"

* remove "me" from reducers/meta.js
This commit is contained in:
Nolan Lawson 2017-10-30 19:27:48 -07:00 • committed by Yamagishi Kazutoshi
parent 29609fbb6a
commit b254e6ca5f
24 changed files with 44 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/account/components/action_bar.js
View file

@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
import { Link } from 'react-router-dom';
import { defineMessages, injectIntl, FormattedMessage, FormattedNumber } from 'react-intl';
import { me } from '../../../initial_state';
const messages = defineMessages({
mention: { id: 'account.mention', defaultMessage: 'Mention @{name}' },
@ -26,7 +27,6 @@ export default class ActionBar extends React.PureComponent {
static propTypes = {
account: ImmutablePropTypes.map.isRequired,
me: PropTypes.string.isRequired,
onFollow: PropTypes.func,
onBlock: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired,
@ -44,7 +44,7 @@ export default class ActionBar extends React.PureComponent {
}
render () {
const { account, me, intl } = this.props;
const { account, intl } = this.props;
let menu = [];
let extraInfo = '';