diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-26 19:51:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 19:51:28 +0100 |
| commit | bdf4f56f9a9052668e7cce1ce7863268e03d9c86 (patch) | |
| tree | 9952f2e08780455dc1af0febe4b374f5b8a60e2e /app/javascript/flavours/glitch/features/account_timeline | |
| parent | 9f56511860493b770c2e535be0f8ce4777c8d373 (diff) | |
| parent | 9e80b34a95c39d0a1a944713f0f4d6cc5e8b8c43 (diff) | |
Merge pull request #966 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/account_timeline')
| -rw-r--r-- | app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js index e333c31a1..df74ca890 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js +++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js @@ -26,6 +26,7 @@ const messages = defineMessages({ unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' }, blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' }, blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' }, + blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' }, }); const makeMapStateToProps = () => { @@ -64,6 +65,11 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />, confirm: intl.formatMessage(messages.blockConfirm), onConfirm: () => dispatch(blockAccount(account.get('id'))), + secondary: intl.formatMessage(messages.blockAndReport), + onSecondary: () => { + dispatch(blockAccount(account.get('id'))); + dispatch(initReport(account)); + }, })); } }, |