Skip to content

Jetpack Focus: Correctly configure learn more buttons #19907

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.

Sign up for GitHub

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 4 commits into from
Jan 15, 2023
Merged

Jetpack Focus: Correctly configure learn more buttons #19907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51a8f6e
Update: Remove learn more button from new users and self-hosted overlays
hassaanelgarem Jan 13, 2023
7f34216
Update: Show overlay when tapping the menu card's learn more button
hassaanelgarem Jan 13, 2023
c2c7688
Tests: Fix `JetpackBrandingMenuCardPresenterTests`
hassaanelgarem Jan 13, 2023
8fffe61
Merge branch 'task/19592-self-hosted-phase' into task/19592-remove-le…
hassaanelgarem Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...elated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayGeneralViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,6 @@ struct JetpackFullscreenOverlayGeneralViewModel: JetpackFullscreenOverlayViewMod
return RemoteConfig().phaseThreeBlogPostUrl.value
case .four:
return RemoteConfig().phaseFourBlogPostUrl.value
case .newUsers:
return RemoteConfig().phaseNewUsersBlogPostUrl.value
case .selfHosted:
return RemoteConfig().phaseSelfHostedBlogPostUrl.value
default:
return nil
}
Expand Down
11 changes: 4 additions & 7 deletions WordPress/Classes/ViewRelated/Jetpack/Branding/Menu Card/JetpackBrandingMenuCardCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ class JetpackBrandingMenuCardCell: UITableViewCell {
containerStackView.addArrangedSubviews(stackViewSubviews)
logosAnimationView.currentProgress = 1.0
label.text = config?.description
learnMoreSuperview.isHidden = config?.learnMoreButtonURL == nil
}

private func applyStyles() {
Expand All @@ -202,15 +201,13 @@ class JetpackBrandingMenuCardCell: UITableViewCell {
// MARK: Actions

@objc private func learnMoreButtonTapped() {
guard let config = config,
let urlString = config.learnMoreButtonURL,
let url = URL(string: urlString) else {
guard let viewController else {
return
}

let webViewController = WebViewControllerFactory.controller(url: url, source: Constants.analyticsSource)
let navController = UINavigationController(rootViewController: webViewController)
viewController?.present(navController, animated: true)
JetpackFeaturesRemovalCoordinator.presentOverlayIfNeeded(in: viewController,
source: .card,
blog: viewController.blog)
presenter?.trackLinkTapped()
}
}
Expand Down
12 changes: 4 additions & 8 deletions ...ess/Classes/ViewRelated/Jetpack/Branding/Menu Card/JetpackBrandingMenuCardPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ class JetpackBrandingMenuCardPresenter {
}

let description: String
let learnMoreButtonURL: String?
let type: CardType
}

Expand Down Expand Up @@ -44,19 +43,16 @@ class JetpackBrandingMenuCardPresenter {
switch phase {
case .three:
let description = Strings.phaseThreeDescription
let url = RemoteConfig(store: remoteConfigStore).phaseThreeBlogPostUrl.value
return .init(description: description, learnMoreButtonURL: url, type: .expanded)
return .init(description: description, type: .expanded)
case .four:
let description = Strings.phaseFourTitle
return .init(description: description, learnMoreButtonURL: nil, type: .compact)
return .init(description: description, type: .compact)
case .newUsers:
let description = Strings.newUsersPhaseDescription
let url = RemoteConfig(store: remoteConfigStore).phaseNewUsersBlogPostUrl.value
return .init(description: description, learnMoreButtonURL: url, type: .expanded)
return .init(description: description, type: .expanded)
case .selfHosted:
let description = Strings.selfHostedPhaseDescription
let url = RemoteConfig(store: remoteConfigStore).phaseSelfHostedBlogPostUrl.value
return .init(description: description, learnMoreButtonURL: url, type: .expanded)
return .init(description: description, type: .expanded)
default:
return nil
}
Expand Down
4 changes: 0 additions & 4 deletions WordPress/WordPressTest/JetpackBrandingMenuCardPresenterTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ final class JetpackBrandingMenuCardPresenterTests: CoreDataTestCase {

// Then
XCTAssertEqual(config.description, "Stats, Reader, Notifications and other features will move to the Jetpack mobile app soon.")
XCTAssertEqual(config.learnMoreButtonURL, "example.com")
XCTAssertEqual(config.type, .expanded)
}

Expand All @@ -127,7 +126,6 @@ final class JetpackBrandingMenuCardPresenterTests: CoreDataTestCase {

// Then
XCTAssertEqual(config.description, "Switch to Jetpack")
XCTAssertNil(config.learnMoreButtonURL)
XCTAssertEqual(config.type, .compact)
}

Expand All @@ -146,7 +144,6 @@ final class JetpackBrandingMenuCardPresenterTests: CoreDataTestCase {

// Then
XCTAssertEqual(config.description, "Unlock your site’s full potential. Get Stats, Reader, Notifications and more with Jetpack.")
XCTAssertEqual(config.learnMoreButtonURL, "example.com")
XCTAssertEqual(config.type, .expanded)
}

Expand All @@ -167,7 +164,6 @@ final class JetpackBrandingMenuCardPresenterTests: CoreDataTestCase {

// Then
XCTAssertEqual(config.description, "Unlock your site’s full potential. Get Stats, Reader, Notifications and more with Jetpack.")
XCTAssertEqual(config.learnMoreButtonURL, "example.com")
XCTAssertEqual(config.type, .expanded)
}

Expand Down