diff --git a/ts/components/MyStories.stories.tsx b/ts/components/MyStories.stories.tsx index 73d0ce74950..e2d3dc8123f 100644 --- a/ts/components/MyStories.stories.tsx +++ b/ts/components/MyStories.stories.tsx @@ -10,7 +10,7 @@ import { within, userEvent } from '@storybook/testing-library'; import type { PropsType } from './MyStories'; import enMessages from '../../_locales/en/messages.json'; -import { MY_STORIES_ID } from '../types/Stories'; +import { MY_STORY_ID } from '../types/Stories'; import { MyStories } from './MyStories'; import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; import { getFakeMyStory } from '../test-both/helpers/getFakeStory'; @@ -89,7 +89,7 @@ const interactionTest: PlayFunction = async ({ export const SingleListStories = Template.bind({}); SingleListStories.args = { - myStories: [getFakeMyStory(MY_STORIES_ID)], + myStories: [getFakeMyStory(MY_STORY_ID)], }; SingleListStories.play = interactionTest; SingleListStories.story = { @@ -99,7 +99,7 @@ SingleListStories.story = { export const MultiListStories = Template.bind({}); MultiListStories.args = { myStories: [ - getFakeMyStory(MY_STORIES_ID), + getFakeMyStory(MY_STORY_ID), getFakeMyStory(uuid(), 'Cool Peeps'), getFakeMyStory(uuid(), 'Family'), ], diff --git a/ts/components/SendStoryModal.tsx b/ts/components/SendStoryModal.tsx index 0296c8f5793..e99141cb03b 100644 --- a/ts/components/SendStoryModal.tsx +++ b/ts/components/SendStoryModal.tsx @@ -16,7 +16,7 @@ import { getListViewers, DistributionListSettingsModal, EditDistributionListModal, - EditMyStoriesPrivacy, + EditMyStoryPrivacy, Page as StoriesSettingsPage, } from './StoriesSettingsModal'; import type { StoryDistributionListWithMembersDataType } from '../types/Stories'; @@ -28,7 +28,7 @@ import { Checkbox } from './Checkbox'; import { ConfirmationDialog } from './ConfirmationDialog'; import { ContextMenu } from './ContextMenu'; -import { MY_STORIES_ID, getStoryDistributionListName } from '../types/Stories'; +import { MY_STORY_ID, getStoryDistributionListName } from '../types/Stories'; import type { RenderModalPage, ModalPropsType } from './Modal'; import { PagedModal, ModalPage } from './Modal'; import { StoryDistributionListName } from './StoryDistributionListName'; @@ -97,7 +97,7 @@ function getListMemberUuids( ): Array { const memberUuids = list.members.map(({ uuid }) => uuid).filter(isNotNil); - if (list.id === MY_STORIES_ID && list.isBlockList) { + if (list.id === MY_STORY_ID && list.isBlockList) { const excludeUuids = new Set(memberUuids); return signalConnections .map(conversation => conversation.uuid) @@ -230,14 +230,14 @@ export const SendStoryModal = ({ // during the first time posting to My Stories experience where we have // to select the privacy settings. const ogMyStories = useMemo( - () => distributionLists.find(list => list.id === MY_STORIES_ID), + () => distributionLists.find(list => list.id === MY_STORY_ID), [distributionLists] ); const initialMyStories: StoryDistributionListWithMembersDataType = useMemo( () => ({ allowsReplies: true, - id: MY_STORIES_ID, + id: MY_STORY_ID, name: i18n('Stories__mine'), isBlockList: ogMyStories?.isBlockList ?? true, members: ogMyStories?.members || [], @@ -310,7 +310,7 @@ export const SendStoryModal = ({ setMyStoriesToAllSignalConnections(); } } else { - onViewersUpdated(MY_STORIES_ID, stagedMyStoriesMemberUuids); + onViewersUpdated(MY_STORY_ID, stagedMyStoriesMemberUuids); } setSelectedContacts([]); @@ -332,11 +332,12 @@ export const SendStoryModal = ({ onClose={handleClose} {...modalCommonProps} > - { let nextSelectedContacts = stagedMyStories.members; @@ -385,6 +386,7 @@ export const SendStoryModal = ({ getPreferredBadge={getPreferredBadge} i18n={i18n} listToEdit={listToEdit} + signalConnectionsCount={signalConnections.length} onRemoveMember={onRemoveMember} onRepliesNReactionsChanged={onRepliesNReactionsChanged} setConfirmDeleteList={setConfirmDeleteList} @@ -595,7 +597,7 @@ export const SendStoryModal = ({ const fullList = sortBy( [...groupStories, ...distributionLists], listOrGroup => { - if (listOrGroup.id === MY_STORIES_ID) { + if (listOrGroup.id === MY_STORY_ID) { return Number.NEGATIVE_INFINITY; } return ( @@ -618,7 +620,7 @@ export const SendStoryModal = ({ name="SendStoryModal__distribution-list" onChange={(value: boolean) => { if ( - list.id === MY_STORIES_ID && + list.id === MY_STORY_ID && hasFirstStoryPostExperience && value ) { @@ -643,7 +645,7 @@ export const SendStoryModal = ({ - {list.id === MY_STORIES_ID ? ( + {list.id === MY_STORY_ID ? (
- {hasFirstStoryPostExperience && - list.id === MY_STORIES_ID ? ( + {hasFirstStoryPostExperience && list.id === MY_STORY_ID ? ( i18n('SendStoryModal__choose-who-can-view') ) : ( <> - {list.id === MY_STORIES_ID + {list.id === MY_STORY_ID ? getI18nForMyStory(list, i18n) : i18n('SendStoryModal__custom-story')} diff --git a/ts/components/StoriesSettingsModal.tsx b/ts/components/StoriesSettingsModal.tsx index 867f67f13db..750f5170bc6 100644 --- a/ts/components/StoriesSettingsModal.tsx +++ b/ts/components/StoriesSettingsModal.tsx @@ -23,7 +23,7 @@ import { ContactPill } from './ContactPill'; import { ConversationList, RowType } from './ConversationList'; import { Input } from './Input'; import { Intl } from './Intl'; -import { MY_STORIES_ID, getStoryDistributionListName } from '../types/Stories'; +import { MY_STORY_ID, getStoryDistributionListName } from '../types/Stories'; import { PagedModal, ModalPage } from './Modal'; import { SearchInput } from './SearchInput'; import { StoryDistributionListName } from './StoryDistributionListName'; @@ -104,7 +104,7 @@ export function getListViewers( ): string { let memberCount = list.members.length; - if (list.id === MY_STORIES_ID && list.isBlockList) { + if (list.id === MY_STORY_ID && list.isBlockList) { memberCount = list.isBlockList ? signalConnections.length - list.members.length : signalConnections.length; @@ -143,7 +143,7 @@ function DistributionListItem({ signalConnections, onSelectItemToEdit, }: DistributionListItemProps) { - const isMyStories = distributionList.id === MY_STORIES_ID; + const isMyStory = distributionList.id === MY_STORY_ID; return (