From 78955413824a0e8efae9a571bea19da90886b731 Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Tue, 4 Aug 2026 10:06:36 +0100
Subject: [PATCH] Merge pull request #36141 from
 overleaf/oa-teardown-editor-upgrade-button-relocation

[web] Teardown `editor-upgrade-button-relocation`

GitOrigin-RevId: b6c53eef240ac2386907e0d0a942c674cfc9133b
---
 .../Features/Project/ProjectController.mjs    |  1 -
 .../ide-react/components/toolbar/toolbar.tsx  |  6 +---
 .../features/ide-react/unit/toolbar.spec.tsx  | 36 +++++++++++++++++++
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectController.mjs b/services/web/app/src/Features/Project/ProjectController.mjs
index b9be98b3f0..fc2710799f 100644
--- a/services/web/app/src/Features/Project/ProjectController.mjs
+++ b/services/web/app/src/Features/Project/ProjectController.mjs
@@ -515,7 +515,6 @@ const _ProjectController = {
       'command-palette',
       'overleaf-library',
       'focus-mode',
-      'editor-upgrade-button-relocation',
       'markdown-visual',
       'ai-disabled-collaborators',
       'group-link-sharing',
diff --git a/services/web/frontend/js/features/ide-react/components/toolbar/toolbar.tsx b/services/web/frontend/js/features/ide-react/components/toolbar/toolbar.tsx
index ccdf791918..5314b3b9d3 100644
--- a/services/web/frontend/js/features/ide-react/components/toolbar/toolbar.tsx
+++ b/services/web/frontend/js/features/ide-react/components/toolbar/toolbar.tsx
@@ -31,9 +31,6 @@ export const Toolbar = () => {
   const { cobranding, isRestrictedTokenMember } = useEditorContext()
   const { permissionsLevel } = useIdeReactContext()
   const showUpgradePrompt = getMeta('ol-showUpgradePrompt')
-  const upgradeButtonRelocation = useFeatureFlag(
-    'editor-upgrade-button-relocation'
-  )
   const improvedFlakyConnections = useFeatureFlag(
     'intermittent-connection-improvements'
   )
@@ -131,7 +128,7 @@ export const Toolbar = () => {
       <div className="ide-redesign-toolbar-menu">
         <ToolbarLogos cobranding={cobranding} />
         <ToolbarMenuBar />
-        {showUpgradePrompt && upgradeButtonRelocation && <UpgradeButton />}
+        {showUpgradePrompt && <UpgradeButton />}
       </div>
       <ToolbarProjectTitle />
       <div className="ide-redesign-toolbar-actions-wrapper">
@@ -147,7 +144,6 @@ export const Toolbar = () => {
             <SubmitProjectButton cobranding={cobranding} />
           )}
           <ShareProjectButton />
-          {showUpgradePrompt && !upgradeButtonRelocation && <UpgradeButton />}
         </div>
       </div>
     </nav>
diff --git a/services/web/test/frontend/features/ide-react/unit/toolbar.spec.tsx b/services/web/test/frontend/features/ide-react/unit/toolbar.spec.tsx
index b12c2511ff..0086db6220 100644
--- a/services/web/test/frontend/features/ide-react/unit/toolbar.spec.tsx
+++ b/services/web/test/frontend/features/ide-react/unit/toolbar.spec.tsx
@@ -251,6 +251,42 @@ describe('<Toolbar />', function () {
     // TODO: Test all the dynamic items
   })
 
+  describe('upgrade button', function () {
+    afterEach(function () {
+      cy.window().then(win => {
+        win.metaAttributesCache.delete('ol-showUpgradePrompt')
+      })
+    })
+
+    const mountWithUpgradePrompt = (showUpgradePrompt: boolean) => {
+      cy.window().then(win => {
+        win.metaAttributesCache.set('ol-showUpgradePrompt', showUpgradePrompt)
+      })
+      cy.mount(
+        <EditorProviders>
+          <Toolbar />
+        </EditorProviders>
+      )
+    }
+
+    it('shows the upgrade button in the menu bar when the upgrade prompt is enabled', function () {
+      mountWithUpgradePrompt(true)
+      // Shown in the left-hand menu bar (the shipped position)...
+      cy.get('.ide-redesign-toolbar-menu').within(() => {
+        cy.findByRole('link', { name: 'Upgrade' }).should('be.visible')
+      })
+      // ...and no longer in the top-right actions area
+      cy.get('.ide-redesign-toolbar-actions').within(() => {
+        cy.findByRole('link', { name: 'Upgrade' }).should('not.exist')
+      })
+    })
+
+    it('does not show the upgrade button when the upgrade prompt is disabled', function () {
+      mountWithUpgradePrompt(false)
+      cy.findByRole('link', { name: 'Upgrade' }).should('not.exist')
+    })
+  })
+
   describe('offline gating', function () {
     const offlineIndicatorText = 'You’re offline'