Skip to content

[Moooore IPP]Remove upsell card readers settings leftovers. #8302

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 1 commit into from
Dec 5, 2022
Merged

[Moooore IPP]Remove upsell card readers settings leftovers. #8302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 1 addition & 15 deletions WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ private extension SettingsViewController {
configurePlugins(cell: cell)
case let cell as HostingTableViewCell<PluginDetailsRowView> where row == .woocommerceDetails:
configureWooCommmerceDetails(cell: cell)
case let cell as HostingTableViewCell<FeatureAnnouncementCardView> where row == .upsellCardReadersFeatureAnnouncement:
configureUpsellCardReadersFeatureAnnouncement(cell: cell)
case let cell as BasicTableViewCell where row == .installJetpack:
configureInstallJetpack(cell: cell)
case let cell as BasicTableViewCell where row == .support:
Expand Down Expand Up @@ -191,15 +189,6 @@ private extension SettingsViewController {
cell.textLabel?.text = Localization.helpAndSupport
}

func configureUpsellCardReadersFeatureAnnouncement(cell: HostingTableViewCell<FeatureAnnouncementCardView>) {
let view = FeatureAnnouncementCardView(viewModel: viewModel.upsellCardReadersAnnouncementViewModel,
dismiss: { [weak self] in
self?.viewModel.reloadSettings()
})
cell.host(view, parent: self)
cell.selectionStyle = .none
}

func configureInstallJetpack(cell: BasicTableViewCell) {
cell.accessoryType = .disclosureIndicator
cell.selectionStyle = .default
Expand Down Expand Up @@ -601,7 +590,6 @@ extension SettingsViewController {
case woocommerceDetails

// Store settings
case upsellCardReadersFeatureAnnouncement
case installJetpack

// Help & Feedback
Expand All @@ -628,7 +616,7 @@ extension SettingsViewController {

fileprivate var registerWithNib: Bool {
switch self {
case .upsellCardReadersFeatureAnnouncement, .woocommerceDetails:
case .woocommerceDetails:
return false
default:
return true
Expand All @@ -647,8 +635,6 @@ extension SettingsViewController {
return HostingTableViewCell<PluginDetailsRowView>.self
case .support:
return BasicTableViewCell.self
case .upsellCardReadersFeatureAnnouncement:
return HostingTableViewCell<FeatureAnnouncementCardView>.self
case .installJetpack:
return BasicTableViewCell.self
case .logout, .closeAccount:
Expand Down
7 changes: 0 additions & 7 deletions WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ protocol SettingsViewModelActionsHandler {

protocol SettingsViewModelInput: AnyObject {
var presenter: SettingsViewPresenter? { get set }
var upsellCardReadersAnnouncementViewModel: FeatureAnnouncementCardViewModel { get }
}

final class SettingsViewModel: SettingsViewModelOutput, SettingsViewModelActionsHandler, SettingsViewModelInput {
Expand Down Expand Up @@ -103,12 +102,6 @@ final class SettingsViewModel: SettingsViewModelOutput, SettingsViewModelActions
private let storageManager: StorageManagerType
private let featureFlagService: FeatureFlagService
private let appleIDCredentialChecker: AppleIDCredentialCheckerProtocol
private let upsellCardReadersCampaign = UpsellCardReadersCampaign(source: .settings)

var upsellCardReadersAnnouncementViewModel: FeatureAnnouncementCardViewModel {
.init(analytics: ServiceLocator.analytics,
configuration: upsellCardReadersCampaign.configuration)
}

/// Reference to the Zendesk shared instance
///
Expand Down