Skip to content

[v12] Team plan CTAs (#25073)#25572

Merged
mcbattirola merged 3 commits intobranch/v12from
mcbattirola/v12/team-features-CTAs
May 3, 2023
Merged

[v12] Team plan CTAs (#25073)#25572
mcbattirola merged 3 commits intobranch/v12from
mcbattirola/v12/team-features-CTAs

Conversation

@mcbattirola
Copy link
Copy Markdown
Contributor

@mcbattirola mcbattirola commented May 3, 2023

Backports #25073 to v12

Note that the code is different in SessionJoinBtn.tsx since the original PR used some theme stuff that is not present in v12, so some changes were necessary.

* (wip) add unlock feature button to support page

* Fix typo

* (wip) add locked feature join session

* Improve session join style

* Add session join lock button

* Remove hover on locked join menu

* Update copy

* Only show `join as...` when appropriate

* (wip)

* Make ButtonLockedFeature theme sensitive

* Remove debug stuff

* Adjust feature button height

* Fix session join button on locked

* Remove unused import

* typo

* Add link to cta button

* Remove teams flag

* Add cta service

* Update snapshots

* Lock button style

* Add cta to context

* Rename cta to ctaService

* Stories and tests

* Add comments clarifying that ctas are not used currently

* add showActiveSessionsCTA to useSessions

* Licenses

* Lint license

* Remove commented out code

* Add missing types

* Replace cta service for an object with cta on context

* Fix menu hack

* small refactor in styled stuff

* Update SessionJoinBtn to use master code

* Snapshot update

* Minor stuff
@mcbattirola mcbattirola marked this pull request as ready for review May 3, 2023 17:18
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from michellescripts May 3, 2023 17:26
@mcbattirola mcbattirola added this pull request to the merge queue May 3, 2023
Merged via the queue into branch/v12 with commit 682366c May 3, 2023
@mcbattirola mcbattirola deleted the mcbattirola/v12/team-features-CTAs branch May 3, 2023 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants