diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js index 7811c8c67..05c222fe1 100644 --- a/app/soapbox/components/sidebar_menu.js +++ b/app/soapbox/components/sidebar_menu.js @@ -40,6 +40,7 @@ const messages = defineMessages({ soapbox_config: { id: 'navigation_bar.soapbox_config', defaultMessage: 'Soapbox config' }, import_data: { id: 'navigation_bar.import_data', defaultMessage: 'Import data' }, account_aliases: { id: 'navigation_bar.account_aliases', defaultMessage: 'Account aliases' }, + account_migration: { id: 'navigation_bar.account_migration', defaultMessage: 'Move account' }, security: { id: 'navigation_bar.security', defaultMessage: 'Security' }, logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }, lists: { id: 'column.lists', defaultMessage: 'Lists' }, @@ -318,9 +319,9 @@ class SidebarMenu extends ImmutablePureComponent { {intl.formatMessage(messages.import_data)} )} - {(features.federating && features.accountAliasesAPI) && + {(features.federating && features.accountMoving) && - {intl.formatMessage(messages.account_aliases)} + {intl.formatMessage(messages.account_migration)} } {features.securityAPI ? ( diff --git a/app/soapbox/features/ui/components/link_footer.js b/app/soapbox/features/ui/components/link_footer.js index 6710d44f0..0e1d66aae 100644 --- a/app/soapbox/features/ui/components/link_footer.js +++ b/app/soapbox/features/ui/components/link_footer.js @@ -16,14 +16,10 @@ const mapStateToProps = state => { const me = state.get('me'); const account = state.getIn(['accounts', me]); const instance = state.get('instance'); - const features = getFeatures(instance); return { account, - profileDirectory: features.profileDirectory, - federating: features.federating, - showAliases: features.accountAliasesAPI, - importAPI: features.importAPI, + features: getFeatures(instance), baseURL: getBaseURL(account), }; }; @@ -39,25 +35,25 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ }, }); -const LinkFooter = ({ onOpenHotkeys, account, profileDirectory, federating, showAliases, importAPI, onClickLogOut, baseURL }) => ( +const LinkFooter = ({ onOpenHotkeys, account, features, onClickLogOut, baseURL }) => (
    {account && <> - {profileDirectory &&
  • } + {features.profileDirectory &&
  • }
  • - {federating &&
  • } + {features.federating &&
  • }
  • {isAdmin(account) &&
  • } {isAdmin(account) &&
  • }
  • -
  • {importAPI ? ( +
  • {features.importAPI ? ( ) : ( )}
  • - {(federating && showAliases) &&
  • } + {(features.federating && features.accountMoving) &&
  • }
  • }
  • @@ -80,10 +76,7 @@ const LinkFooter = ({ onOpenHotkeys, account, profileDirectory, federating, show LinkFooter.propTypes = { account: ImmutablePropTypes.map, - profileDirectory: PropTypes.bool, - federating: PropTypes.bool, - showAliases: PropTypes.bool, - importAPI: PropTypes.bool, + features: PropTypes.object.isRequired, onOpenHotkeys: PropTypes.func.isRequired, onClickLogOut: PropTypes.func.isRequired, baseURL: PropTypes.string,