diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-11-16 01:38:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 01:38:26 -0600 |
| commit | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (patch) | |
| tree | fcd9bdb5ba49ab7a6a79590c74db858ae77b4239 /app/javascript/mastodon/features/compose/containers/navigation_container.js | |
| parent | 88627fd7aa2493a6890d60a5965459e4c7fe6fe9 (diff) | |
| parent | 35fbdc36f92b610e8a73e2acb220e87cf5fc83b0 (diff) | |
Merge pull request #216 from glitch-soc/merge-upstream-3023725
Merge upstream at commit 3023725
Diffstat (limited to 'app/javascript/mastodon/features/compose/containers/navigation_container.js')
| -rw-r--r-- | app/javascript/mastodon/features/compose/containers/navigation_container.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/containers/navigation_container.js b/app/javascript/mastodon/features/compose/containers/navigation_container.js index 8cc53c087..eb9f3ea45 100644 --- a/app/javascript/mastodon/features/compose/containers/navigation_container.js +++ b/app/javascript/mastodon/features/compose/containers/navigation_container.js @@ -1,9 +1,10 @@ import { connect } from 'react-redux'; import NavigationBar from '../components/navigation_bar'; +import { me } from '../../../initial_state'; const mapStateToProps = state => { return { - account: state.getIn(['accounts', state.getIn(['meta', 'me'])]), + account: state.getIn(['accounts', me]), }; }; |