Only display follow requests link in getting started window if account is locked

diff --git a/app/assets/javascripts/components/features/getting_started/index.jsx b/app/assets/javascripts/components/features/getting_started/index.jsx
index 7c249195442c870b44f767ff416c8e3667388617..fdd594621207f1434274b1d2178a1907737e4fdc 100644 (file)
--- a/app/assets/javascripts/components/features/getting_started/index.jsx
+++ b/app/assets/javascripts/components/features/getting_started/index.jsx
@@ -3,6 +3,7 @@ import ColumnLink from '../ui/components/column_link';
 import { Link } from 'react-router';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 
 const messages = defineMessages({
   heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -12,7 +13,7 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = state => ({
-  me: state.getIn(['meta', 'me'])
+  me: state.getIn(['accounts', state.getIn(['meta', 'me'])])
 });
 
 const hamburgerStyle = {
@@ -27,13 +28,19 @@ const hamburgerStyle = {
 };
 
 const GettingStarted = ({ intl, me }) => {
+  let followRequests = '';
+
+  if (me.get('locked')) {
+    followRequests = <ColumnLink icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />;
+  }
+
   return (
     <Column icon='asterisk' heading={intl.formatMessage(messages.heading)}>
       <div style={{ position: 'relative' }}>
         <div style={hamburgerStyle}><i className='fa fa-bars' /></div>
         <ColumnLink icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />
         <ColumnLink icon='cog' text={intl.formatMessage(messages.settings)} href='/settings/profile' />
-        <ColumnLink icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />
+        {followRequests}
       </div>
 
       <div className='static-content'>
@@ -47,7 +54,7 @@ const GettingStarted = ({ intl, me }) => {
 
 GettingStarted.propTypes = {
   intl: React.PropTypes.object.isRequired,
-  me: React.PropTypes.number
+  me: ImmutablePropTypes.map.isRequired
 };
 
 export default connect(mapStateToProps)(injectIntl(GettingStarted));