From 428bd9362a683c3eeb644b5839bd0b1832ad746d Mon Sep 17 00:00:00 2001
From: Mihnea Popescu <mihnea.popescu56@gmail.com>
Date: Wed, 2 Sep 2026 16:32:48 -0400
Subject: [PATCH] add fix

---
 src/events/ComponentEventsObserver.test.tsx | 12 ++++++++++++
 src/events/ComponentEventsObserver.ts       |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/events/ComponentEventsObserver.test.tsx b/src/events/ComponentEventsObserver.test.tsx
index 1da6096a162..6ad35d40fb5 100644
--- a/src/events/ComponentEventsObserver.test.tsx
+++ b/src/events/ComponentEventsObserver.test.tsx
@@ -415,4 +415,16 @@ describe('ComponentEventsObserver', () => {
     expect(mockEventsReceiver.registerSearchBarCancelPressedListener).toHaveBeenCalledTimes(1);
     expect(mockEventsReceiver.registerPreviewCompletedListener).toHaveBeenCalledTimes(1);
   });
+
+  it(`registers notifyScreenPopped for the ScreenPopped native event`, () => {
+    uut.registerOnceForAllComponentEvents();
+
+    expect(mockEventsReceiver.registerScreenPoppedListener).toHaveBeenCalledTimes(1);
+    expect(mockEventsReceiver.registerScreenPoppedListener).toHaveBeenCalledWith(
+      uut.notifyScreenPopped
+    );
+    expect(mockEventsReceiver.registerPreviewCompletedListener).toHaveBeenCalledWith(
+      uut.notifyPreviewCompleted
+    );
+  });
 });
diff --git a/src/events/ComponentEventsObserver.ts b/src/events/ComponentEventsObserver.ts
index 0b503a3cc7f..d1e435cca81 100644
--- a/src/events/ComponentEventsObserver.ts
+++ b/src/events/ComponentEventsObserver.ts
@@ -58,7 +58,7 @@ export class ComponentEventsObserver {
       this.notifySearchBarCancelPressed
     );
     this.nativeEventsReceiver.registerPreviewCompletedListener(this.notifyPreviewCompleted);
-    this.nativeEventsReceiver.registerScreenPoppedListener(this.notifyPreviewCompleted);
+    this.nativeEventsReceiver.registerScreenPoppedListener(this.notifyScreenPopped);
   }
 
   public bindComponent(