Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add affirmative and destructive secondary button variants

Browse Source
This commit is contained in:
Evan Hahn
2021-04-06 17:14:18 -05:00
committed by Josh Perez
parent 0555ef0a1e
commit 95482fbf31
6 changed files with 72 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ts/components/conversation/MessageRequestActions.tsx
View File

@@ -1,9 +1,9 @@
// Copyright 2020 Signal Messenger, LLC
// Copyright 2020-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import * as React from 'react';
import classNames from 'classnames';
import { ContactName, PropsType as ContactNameProps } from './ContactName';
import { Button, ButtonVariant } from '../Button';
import {
MessageRequestActionsConfirmation,
MessageRequestState,
@@ -81,60 +81,40 @@ export const MessageRequestActions = ({
/>
</p>
<div className="module-message-request-actions__buttons">
<button
type="button"
<Button
onClick={() => {
setMrState(MessageRequestState.deleting);
}}
tabIndex={0}
className={classNames(
'module-message-request-actions__buttons__button',
'module-message-request-actions__buttons__button--deny'
)}
variant={ButtonVariant.SecondaryDestructive}
>
{i18n('MessageRequests--delete')}
</button>
</Button>
{isBlocked ? (
<button
type="button"
<Button
onClick={() => {
setMrState(MessageRequestState.unblocking);
}}
tabIndex={0}
className={classNames(
'module-message-request-actions__buttons__button',
'module-message-request-actions__buttons__button--accept'
)}
variant={ButtonVariant.SecondaryAffirmative}
>
{i18n('MessageRequests--unblock')}
</button>
</Button>
) : (
<button
type="button"
<Button
onClick={() => {
setMrState(MessageRequestState.blocking);
}}
tabIndex={0}
className={classNames(
'module-message-request-actions__buttons__button',
'module-message-request-actions__buttons__button--deny'
)}
variant={ButtonVariant.SecondaryDestructive}
>
{i18n('MessageRequests--block')}
</button>
</Button>
)}
{!isBlocked ? (
<button
type="button"
<Button
onClick={onAccept}
tabIndex={0}
className={classNames(
'module-message-request-actions__buttons__button',
'module-message-request-actions__buttons__button--accept'
)}
variant={ButtonVariant.SecondaryAffirmative}
>
{i18n('MessageRequests--accept')}
</button>
</Button>
) : null}
</div>
</div>