From b5f38049fe953d4c48b8e1970688ff161b81ff49 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@gmail.com>
Date: Tue, 14 May 2024 14:59:17 -0600
Subject: [PATCH] Merge pull request #42095 from
 Skakruk/42062-login-title-on-refresh

[CP Staging] Keep original isClientTheLeader value on page refresh

(cherry picked from commit 8a5bc9c9ecaa961002df210085e2f799948469d6)
---
 src/libs/ActiveClientManager/index.ts | 32 +++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/libs/ActiveClientManager/index.ts b/src/libs/ActiveClientManager/index.ts
index b364f08508bc..69bd3a848e0b 100644
--- a/src/libs/ActiveClientManager/index.ts
+++ b/src/libs/ActiveClientManager/index.ts
@@ -45,7 +45,30 @@ Onyx.connect({
     },
 });
 
+let isPromotingNewLeader = false;
+
+/**
+ * The last GUID is the most recent GUID, so that should be the leader
+ */
+const isClientTheLeader: IsClientTheLeader = () => {
+    /**
+     * When a new leader is being promoted, there is a brief period during which the current leader's clientID
+     * is removed from the activeClients list due to asynchronous operations, but the new leader has not officially
+     * taken over yet. This can result in a situation where, upon page refresh, multiple leaders are being reported.
+     * This early return statement here will prevent that from happening by maintaining the current leader as
+     * the 'active leader' until the other leader is fully promoted.
+     */
+    if (isPromotingNewLeader) {
+        return true;
+    }
+
+    const lastActiveClient = activeClients.length && activeClients[activeClients.length - 1];
+
+    return lastActiveClient === clientID;
+};
+
 const cleanUpClientId = () => {
+    isPromotingNewLeader = isClientTheLeader();
     activeClients = activeClients.filter((id) => id !== clientID);
     ActiveClients.setActiveClients(activeClients);
 };
@@ -62,13 +85,4 @@ const init: Init = () => {
     window.addEventListener('beforeunload', cleanUpClientId);
 };
 
-/**
- * The last GUID is the most recent GUID, so that should be the leader
- */
-const isClientTheLeader: IsClientTheLeader = () => {
-    const lastActiveClient = activeClients.length && activeClients[activeClients.length - 1];
-
-    return lastActiveClient === clientID;
-};
-
 export {init, isClientTheLeader, isReady};