From a3c0d8688bec83661bbd2931dcf6c8970075ff63 Mon Sep 17 00:00:00 2001
From: Timo Notheisen <timo.notheisen@js-soft.com>
Date: Tue, 23 Jan 2024 09:43:50 +0100
Subject: [PATCH] refactor: expect only one recipient with given address in
 Message.ReplaceIdentityAddress

---
 Modules/Messages/src/Messages.Domain/Entities/Message.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Modules/Messages/src/Messages.Domain/Entities/Message.cs b/Modules/Messages/src/Messages.Domain/Entities/Message.cs
index 0211f6632e..692e4b0f39 100644
--- a/Modules/Messages/src/Messages.Domain/Entities/Message.cs
+++ b/Modules/Messages/src/Messages.Domain/Entities/Message.cs
@@ -51,11 +51,8 @@ public void ReplaceIdentityAddress(IdentityAddress oldIdentityAddress, IdentityA
             CreatedBy = newIdentityAddress;
         }
 
-        var recipients = Recipients.Where(r => r.Address == oldIdentityAddress);
+        var recipient = Recipients.FirstOrDefault(r => r.Address == oldIdentityAddress);
 
-        foreach (var recipient in recipients)
-        {
-            recipient.UpdateAddress(newIdentityAddress);
-        }
+        recipient?.UpdateAddress(newIdentityAddress);
     }
 }