Skip to content

Commit 6b6f87c

Browse files
committed
Trigger background image notice after leaving product form
1 parent 400817f commit 6b6f87c

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,11 @@ final class ProductFormViewController<ViewModel: ProductFormViewModelProtocol>:
196196
view.endEditing(true)
197197

198198
if isBeingDismissedInAnyWay {
199-
productImageUploader.startEmittingErrors(key: .init(siteID: viewModel.productModel.siteID,
200-
productOrVariationID: productOrVariationID,
201-
isLocalID: !viewModel.productModel.existsRemotely))
199+
let key = ProductImageUploaderKey(siteID: viewModel.productModel.siteID,
200+
productOrVariationID: productOrVariationID,
201+
isLocalID: !viewModel.productModel.existsRemotely)
202+
productImageUploader.startEmittingErrors(key: key)
203+
productImageUploader.sendBackgroundUploadNoticeIfNeeded(key: key, using: ServiceLocator.noticePresenter)
202204
}
203205
}
204206

WooCommerce/Classes/ViewRelated/Products/ProductsSplitViewCoordinator.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,12 @@ extension ProductsSplitViewCoordinator: UINavigationControllerDelegate {
231231
func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
232232
if didNavigateFromTheLastSecondaryViewControllerToProductListInCollapsedMode(navigationController, didShow: viewController) {
233233
if let contentType = contentTypes.last, case let .productForm(product) = contentType, let product {
234-
ServiceLocator.productImageUploader.startEmittingErrors(
235-
key: .init(siteID: product.siteID,
236-
productOrVariationID: .product(id: product.productID),
237-
isLocalID: false))
234+
let uploader = ServiceLocator.productImageUploader
235+
let key = ProductImageUploaderKey(siteID: product.siteID,
236+
productOrVariationID: .product(id: product.productID),
237+
isLocalID: false)
238+
uploader.startEmittingErrors(key: key)
239+
uploader.sendBackgroundUploadNoticeIfNeeded(key: key, using: ServiceLocator.noticePresenter)
238240
}
239241
contentTypes = []
240242
secondaryNavigationController.viewControllers = []

0 commit comments

Comments
 (0)