Skip to content

Commit 39c60dc

Browse files
authored
Merge pull request #19206 from wordpress-mobile/task/jetpack-wrapper-remove-modal-support
[Jetpack] Removal modal support for views that present a Jetpack banner
2 parents dbc0fcd + 1266632 commit 39c60dc

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

WordPress/Classes/ViewRelated/Jetpack/Branding/Banner/JetpackBannerWrapperViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import UIKit
3838
}
3939

4040
private func configureJetpackBanner(_ stackView: UIStackView) {
41-
guard JetpackBrandingVisibility.all.enabled else {
41+
guard JetpackBrandingVisibility.all.enabled, !isModal() else {
4242
return
4343
}
4444

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,11 @@ import Combine
501501
}
502502

503503
private func setupJetpackBanner(stackView: UIStackView) {
504+
/// If being presented in a modal, don't show a Jetpack banner
505+
if let nav = navigationController, nav.isModal() {
506+
return
507+
}
508+
504509
guard JetpackBrandingVisibility.all.enabled else {
505510
return
506511
}

0 commit comments

Comments
 (0)