Skip to content

Commit 8437854

Browse files
author
npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr
committed
fix(desktop): hide Inbox edit for archived channels
Co-authored-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co> Signed-off-by: npub1ft62tztwwm2x9xamk25smmuaj4sfckdkldksruf2x2jwqalffkrq0g7arr <4af4a5896e76d4629bbbb2a90def9d95609c59b6fb6d01f12a32a4e077e94d86@sprout-oss.stage.blox.sqprod.co>
1 parent 1c97068 commit 8437854

2 files changed

Lines changed: 29 additions & 1 deletion

File tree

‎desktop/src/features/home/ui/InboxDetailPane.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,9 @@ export function InboxDetailPane({
542542
profiles,
543543
);
544544

545+
const canEditMessage =
546+
channel?.archivedAt === null && canManageMessage;
547+
545548
return (
546549
<InboxMessageRow
547550
agentPubkeys={agentPubkeys}
@@ -552,7 +555,7 @@ export function InboxDetailPane({
552555
isFocusHighlightVisible={isFocusHighlightVisible}
553556
key={message.id}
554557
message={message}
555-
onEdit={canManageMessage ? handleSelectEditTarget : undefined}
558+
onEdit={canEditMessage ? handleSelectEditTarget : undefined}
556559
onSelectReplyTarget={handleSelectReplyTarget}
557560
onToggleReaction={onToggleReaction}
558561
/>

‎desktop/tests/e2e/inbox-edit.spec.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ type MockFeedItem = {
2222
};
2323

2424
type MockWindow = Window & {
25+
__BUZZ_E2E_INVALIDATE_CHANNELS__?: () => Promise<void>;
26+
__BUZZ_E2E_INVOKE_MOCK_COMMAND__?: (
27+
command: string,
28+
payload?: Record<string, unknown>,
29+
) => Promise<unknown>;
2530
__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__?: (item: MockFeedItem) => unknown;
2631
};
2732

@@ -133,4 +138,24 @@ test("Inbox offers a working Edit action only for manageable messages", async ({
133138
await expect(
134139
page.getByTestId(`edit-message-${FOREIGN_MESSAGE_ID}`),
135140
).toHaveCount(0);
141+
await page.keyboard.press("Escape");
142+
143+
await page.evaluate(async (channelId) => {
144+
const testWindow = window as MockWindow;
145+
const invoke = testWindow.__BUZZ_E2E_INVOKE_MOCK_COMMAND__;
146+
const invalidateChannels = testWindow.__BUZZ_E2E_INVALIDATE_CHANNELS__;
147+
if (!invoke || !invalidateChannels) {
148+
throw new Error("Mock channel helpers are not installed.");
149+
}
150+
151+
await invoke("archive_channel", { channelId });
152+
await invalidateChannels();
153+
}, GENERAL_CHANNEL_ID);
154+
155+
await page.getByTestId(`home-inbox-item-${OWN_MESSAGE_ID}`).click();
156+
await expect(detail).toContainText("My Inbox message after editing.");
157+
await openMoreActions(page, OWN_MESSAGE_ID);
158+
await expect(page.getByTestId(`edit-message-${OWN_MESSAGE_ID}`)).toHaveCount(
159+
0,
160+
);
136161
});

0 commit comments

Comments
 (0)