Group Description: Edit/Receive
This commit is contained in:
parent
e5d365dfc4
commit
9705f464be
29 changed files with 859 additions and 149 deletions
|
@ -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(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue