mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Group Description: Edit/Receive

Browse source
This commit is contained in:
Scott Nonnenberg 2021-06-01 17:24:28 -07:00 • committed by GitHub
parent e5d365dfc4
commit 9705f464be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 859 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ts/components/GroupV2JoinDialog.tsx
View file

@ -7,6 +7,7 @@ import { LocalizerType } from '../types/Util';
import { Avatar, AvatarBlur } from './Avatar';
import { Spinner } from './Spinner';
import { Button, ButtonVariant } from './Button';
import { GroupDescription } from './conversation/GroupDescription';
import { PreJoinConversationType } from '../state/ducks/conversations';
@ -35,6 +36,7 @@ export const GroupV2JoinDialog = React.memo((props: PropsType) => {
const {
approvalRequired,
avatar,
groupDescription,
i18n,
join,
memberCount,
@ -45,9 +47,6 @@ export const GroupV2JoinDialog = React.memo((props: PropsType) => {
const joinString = approvalRequired
? i18n('GroupV2--join--request-to-join-button')
: i18n('GroupV2--join--join-button');
const promptString = approvalRequired
? i18n('GroupV2--join--prompt-with-approval')
: i18n('GroupV2--join--prompt');
const memberString =
memberCount === 1
? i18n('GroupV2--join--member-count--single')
@ -93,7 +92,20 @@ export const GroupV2JoinDialog = React.memo((props: PropsType) => {
<div className="module-group-v2-join-dialog__metadata">
{i18n('GroupV2--join--group-metadata', [memberString])}
</div>
<div className="module-group-v2-join-dialog__prompt">{promptString}</div>
{groupDescription && (
<div className="module-group-v2-join-dialog__description">
<GroupDescription i18n={i18n} title={title} text={groupDescription} />
</div>
)}
{approvalRequired ? (
<div className="module-group-v2-join-dialog__prompt--approval">
{i18n('GroupV2--join--prompt-with-approval')}
</div>
) : (
<div className="module-group-v2-join-dialog__prompt">
{i18n('GroupV2--join--prompt')}
</div>
)}
<div className="module-group-v2-join-dialog__buttons">
<Button
className={classNames(