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

New feature flag with ability to migrate GV1 groups

Browse source
This commit is contained in:
Scott Nonnenberg 2020-12-01 08:42:35 -08:00 • committed by GitHub
parent 089a6fb5a2
commit 2b8ae412e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 608 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/components/GroupV1MigrationDialog.tsx
View file

@ -19,7 +19,6 @@ export type DataPropsType = {
readonly droppedMembers: Array<ConversationType>;
readonly hasMigrated: boolean;
readonly invitedMembers: Array<ConversationType>;
readonly learnMore: CallbackType;
readonly migrate: CallbackType;
readonly onClose: CallbackType;
};
@ -42,7 +41,6 @@ export const GroupV1MigrationDialog = React.memo((props: PropsType) => {
hasMigrated,
i18n,
invitedMembers,
learnMore,
migrate,
onClose,
} = props;
@ -85,7 +83,7 @@ export const GroupV1MigrationDialog = React.memo((props: PropsType) => {
)}
{renderMembers(droppedMembers, droppedMembersKey, i18n)}
</div>
{renderButtons(hasMigrated, onClose, learnMore, migrate, i18n)}
{renderButtons(hasMigrated, onClose, migrate, i18n)}
</div>
);
});
@ -93,7 +91,6 @@ export const GroupV1MigrationDialog = React.memo((props: PropsType) => {
function renderButtons(
hasMigrated: boolean,
onClose: CallbackType,
learnMore: CallbackType,
migrate: CallbackType,
i18n: LocalizerType
) {
@ -125,9 +122,9 @@ function renderButtons(
'module-group-v2-migration-dialog__button--secondary'
)}
type="button"
onClick={learnMore}
onClick={onClose}
>
{i18n('GroupV1--Migration--learn-more')}
{i18n('cancel')}
</button>
<button
className="module-group-v2-migration-dialog__button"