From 9c2cddcf985a836fc58ec13d5b1883f7a0691543 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Sat, 11 May 2024 02:46:03 -0400
Subject: [PATCH] Adds state context to Jira button Switches order of icons

---
 .../components/gl-commit-details.ts           | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/webviews/apps/commitDetails/components/gl-commit-details.ts b/src/webviews/apps/commitDetails/components/gl-commit-details.ts
index 70e77764d076b..d84a8865ab7db 100644
--- a/src/webviews/apps/commitDetails/components/gl-commit-details.ts
+++ b/src/webviews/apps/commitDetails/components/gl-commit-details.ts
@@ -177,14 +177,14 @@ export class GlCommitDetails extends GlDetailsBase {
 				)}"
 				>Connect to Jira Cloud</a
 			>
-			&mdash; ${hasAccount ? '' : 'sign up and '}get access to automatic rich Jira autolinks.`;
+			&mdash; ${hasAccount ? '' : 'sign up and '}get access to automatic rich Jira autolinks`;
 
 		if (hasAccount && hasConnectedJira) {
 			message = html`<i class="codicon codicon-check" style="vertical-align: text-bottom"></i> Jira connected
-				&mdash; automatic rich Jira autolinks are enabled.`;
+				&mdash; automatic rich Jira autolinks are enabled`;
 		}
 
-		return html`<gl-popover class="inline-popover" placement="bottom">
+		return html`<gl-popover hoist class="inline-popover">
 			<span class="tooltip-hint" slot="anchor"
 				>Jira issues <code-icon icon="${hasConnectedJira ? 'check' : 'gl-unplug'}"></code-icon
 			></span>
@@ -236,6 +236,7 @@ export class GlCommitDetails extends GlDetailsBase {
 			}
 		}
 
+		const { hasAccount, hasConnectedJira } = this.state ?? {};
 		const jiraIntegrationLink = `command:gitlens.plus.cloudIntegrations.manage?${encodeURIComponent(
 			JSON.stringify({
 				source: 'commitDetails',
@@ -258,17 +259,17 @@ export class GlCommitDetails extends GlDetailsBase {
 						: '…'}</span
 				>
 				<action-nav slot="actions">
+					<action-item
+						label="${hasAccount && hasConnectedJira ? 'Manage Jira' : 'Connect to Jira Cloud'}"
+						icon="gl-provider-jira"
+						href="${jiraIntegrationLink}"
+					></action-item>
 					<action-item
 						data-action="autolinks-settings"
 						label="Autolinks Settings"
-						icon="info"
+						icon="gear"
 						href="command:gitlens.showSettingsPage!autolinks"
 					></action-item>
-					<action-item
-						label="Manage Jira"
-						icon="gl-provider-jira"
-						href="${jiraIntegrationLink}"
-					></action-item>
 				</action-nav>
 				${when(
 					this.state == null,