From 2362265022ab723ef58c79385fb9a61de1fe3a51 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 19 Feb 2025 13:45:59 +1100 Subject: [PATCH 1/2] fix: error toast when creating group failed --- ts/state/ducks/metaGroups.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index bf6fcc97c..005d71158 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -22,7 +22,7 @@ import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInfoChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; import { PubKey } from '../../session/types'; -import { UserUtils } from '../../session/utils'; +import { ToastUtils, UserUtils } from '../../session/utils'; import { PreConditionFailed } from '../../session/utils/errors'; import { GroupInvite } from '../../session/utils/job_runners/jobs/GroupInviteJob'; import { GroupPendingRemovals } from '../../session/utils/job_runners/jobs/GroupPendingRemovalsJob'; @@ -53,6 +53,7 @@ import { WithRemoveMembers, } from '../../session/types/with'; import { updateGroupNameModal } from './modalDialog'; +import { localize } from '../../localization/localeTools'; export type GroupState = { infos: Record; @@ -276,6 +277,7 @@ const initNewGroupInWrapper = createAsyncThunk( clearFetchedHashes: true, }); } + ToastUtils.pushToastError('groupCreateFailed', localize('groupErrorCreate').toString()); throw e; } } From 17ad0e853546d062761e317c0bcb93e121814aa9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 19 Feb 2025 13:46:16 +1100 Subject: [PATCH 2/2] fix: ignore non-05 from search result in group create --- ts/components/leftpane/overlay/OverlayClosedGroup.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index f0f8081ce..308241879 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -188,7 +188,9 @@ export const OverlayClosedGroupV2 = () => { } useKey('Escape', closeOverlay); - const contactsToRender = isSearch ? searchResultContactsOnly : privateContactsPubkeys; + const contactsToRender = isSearch + ? searchResultContactsOnly.filter(m => PubKey.is05Pubkey(m)) + : privateContactsPubkeys; const noContactsForClosedGroup = isEmpty(searchTerm) && contactsToRender.length === 0;