Updates section ordering and feature descriptions in gates

package.json

@@ -16151,8 +16151,7 @@
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Worktrees help you multitask by minimizing the context switching between branches, allowing you to easily work on different branches of a repository simultaneously.\n\nYou can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace.",
-				"when": "!gitlens:plus:required || gitlens:plus:state == 0"
+				"contents": "[Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — minimizes context switching by allowing you to work on multiple branches simultaneously."
 			},
 			{
 				"view": "gitlens.views.worktrees",
@@ -16161,27 +16160,27 @@
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "You must verify your email before you can continue.\n\n[Resend verification email](command:gitlens.plus.resendVerification)\n\n[Refresh verification status](command:gitlens.plus.validate)",
+				"contents": "[Resend verification email](command:gitlens.plus.resendVerification)\n\n[Refresh verification status](command:gitlens.plus.validate)\n\nYou must verify your email before you can continue.",
 				"when": "gitlens:plus:state == -1"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign up](command:gitlens.plus.signUp) to start a full 7-day GitLens Pro trial.\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.",
+				"contents": "[Preview Pro](command:gitlens.plus.startPreviewTrial)\n\nPreview Pro for 3 days, or [sign up](command:gitlens.plus.signUp) to start a full 7-day GitLens Pro trial.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 0"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.login).\n\n[Start Pro Trial](command:gitlens.plus.signUp)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.",
+				"contents": "[Try Pro](command:gitlens.plus.signUp)\n\nYour 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or [sign in](command:gitlens.plus.login).",
 				"when": "gitlens:plus:required && gitlens:plus:state == 2"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos.\n\n[Get GitLens Pro](command:gitlens.plus.purchase)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.",
+				"contents": "[Get GitLens Pro](command:gitlens.plus.purchase)\n\nYour GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted repos.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 4"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!\n\n[Try Pro](command:gitlens.plus.reactivateProTrial)\n[✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) — seamlessly work on multiple branches simultaneously.",
+				"contents": "[Try Pro](command:gitlens.plus.reactivateProTrial)\n\nYou're eligible to reactivate your GitLens Pro trial and experience all the new Pro features — free for another 7 days!",
 				"when": "gitlens:plus:required && gitlens:plus:state == 5"
 			}
 		],

src/webviews/apps/plus/focus/components/focus-app.ts

@@ -321,14 +321,6 @@ export class GlFocusApp extends LitElement {
 						id="subscription-gate"
 						class="scrollable"
 						><p slot="feature">
-							<a href="https://help.gitkraken.com/gitlens/gitlens-features/#focus-view-%e2%9c%a8"
-								>Focus View</a
-							>
-							&mdash; brings all of your GitHub pull requests and issues into a unified actionable view to
-							help to you more easily juggle work in progress, pending work, reviews, and more. Quickly
-							see if anything requires your attention while keeping you focused.
-						</p>
-						<p slot="feature-short">
 							<a href="https://help.gitkraken.com/gitlens/gitlens-features/#focus-view-%e2%9c%a8"
 								>Focus View</a
 							>

src/webviews/apps/plus/graph/GraphWrapper.tsx

@@ -1365,19 +1365,10 @@ export function GraphWrapper({
 					<a href="https://help.gitkraken.com/gitlens/gitlens-features/#commit-graph-%e2%9c%a8">
 						Commit Graph
 					</a>{' '}
-					&mdash; helps you easily visualize your repository and keep track of all work in progress.
-					<br />
-					<br />
-					Use the rich commit search to find exactly what you're looking for. It's powerful filters allow you
-					to search by a specific commit, message, author, a changed file or files, or even a specific code
+					&mdash; easily visualize your repository and keep track of all work in progress. Use the rich commit
+					search to find a specific commit, message, author, a changed file or files, or even a specific code
 					change.
 				</p>
-				<p slot="feature-short">
-					<a href="https://help.gitkraken.com/gitlens/gitlens-features/#commit-graph-%e2%9c%a8">
-						Commit Graph
-					</a>{' '}
-					&mdash; easily visualize your repository and keep track of work in progress all in one view.
-				</p>
 			</FeatureGate>
 			{graphConfig?.minimap && (
 				<GraphMinimap

src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts

@@ -63,19 +63,19 @@ export class FeatureGatePlusState extends LitElement {
 		switch (this.state) {
 			case SubscriptionState.VerificationRequired:
 				return html`
-					<p>You must verify your email before you can continue.</p>
 					<gl-button appearance="${appearance}" href="command:gitlens.plus.resendVerification"
 						>Resend verification email</gl-button
 					>
 					<gl-button appearance="${appearance}" href="command:gitlens.plus.validate"
 						>Refresh verification status</gl-button
 					>
+					<p>You must verify your email before you can continue.</p>
 				`;
 
 			case SubscriptionState.Free:
 				return html`
 					<gl-button appearance="${appearance}" href="command:gitlens.plus.startPreviewTrial"
-						>Preview Now</gl-button
+						>Preview Pro</gl-button
 					>
 					<p>
 						Preview Pro for 3 days, or
@@ -86,15 +86,18 @@ export class FeatureGatePlusState extends LitElement {
 
 			case SubscriptionState.FreePreviewTrialExpired:
 				return html`
+					<gl-button appearance="${appearance}" href="command:gitlens.plus.signUp">Try Pro</gl-button>
 					<p>
 						Your 3-day preview has ended. Start a free GitLens Pro trial to get an additional 7 days, or
 						<a href="command:gitlens.plus.login">sign in</a>.
 					</p>
-					<gl-button appearance="${appearance}" href="command:gitlens.plus.signUp">Start Pro Trial</gl-button>
 				`;
 
 			case SubscriptionState.FreePlusTrialExpired:
 				return html`
+					<gl-button appearance="${appearance}" href="command:gitlens.plus.purchase"
+						>Get GitLens Pro</gl-button
+					>
 					<p>
 						Your GitLens Pro trial has ended. Please upgrade to continue to use this on privately hosted
 						repos.
@@ -113,20 +116,17 @@ export class FeatureGatePlusState extends LitElement {
 								Special: <b>50% off first seat of Pro</b> — only $4/month!<br />
 							</p>`,
 					)}
-					<gl-button appearance="${appearance}" href="command:gitlens.plus.purchase"
-						>Get GitLens Pro</gl-button
-					>
 				`;
 
 			case SubscriptionState.FreePlusTrialReactivationEligible:
 				return html`
+					<gl-button appearance="${appearance}" href="command:gitlens.plus.reactivateProTrial"
+						>Try Pro</gl-button
+					>
 					<p>
 						You're eligible to reactivate your GitLens Pro trial and experience all the new Pro features —
 						free for another 7 days!
 					</p>
-					<gl-button appearance="${appearance}" href="command:gitlens.plus.reactivateProTrial"
-						>Try Pro</gl-button
-					>
 				`;
 		}
 

src/webviews/apps/plus/timeline/timeline.html

@@ -26,14 +26,8 @@
 				<a href="https://help.gitkraken.com/gitlens/gitlens-features/#visual-file-history-%e2%9c%a8"
 					>Visual File History</a
 				>
-				&mdash; visualize the evolution of a file, including when changes were made, how large they were, and
-				who made them.
-			</p>
-			<p slot="feature-short">
-				<a href="https://help.gitkraken.com/gitlens/gitlens-features/#visual-file-history-%e2%9c%a8"
-					>Visual File History</a
-				>
-				&mdash; quickly identify when the most impactful changes were made to a file and by whom.
+				&mdash; visualize the evolution of a file and quickly identify when the most impactful changes were made
+				and by whom.
 			</p></gk-feature-gate
 		>
 		<div class="container">

src/webviews/apps/shared/components/feature-gate.ts

@@ -1,6 +1,7 @@
-import { css, html, LitElement, nothing } from 'lit';
+import { css, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { isSubscriptionStatePaidOrTrial, SubscriptionState } from '../../../../plus/gk/account/subscription';
+import type { SubscriptionState } from '../../../../plus/gk/account/subscription';
+import { isSubscriptionStatePaidOrTrial } from '../../../../plus/gk/account/subscription';
 import '../../plus/shared/components/feature-gate-plus-state';
 
 @customElement('gk-feature-gate')
@@ -103,18 +104,9 @@ export class FeatureGate extends LitElement {
 		this.hidden = false;
 		return html`
 			<section>
-				<slot>
-					<slot name="feature" hidden=${this.state === SubscriptionState.Free ? nothing : ''}></slot>
-				</slot>
+				<slot></slot>
+				<slot name="feature"></slot>
 				<gk-feature-gate-plus-state appearance=${appearance} .state=${this.state}></gk-feature-gate-plus-state>
-				<slot
-					name="feature-short"
-					hidden=${this.state === SubscriptionState.FreePreviewTrialExpired ||
-					this.state === SubscriptionState.FreePlusTrialExpired ||
-					this.state === SubscriptionState.FreePlusTrialReactivationEligible
-						? nothing
-						: ''}
-				></slot>
 			</section>
 		`;
 	}