From 7997ec28bb33ac19be8f0e50dafe57e1f9268672 Mon Sep 17 00:00:00 2001
From: Jameson Brown <jameson.brown@mx.com>
Date: Fri, 19 Sep 2025 12:49:00 -0600
Subject: [PATCH] fix(oauthstep): prioritize existing OAuth member to prevent
 duplicates

CT-1749
---
 src/views/oauth/OAuthStep.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/oauth/OAuthStep.js b/src/views/oauth/OAuthStep.js
index 099bd003a9..966db228d6 100644
--- a/src/views/oauth/OAuthStep.js
+++ b/src/views/oauth/OAuthStep.js
@@ -122,7 +122,11 @@ export const OAuthStep = React.forwardRef((props, navigationRef) => {
 
     let member$
 
-    if (pendingOauthMember) {
+    if (member && member.is_oauth) {
+      // If there is an existing oauth member, use that one, this may be Connected or in an errors state, etc
+      // Using this member prevents us from creating duplicate or unnecessary members
+      member$ = of(member)
+    } else if (pendingOauthMember) {
       // If there is a pending oauth member, don't create a new one, use that one
       member$ = of(pendingOauthMember)
     } else {