From ab3c7c5bbe06e3b3eb93db8a22220045191eac93 Mon Sep 17 00:00:00 2001
From: Alex Morask <amorask@bitwarden.com>
Date: Wed, 3 Sep 2025 11:32:41 -0500
Subject: [PATCH] Stephon's feedback

---
 .../Implementations/SetupIntentSucceededHandler.cs     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Billing/Services/Implementations/SetupIntentSucceededHandler.cs b/src/Billing/Services/Implementations/SetupIntentSucceededHandler.cs
index 78a84bc3a2..bc3fa1bd56 100644
--- a/src/Billing/Services/Implementations/SetupIntentSucceededHandler.cs
+++ b/src/Billing/Services/Implementations/SetupIntentSucceededHandler.cs
@@ -42,14 +42,8 @@ public class SetupIntentSucceededHandler(
         var organization = await organizationRepository.GetByIdAsync(subscriberId.Value);
         var provider = await providerRepository.GetByIdAsync(subscriberId.Value);
 
-        if (organization != null)
-        {
-            await SetPaymentMethodAsync(organization, setupIntent.PaymentMethod);
-        }
-        else if (provider != null)
-        {
-            await SetPaymentMethodAsync(provider, setupIntent.PaymentMethod);
-        }
+        OneOf<Organization, Provider> entity = organization != null ? organization : provider!;
+        await SetPaymentMethodAsync(entity, setupIntent.PaymentMethod);
     }
 
     private async Task SetPaymentMethodAsync(