Choosing message type logic changed to view model protocol

Author: anas-p

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

@@ -609,15 +609,7 @@ private extension ProductFormViewController {
 private extension ProductFormViewController {
     func saveProduct(status: ProductStatus? = nil) {
         let productStatus = status ?? product.status
-        var messageType = viewModel.saveMessageType(for: productStatus)
-
-        // Set messageType to `saveVariation`
-        // This will change Progress view title and message for variation save action.
-        // Fix for the issue: https://github.com/woocommerce/woocommerce-ios/issues/4847
-        if viewModel is ProductVariationFormViewModel {
-            messageType = .saveVariation
-        }
-
+        let messageType = viewModel.saveMessageType(for: productStatus)
         showSavingProgress(messageType)
         saveImagesAndProductRemotely(status: status)
     }

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

@@ -153,17 +153,20 @@ extension ProductFormViewModelProtocol {
 
     /// Returns `.publish` when the product does not exists remotely and it's gonna be published for the first time.
     /// Returns `.publish` when the product is going to be published from a different status (eg: from draft).
-    /// Returns `.saveVariation` when saving a variation
+    /// Returns `.saveVariation` when save variation
     /// Returns `.save` for any other case.
     ///
     func saveMessageType(for productStatus: ProductStatus) -> SaveMessageType {
         switch productStatus {
         case .publish where !productModel.existsRemotely || originalProductModel.status != .publish:
             return .publish
-        case .custom("variation"):
-            return .saveVariation
         default:
-            return .save
+            if self is ProductVariationFormViewModel {
+                return .saveVariation
+            }
+            else {
+                return .save
+            }
         }
     }
 }

WooCommerce/Classes/ViewRelated/Products/View Models/ProductsTabProductViewModel.swift

@@ -48,10 +48,9 @@ struct ProductsTabProductViewModel {
     /// See more: https://github.com/woocommerce/woocommerce-ios/issues/4846
     /// 
     func createNameLabel() -> String {
-        var name = name
         if let variationID = productVariation?.productVariationID {
             // Add product variation ID with name
-            name = "\(Localization.variationID(variationID: "\(variationID)"))\n\(name)"
+            return "\(Localization.variationID(variationID: "\(variationID)"))\n\(name)"
         }
         return name
     }