From bf12f404e8223553f2f041eb293360f50ec17d33 Mon Sep 17 00:00:00 2001
From: Vault Automation <github-team-secure-vault-core@hashicorp.com>
Date: Wed, 28 Jan 2026 12:35:06 -0500
Subject: [PATCH 1/2] [UI] VAULT-40951 Add top nav dropdown (#12027) (#12050)

* Add top nav dropdown

* Add help menu tests

Co-authored-by: Kianna <30884335+kiannaquach@users.noreply.github.com>
---
 ui/lib/core/addon/components/sidebar/frame.hbs       | 12 +++++++++++-
 .../integration/components/sidebar/frame-test.js     |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ui/lib/core/addon/components/sidebar/frame.hbs b/ui/lib/core/addon/components/sidebar/frame.hbs
index 410e67daca..0384c20754 100644
--- a/ui/lib/core/addon/components/sidebar/frame.hbs
+++ b/ui/lib/core/addon/components/sidebar/frame.hbs
@@ -33,7 +33,17 @@
           {{on "click" (fn (mut this.console.isOpen) (not this.console.isOpen))}}
           {{on "click" this.trackReplToggle}}
         />
-        {{! TODO: insert help button }}
+        <Hds::Dropdown @enableCollisionDetection={{true}} data-test-dropdown="help menu" as |dd|>
+          <dd.ToggleIcon @icon="help" @text="help menu" />
+          <dd.Title @text="Help & Support" />
+          <dd.Interactive @href="https://developer.hashicorp.com/vault/docs">Documentation</dd.Interactive>
+          <dd.Interactive @href="https://developer.hashicorp.com/vault/tutorials">Tutorials</dd.Interactive>
+          <dd.Interactive @href="https://www.hashicorp.com/en/blog/products/vault">Blogs</dd.Interactive>
+          <dd.Interactive @href="https://github.com/hashicorp/vault/blob/main/CHANGELOG.md">Changelog</dd.Interactive>
+          <dd.Separator />
+          <dd.Interactive @href="https://support.hashicorp.com/hc/en-us/requests/new">Create support ticket</dd.Interactive>
+        </Hds::Dropdown>
+
         <Sidebar::UserMenu />
       </:utilityActions>
     </Hds::AppHeader>
diff --git a/ui/tests/integration/components/sidebar/frame-test.js b/ui/tests/integration/components/sidebar/frame-test.js
index 4efb58a593..c780e22358 100644
--- a/ui/tests/integration/components/sidebar/frame-test.js
+++ b/ui/tests/integration/components/sidebar/frame-test.js
@@ -86,6 +86,7 @@ module('Integration | Component | sidebar-frame', function (hooks) {
     assert.dom('.panel-open').exists('Console ui panel opens');
 
     assert.dom('[data-test-user-menu]').exists('User menu renders');
+    assert.dom(GENERAL.dropdownToggle('help menu')).exists('Help menu renders');
     await click('[data-test-console-toggle]');
     assert.dom('.panel-open').doesNotExist('Console ui panel closes');
   });

From e3cdfec69472cde90c83b7512cb312a1efd3f21e Mon Sep 17 00:00:00 2001
From: Vault Automation <github-team-secure-vault-core@hashicorp.com>
Date: Wed, 28 Jan 2026 12:37:03 -0500
Subject: [PATCH 2/2] fix: Keep calls to t.Fatal in test goroutine (#12044)
 (#12045)

Co-authored-by: Mike Palmiotto <mpalmi@ibm.com>
---
 vault/core_test.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/vault/core_test.go b/vault/core_test.go
index 36305eba77..3792fef8c7 100644
--- a/vault/core_test.go
+++ b/vault/core_test.go
@@ -950,15 +950,16 @@ func TestCore_ShutdownDone(t *testing.T) {
 	c := TestCoreWithSealAndUINoCleanup(t, &CoreConfig{})
 	testCoreUnsealed(t, c)
 	doneCh := c.ShutdownDone()
+
+	errCh := make(chan error)
 	go func() {
 		time.Sleep(100 * time.Millisecond)
-		err := c.Shutdown()
-		if err != nil {
-			t.Fatal(err)
-		}
+		errCh <- c.Shutdown()
 	}()
 
 	select {
+	case err := <-errCh:
+		t.Fatal(err)
 	case <-doneCh:
 		if !c.Sealed() {
 			t.Fatalf("shutdown done called prematurely!")