From 733cabf83191631225834e5ef855373c251086de Mon Sep 17 00:00:00 2001
From: Domen Lanisnik <dlanisnik@duckduckgo.com>
Date: Tue, 19 May 2026 11:15:30 +0200
Subject: [PATCH] Clear emailExtractedData on step completion

---
 .../pir/impl/common/actions/BrokerStepCompletedEventHandler.kt  | 1 +
 .../impl/common/actions/BrokerStepCompletedEventHandlerTest.kt  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/common/actions/BrokerStepCompletedEventHandler.kt b/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/common/actions/BrokerStepCompletedEventHandler.kt
index 9bee99b69aa6..02972a853c1e 100644
--- a/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/common/actions/BrokerStepCompletedEventHandler.kt
+++ b/pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/common/actions/BrokerStepCompletedEventHandler.kt
@@ -90,6 +90,7 @@ class BrokerStepCompletedEventHandler @Inject constructor(
                 currentBrokerStepIndex = state.currentBrokerStepIndex + 1,
                 actionRetryCount = 0,
                 generatedEmailData = null,
+                emailExtractedData = emptyMap(),
                 stageStatus = PirStageStatus(
                     currentStage = PirStage.VALIDATE,
                     stageStartMs = currentTimeProvider.currentTimeMillis(),
diff --git a/pir/pir-impl/src/test/kotlin/com/duckduckgo/pir/impl/common/actions/BrokerStepCompletedEventHandlerTest.kt b/pir/pir-impl/src/test/kotlin/com/duckduckgo/pir/impl/common/actions/BrokerStepCompletedEventHandlerTest.kt
index b011e07c994c..63f94bddd12f 100644
--- a/pir/pir-impl/src/test/kotlin/com/duckduckgo/pir/impl/common/actions/BrokerStepCompletedEventHandlerTest.kt
+++ b/pir/pir-impl/src/test/kotlin/com/duckduckgo/pir/impl/common/actions/BrokerStepCompletedEventHandlerTest.kt
@@ -639,6 +639,7 @@ class BrokerStepCompletedEventHandlerTest {
             currentActionIndex = 1,
             actionRetryCount = 5,
             generatedEmailData = testGeneratedEmailData,
+            emailExtractedData = mapOf("verificationCode" to "123456"),
             transactionID = "txn-123",
             brokerStepStartTime = testBrokerStartTime,
             stageStatus = PirStageStatus(
@@ -656,6 +657,7 @@ class BrokerStepCompletedEventHandlerTest {
         assertEquals(1, result.nextState.currentBrokerStepIndex)
         assertEquals(0, result.nextState.actionRetryCount)
         assertNull(result.nextState.generatedEmailData)
+        assertEquals(emptyMap<String, String>(), result.nextState.emailExtractedData)
         assertEquals(PirStage.VALIDATE, result.nextState.stageStatus.currentStage)
         assertEquals(testCurrentTimeInMillis, result.nextState.stageStatus.stageStartMs)
         assertEquals("txn-123", result.nextState.transactionID)