Skip to content

Commit c9ee001

Browse files
authored
Merge pull request #8302 from woocommerce/task/remove-upsell-card-readers-settings-leftovers
[Moooore IPP]Remove upsell card readers settings leftovers.
2 parents e6219d8 + e222dc6 commit c9ee001

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewController.swift

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ private extension SettingsViewController {
134134
configurePlugins(cell: cell)
135135
case let cell as HostingTableViewCell<PluginDetailsRowView> where row == .woocommerceDetails:
136136
configureWooCommmerceDetails(cell: cell)
137-
case let cell as HostingTableViewCell<FeatureAnnouncementCardView> where row == .upsellCardReadersFeatureAnnouncement:
138-
configureUpsellCardReadersFeatureAnnouncement(cell: cell)
139137
case let cell as BasicTableViewCell where row == .installJetpack:
140138
configureInstallJetpack(cell: cell)
141139
case let cell as BasicTableViewCell where row == .support:
@@ -191,15 +189,6 @@ private extension SettingsViewController {
191189
cell.textLabel?.text = Localization.helpAndSupport
192190
}
193191

194-
func configureUpsellCardReadersFeatureAnnouncement(cell: HostingTableViewCell<FeatureAnnouncementCardView>) {
195-
let view = FeatureAnnouncementCardView(viewModel: viewModel.upsellCardReadersAnnouncementViewModel,
196-
dismiss: { [weak self] in
197-
self?.viewModel.reloadSettings()
198-
})
199-
cell.host(view, parent: self)
200-
cell.selectionStyle = .none
201-
}
202-
203192
func configureInstallJetpack(cell: BasicTableViewCell) {
204193
cell.accessoryType = .disclosureIndicator
205194
cell.selectionStyle = .default
@@ -601,7 +590,6 @@ extension SettingsViewController {
601590
case woocommerceDetails
602591

603592
// Store settings
604-
case upsellCardReadersFeatureAnnouncement
605593
case installJetpack
606594

607595
// Help & Feedback
@@ -628,7 +616,7 @@ extension SettingsViewController {
628616

629617
fileprivate var registerWithNib: Bool {
630618
switch self {
631-
case .upsellCardReadersFeatureAnnouncement, .woocommerceDetails:
619+
case .woocommerceDetails:
632620
return false
633621
default:
634622
return true
@@ -647,8 +635,6 @@ extension SettingsViewController {
647635
return HostingTableViewCell<PluginDetailsRowView>.self
648636
case .support:
649637
return BasicTableViewCell.self
650-
case .upsellCardReadersFeatureAnnouncement:
651-
return HostingTableViewCell<FeatureAnnouncementCardView>.self
652638
case .installJetpack:
653639
return BasicTableViewCell.self
654640
case .logout, .closeAccount:

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ protocol SettingsViewModelActionsHandler {
5050

5151
protocol SettingsViewModelInput: AnyObject {
5252
var presenter: SettingsViewPresenter? { get set }
53-
var upsellCardReadersAnnouncementViewModel: FeatureAnnouncementCardViewModel { get }
5453
}
5554

5655
final class SettingsViewModel: SettingsViewModelOutput, SettingsViewModelActionsHandler, SettingsViewModelInput {
@@ -103,12 +102,6 @@ final class SettingsViewModel: SettingsViewModelOutput, SettingsViewModelActions
103102
private let storageManager: StorageManagerType
104103
private let featureFlagService: FeatureFlagService
105104
private let appleIDCredentialChecker: AppleIDCredentialCheckerProtocol
106-
private let upsellCardReadersCampaign = UpsellCardReadersCampaign(source: .settings)
107-
108-
var upsellCardReadersAnnouncementViewModel: FeatureAnnouncementCardViewModel {
109-
.init(analytics: ServiceLocator.analytics,
110-
configuration: upsellCardReadersCampaign.configuration)
111-
}
112105

113106
/// Reference to the Zendesk shared instance
114107
///

0 commit comments

Comments
 (0)