From 07c5de6e8e5b80610e7092f3b38ec118607789e6 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 6 Jul 2022 22:34:58 -0700
Subject: [PATCH] Use extension's app preference tab name when available
 (#5798)

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 ...gation-to-extension-specific-preferences.test.tsx.snap | 8 ++++----
 .../+preferences/extension-preference-model.injectable.ts | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index ea8853de40..143b335c30 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -173,7 +173,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
               id="extensions"
             >
               <h2>
-                registered-tab-page-id
+                Metrics tab
                  
                 preferences
               </h2>
@@ -473,7 +473,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
               id="extensions"
             >
               <h2>
-                registered-tab-page-id
+                Metrics tab
                  
                 preferences
               </h2>
@@ -773,7 +773,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
               id="extensions"
             >
               <h2>
-                duplicated-tab-page-id
+                Metrics tab
                  
                 preferences
               </h2>
@@ -3264,7 +3264,7 @@ exports[`preferences - navigation to extension specific preferences when navigat
               id="extensions"
             >
               <h2>
-                duplicated-tab-page-id
+                Metrics tab
                  
                 preferences
               </h2>
diff --git a/src/renderer/components/+preferences/extension-preference-model.injectable.ts b/src/renderer/components/+preferences/extension-preference-model.injectable.ts
index 5e4fd06de0..c46842eb8a 100644
--- a/src/renderer/components/+preferences/extension-preference-model.injectable.ts
+++ b/src/renderer/components/+preferences/extension-preference-model.injectable.ts
@@ -16,13 +16,14 @@ const extensionPreferencesModelInjectable = getInjectable({
     const route = di.inject(extensionPreferencesRouteInjectable);
     const pathParameters = di.inject(routePathParametersInjectable, route);
     const extensions = di.inject(rendererExtensionsInjectable);
-      
+
     return computed(() => {
       const { extensionId, tabId } = pathParameters.get();
       const targetExtension = extensions.get().find((extension) => extension.sanitizedExtensionId === extensionId);
-      
+      const targetAppTab = targetExtension?.appPreferenceTabs.find(tab => tab.id === tabId);
+
       return {
-        extensionName: targetExtension?.manifest.name,
+        extensionName: targetAppTab?.title ?? targetExtension?.manifest.name,
         preferenceItems: getExtensionPreferenceItems(targetExtension, tabId),
       };
     });