-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Adds trial reactivation UX and command #3147
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
bad9e41 to
a75d68c
Compare
Member
|
Suggested edit: diff --git a/package.json b/package.json
index 47f141e31..33ef98328 100644
--- a/package.json
+++ b/package.json
@@ -16181,7 +16181,7 @@
},
{
"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)\nYour Pro trial provides access to [✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) for seamlessly switching between branches without any hassle.",
+ "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.",
"when": "gitlens:plus:required && gitlens:plus:state == 5"
}
],
diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts
index 4fe8861dc..dceaaa1af 100644
--- a/src/webviews/apps/plus/account/components/account-content.ts
+++ b/src/webviews/apps/plus/account/components/account-content.ts
@@ -314,7 +314,7 @@ export class AccountContent extends LitElement {
<p>
Your Pro trial provides access to the entire
<a href="https://www.gitkraken.com/suite">GitKraken suite</a>, unleashing powerful Git
- visualization & productivity capabilities everywhere you work: IDE, desktop, browser and
+ visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and
terminal.
</p>
`;
diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts
index 0c24956aa..6925cd7c8 100644
--- a/src/webviews/apps/plus/focus/components/focus-app.ts
+++ b/src/webviews/apps/plus/focus/components/focus-app.ts
@@ -326,10 +326,10 @@ export class GlFocusApp extends LitElement {
anything requires your attention while keeping you focused.
</p>
<p slot="feature-link">
- Your Pro trial provides access to
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#focus-view-%e2%9c%a8"
- >✨ Focus View</a
- >, for effortlessly viewing all your GitHub pull requests and issues in a unified,
+ >Focus View</a
+ >
+ — effortlessly view all of your GitHub pull requests and issues in a unified,
actionable view.
</p></gk-feature-gate
>
diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx
index 9d7291a0c..bc7fdd521 100644
--- a/src/webviews/apps/plus/graph/GraphWrapper.tsx
+++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx
@@ -1370,11 +1370,10 @@ export function GraphWrapper({
change.
</p>
<p slot="feature-link">
- Your Pro trial provides access to{' '}
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#commit-graph-%e2%9c%a8">
- ✨ The Commit Graph
+ Commit Graph
</a>
- , to easily visualize your repository and keep track of work in progress all in one view.
+ — easily visualize your repository and keep track of work in progress all in one view.
</p>
</FeatureGate>
{graphConfig?.minimap && (
diff --git a/src/webviews/apps/plus/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html
index 540765495..c80e69cd5 100644
--- a/src/webviews/apps/plus/timeline/timeline.html
+++ b/src/webviews/apps/plus/timeline/timeline.html
@@ -27,10 +27,10 @@
them.
</p>
<p slot="feature-link">
- Your Pro trial provides access to
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#visual-file-history-%e2%9c%a8"
- >✨ Visual File History</a
- >, for identifying when the most impactful changes were made to a file and by whom.
+ >Visual File History</a
+ >
+ — quickly identify when the most impactful changes were made to a file and by whom.
</p></gk-feature-gate
>
<div class="container">
|
1 similar comment
Member
|
Suggested edit: diff --git a/package.json b/package.json
index 47f141e31..33ef98328 100644
--- a/package.json
+++ b/package.json
@@ -16181,7 +16181,7 @@
},
{
"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)\nYour Pro trial provides access to [✨ Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view%e2%9c%a8) for seamlessly switching between branches without any hassle.",
+ "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.",
"when": "gitlens:plus:required && gitlens:plus:state == 5"
}
],
diff --git a/src/webviews/apps/plus/account/components/account-content.ts b/src/webviews/apps/plus/account/components/account-content.ts
index 4fe8861dc..dceaaa1af 100644
--- a/src/webviews/apps/plus/account/components/account-content.ts
+++ b/src/webviews/apps/plus/account/components/account-content.ts
@@ -314,7 +314,7 @@ export class AccountContent extends LitElement {
<p>
Your Pro trial provides access to the entire
<a href="https://www.gitkraken.com/suite">GitKraken suite</a>, unleashing powerful Git
- visualization & productivity capabilities everywhere you work: IDE, desktop, browser and
+ visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and
terminal.
</p>
`;
diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts
index 0c24956aa..6925cd7c8 100644
--- a/src/webviews/apps/plus/focus/components/focus-app.ts
+++ b/src/webviews/apps/plus/focus/components/focus-app.ts
@@ -326,10 +326,10 @@ export class GlFocusApp extends LitElement {
anything requires your attention while keeping you focused.
</p>
<p slot="feature-link">
- Your Pro trial provides access to
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#focus-view-%e2%9c%a8"
- >✨ Focus View</a
- >, for effortlessly viewing all your GitHub pull requests and issues in a unified,
+ >Focus View</a
+ >
+ — effortlessly view all of your GitHub pull requests and issues in a unified,
actionable view.
</p></gk-feature-gate
>
diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx
index 9d7291a0c..bc7fdd521 100644
--- a/src/webviews/apps/plus/graph/GraphWrapper.tsx
+++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx
@@ -1370,11 +1370,10 @@ export function GraphWrapper({
change.
</p>
<p slot="feature-link">
- Your Pro trial provides access to{' '}
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#commit-graph-%e2%9c%a8">
- ✨ The Commit Graph
+ Commit Graph
</a>
- , to easily visualize your repository and keep track of work in progress all in one view.
+ — easily visualize your repository and keep track of work in progress all in one view.
</p>
</FeatureGate>
{graphConfig?.minimap && (
diff --git a/src/webviews/apps/plus/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html
index 540765495..c80e69cd5 100644
--- a/src/webviews/apps/plus/timeline/timeline.html
+++ b/src/webviews/apps/plus/timeline/timeline.html
@@ -27,10 +27,10 @@
them.
</p>
<p slot="feature-link">
- Your Pro trial provides access to
<a href="https://help.gitkraken.com/gitlens/gitlens-features/#visual-file-history-%e2%9c%a8"
- >✨ Visual File History</a
- >, for identifying when the most impactful changes were made to a file and by whom.
+ >Visual File History</a
+ >
+ — quickly identify when the most impactful changes were made to a file and by whom.
</p></gk-feature-gate
>
<div class="container">
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.

Adds trial reactivation command and UX when the user is considered eligible.
Updates plus feature gates and account view for this state.