diff --git a/ts/background.ts b/ts/background.ts index f0c4be392f..5720838b12 100644 --- a/ts/background.ts +++ b/ts/background.ts @@ -2519,11 +2519,6 @@ export async function startApp(): Promise { }); routineProfileRefresher.start(); - } else { - assert( - false, - 'Failed to fetch our conversation ID. Skipping routine profile refresh' - ); } // Make sure we have the PNI identity diff --git a/ts/components/GroupV1MigrationDialog.stories.tsx b/ts/components/GroupV1MigrationDialog.stories.tsx index e34a0c2f41..66878da543 100644 --- a/ts/components/GroupV1MigrationDialog.stories.tsx +++ b/ts/components/GroupV1MigrationDialog.stories.tsx @@ -2,8 +2,7 @@ // SPDX-License-Identifier: AGPL-3.0-only import * as React from 'react'; -import { isBoolean } from 'lodash'; -import { boolean } from '@storybook/addon-knobs'; + import { action } from '@storybook/addon-actions'; import type { PropsType } from './GroupV1MigrationDialog'; @@ -34,21 +33,11 @@ const contact3: ConversationType = getDefaultConversation({ id: 'guid-3', }); -function booleanOr(value: boolean | undefined, defaultValue: boolean): boolean { - return isBoolean(value) ? value : defaultValue; -} - const createProps = (overrideProps: Partial = {}): PropsType => ({ - areWeInvited: boolean( - 'areWeInvited', - booleanOr(overrideProps.areWeInvited, false) - ), + areWeInvited: Boolean(overrideProps.areWeInvited), droppedMembers: overrideProps.droppedMembers || [contact3, contact1], getPreferredBadge: () => undefined, - hasMigrated: boolean( - 'hasMigrated', - booleanOr(overrideProps.hasMigrated, false) - ), + hasMigrated: Boolean(overrideProps.hasMigrated), i18n, invitedMembers: overrideProps.invitedMembers || [contact2], migrate: action('migrate'), diff --git a/ts/state/roots/createGroupV1MigrationModal.tsx b/ts/state/roots/createGroupV1MigrationModal.tsx index 929a2cf019..04452643f2 100644 --- a/ts/state/roots/createGroupV1MigrationModal.tsx +++ b/ts/state/roots/createGroupV1MigrationModal.tsx @@ -6,7 +6,6 @@ import { Provider } from 'react-redux'; import type { Store } from 'redux'; -import { ModalHost } from '../../components/ModalHost'; import type { PropsType } from '../smart/GroupV1MigrationDialog'; import { SmartGroupV1MigrationDialog } from '../smart/GroupV1MigrationDialog'; @@ -14,13 +13,9 @@ export const createGroupV1MigrationModal = ( store: Store, props: PropsType ): React.ReactElement => { - const { onClose } = props; - return ( - - - + ); };