[🐴] Clean up after deleting message (#3950)

* Clean up after removal

* Remove console

2 files changed, 6 insertions, 8 deletions

diff --git a/src/state/messages/__tests__/convo.test.ts b/src/state/messages/__tests__/convo.test.ts
index 44fe16fef..34df5f94a 100644
--- a/src/state/messages/__tests__/convo.test.ts
+++ b/src/state/messages/__tests__/convo.test.ts
@@ -35,11 +35,13 @@ describe(`#/state/messages/convo`, () => {
     it.todo(
       `successfully sent messages are re-ordered, if needed, by events received from server`,
     )
+    it.todo(`pending messages are cleaned up from state after firehose event`)
   })
 
   describe(`deleting messages`, () => {
     it.todo(`messages are optimistically deleted from the chat`)
     it.todo(`messages are confirmed deleted via events from the server`)
+    it.todo(`deleted messages are cleaned up from state after firehose event`)
   })
 
   describe(`log handling`, () => {
diff --git a/src/state/messages/convo/agent.ts b/src/state/messages/convo/agent.ts
index 6801def75..65470baa5 100644
--- a/src/state/messages/convo/agent.ts
+++ b/src/state/messages/convo/agent.ts
@@ -678,14 +678,10 @@ export class Convo {
             /*
              * Update if we have this in state. If we don't, don't worry about it.
              */
-            // TODO check for other storage spots
-            if (this.pastMessages.has(ev.message.id)) {
-              /*
-               * For now, we remove deleted messages from the thread, if we receive one.
-               *
-               * To support them, it'd look something like this:
-               *   this.pastMessages.set(ev.message.id, ev.message)
-               */
+            if (
+              this.pastMessages.has(ev.message.id) ||
+              this.newMessages.has(ev.message.id)
+            ) {
               this.pastMessages.delete(ev.message.id)
               this.newMessages.delete(ev.message.id)
               this.deletedMessages.delete(ev.message.id)