Merge pull request #4970 from woocommerce/issue/4599-new-package-details-validation

itsmeichigo · web-flow · commit c6f4f07ba4d7 · 2021-09-15T13:50:55.000+07:00
Shipping Labels: New package details validation
diff --git a/WooCommerce/Classes/Extensions/NumberFormatter+Localized.swift b/WooCommerce/Classes/Extensions/NumberFormatter+Localized.swift
@@ -0,0 +1,26 @@
+import Foundation
+
+extension NumberFormatter {
+    /// Get a double from a string value, with locale taken into consideration.
+    ///
+    static func double(from string: String, locale: Locale = .current) -> Double? {
+        let formatter = NumberFormatter()
+        formatter.locale = locale
+        let number = formatter.number(from: string)
+        return number?.doubleValue
+    }
+
+    /// Get a string from a number with locale taken into consideration.
+    ///
+    static func localizedString(from number: NSNumber, locale: Locale = .current) -> String? {
+        let formatter = NumberFormatter()
+        formatter.locale = locale
+        formatter.usesGroupingSeparator = true
+        formatter.groupingSize = 3
+        formatter.formatterBehavior = .behavior10_4
+        formatter.numberStyle = .decimal
+        formatter.generatesDecimalNumbers = true
+        formatter.roundingMode = .halfUp
+        return formatter.string(from: number)
+    }
+}
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackageItem.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackageItem.swift
@@ -23,7 +23,7 @@ struct ShippingLabelPackageItem: View {
 
     var body: some View {
         CollapsibleView(isCollapsible: isCollapsible, isCollapsed: $isCollapsed, safeAreaInsets: safeAreaInsets) {
-            ShippingLabelPackageNumberRow(packageNumber: packageNumber, numberOfItems: viewModel.itemsRows.count)
+            ShippingLabelPackageNumberRow(packageNumber: packageNumber, numberOfItems: viewModel.itemsRows.count, isValid: viewModel.isValidTotalWeight)
         } content: {
             ListHeaderView(text: Localization.itemsToFulfillHeader, alignment: .left)
                 .padding(.horizontal, insets: safeAreaInsets)
@@ -66,8 +66,13 @@ struct ShippingLabelPackageItem: View {
             }
             .background(Color(.systemBackground))
 
-            ListHeaderView(text: Localization.footer, alignment: .left)
-                .padding(.horizontal, insets: safeAreaInsets)
+            if viewModel.isValidTotalWeight {
+                ListHeaderView(text: Localization.footer, alignment: .left)
+                    .padding(.horizontal, insets: safeAreaInsets)
+            } else {
+                ValidationErrorRow(errorMessage: Localization.invalidWeight)
+                    .padding(.horizontal, insets: safeAreaInsets)
+            }
         }
     }
 }
@@ -82,6 +87,7 @@ private extension ShippingLabelPackageItem {
                                                           comment: "Title of the row for adding the package weight in Shipping Label Package Detail screen")
         static let footer = NSLocalizedString("Sum of products and package weight",
                                               comment: "Title of the footer in Shipping Label Package Detail screen")
+        static let invalidWeight = NSLocalizedString("Invalid weight", comment: "Error message when total weight is invalid in Package Detail screen")
     }
 
     enum Constants {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackageItemViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackageItemViewModel.swift
@@ -24,6 +24,10 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
     ///
     @Published private(set) var itemsRows: [ItemToFulfillRow] = []
 
+    /// Whether totalWeight is valid
+    ///
+    @Published private(set) var isValidTotalWeight: Bool = false
+
     /// The title of the selected package, if any.
     ///
     var selectedPackageName: String {
@@ -36,6 +40,17 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
         }
     }
 
+    /// Attributes of the package if validated.
+    ///
+    var validatedPackageAttributes: ShippingLabelPackageAttributes? {
+        guard validateTotalWeight(totalWeight) else {
+            return nil
+        }
+        return ShippingLabelPackageAttributes(packageID: selectedPackageID,
+                                              totalWeight: totalWeight,
+                                              productIDs: orderItems.map { $0.productOrVariationID })
+    }
+
     private let order: Order
     private let orderItems: [OrderItem]
     private let currency: String
@@ -92,19 +107,23 @@ final class ShippingLabelPackageItemViewModel: ObservableObject {
         let calculatedWeight = calculateTotalWeight(products: products,
                                                     productVariations: productVariations,
                                                     customPackage: packageListViewModel.selectedCustomPackage)
-
+        let localizedCalculatedWeight = NumberFormatter.localizedString(from: NSNumber(value: calculatedWeight)) ?? String(calculatedWeight)
         // Set total weight to initialTotalWeight if it's different from the calculated weight.
         // Otherwise use the calculated weight.
         if initialTotalWeight.isNotEmpty, initialTotalWeight != String(calculatedWeight) {
             isPackageWeightEdited = true
             totalWeight = initialTotalWeight
         } else {
-            totalWeight = String(calculatedWeight)
+            totalWeight = localizedCalculatedWeight
         }
 
         $totalWeight
-            .map { $0 != String(calculatedWeight) }
+            .map { $0 != localizedCalculatedWeight }
             .assign(to: &$isPackageWeightEdited)
+
+        $totalWeight
+            .map { [weak self] in self?.validateTotalWeight($0) ?? false }
+            .assign(to: &$isValidTotalWeight)
     }
 }
 
@@ -199,6 +218,16 @@ private extension ShippingLabelPackageItemViewModel {
         }
         return tempTotalWeight
     }
+
+    /// Validate that total weight is a valid floating point number.
+    ///
+    private func validateTotalWeight(_ totalWeight: String) -> Bool {
+        guard totalWeight.isNotEmpty,
+              let value = NumberFormatter.double(from: totalWeight) else {
+            return false
+        }
+        return value > 0
+    }
 }
 
 private extension ShippingLabelPackageItemViewModel {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackagesForm.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackagesForm.swift
@@ -27,11 +27,12 @@ struct ShippingLabelPackagesForm: View {
         .navigationBarItems(trailing: Button(action: {
             ServiceLocator.analytics.track(.shippingLabelPurchaseFlow,
                                            withProperties: ["state": "packages_selected"])
-            // TODO-4599: Update selection
+            viewModel.confirmPackageSelection()
             presentation.wrappedValue.dismiss()
         }, label: {
             Text(Localization.doneButton)
-        }))
+        })
+        .disabled(!viewModel.doneButtonEnabled))
     }
 }
 
@@ -51,7 +52,9 @@ struct ShippingLabelPackagesForm_Previews: PreviewProvider {
     static var previews: some View {
         let viewModel = ShippingLabelPackagesFormViewModel(order: ShippingLabelPackagesFormViewModel.sampleOrder(),
                                                            packagesResponse: ShippingLabelPackagesFormViewModel.samplePackageDetails(),
-                                                           selectedPackages: []) { _ in }
+                                                           selectedPackages: [],
+                                                           onSelectionCompletion: { _ in },
+                                                           onPackageSyncCompletion: { _ in })
 
         ShippingLabelPackagesForm(viewModel: viewModel)
         .environment(\.colorScheme, .light)
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackagesFormViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackagesFormViewModel.swift
@@ -17,14 +17,35 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
     ///
     @Published private(set) var itemViewModels: [ShippingLabelPackageItemViewModel] = []
 
+    /// Whether Done button on Package Details screen should be enabled.
+    ///
+    @Published private(set) var doneButtonEnabled: Bool = false
+
     private let order: Order
     private let stores: StoresManager
     private let storageManager: StorageManagerType
     private var resultsControllers: ShippingLabelPackageDetailsResultsControllers?
+    private let onSelectionCompletion: (_ selectedPackages: [ShippingLabelPackageAttributes]) -> Void
     private let onPackageSyncCompletion: (_ packagesResponse: ShippingLabelPackagesResponse?) -> Void
 
     private var cancellables: Set<AnyCancellable> = []
 
+    /// Validation states of all items.
+    ///
+    private var packagesValidation: [String: Bool] = [:] {
+        didSet {
+            configureDoneButton()
+        }
+    }
+
+    /// List of packages that are validated.
+    ///
+    private var validatedPackages: [ShippingLabelPackageAttributes] {
+        itemViewModels.compactMap {
+            $0.validatedPackageAttributes
+        }
+    }
+
     /// List of selected package with basic info.
     ///
     @Published private var selectedPackages: [ShippingLabelPackageAttributes] = []
@@ -40,6 +61,7 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
     init(order: Order,
          packagesResponse: ShippingLabelPackagesResponse?,
          selectedPackages: [ShippingLabelPackageAttributes],
+         onSelectionCompletion: @escaping (_ selectedPackages: [ShippingLabelPackageAttributes]) -> Void,
          onPackageSyncCompletion: @escaping (_ packagesResponse: ShippingLabelPackagesResponse?) -> Void,
          formatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings),
          stores: StoresManager = ServiceLocator.stores,
@@ -49,6 +71,7 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
         self.stores = stores
         self.storageManager = storageManager
         self.selectedPackages = selectedPackages
+        self.onSelectionCompletion = onSelectionCompletion
         self.onPackageSyncCompletion = onPackageSyncCompletion
 
         configureResultsControllers()
@@ -58,9 +81,17 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
         configureItemViewModels(order: order, packageResponse: packagesResponse)
     }
 
+    func confirmPackageSelection() {
+        onSelectionCompletion(validatedPackages)
+    }
+}
+
+// MARK: - Helper methods
+//
+private extension ShippingLabelPackagesFormViewModel {
     /// If no initial packages was input, set up default package from last selected package ID and all order items.
     ///
-    private func configureDefaultPackage() {
+    func configureDefaultPackage() {
         guard selectedPackages.isEmpty,
               let selectedPackageID = resultsControllers?.accountSettings?.lastSelectedPackageID else {
             return
@@ -72,7 +103,7 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
 
     /// Set up item view models on change of products and product variations.
     ///
-    private func configureItemViewModels(order: Order, packageResponse: ShippingLabelPackagesResponse?) {
+    func configureItemViewModels(order: Order, packageResponse: ShippingLabelPackagesResponse?) {
         $selectedPackages.combineLatest($products, $productVariations)
             .map { selectedPackages, products, variations -> [ShippingLabelPackageItemViewModel] in
                 return selectedPackages.map { details in
@@ -94,13 +125,14 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
             }
             .sink { [weak self] viewModels in
                 self?.itemViewModels = viewModels
+                self?.observeItemViewModels()
             }
             .store(in: &cancellables)
     }
 
     /// Update selected packages when user switch any package.
     ///
-    private func switchPackage(currentID: String, newPackage: ShippingLabelPackageAttributes) {
+    func switchPackage(currentID: String, newPackage: ShippingLabelPackageAttributes) {
         selectedPackages = selectedPackages.map { package in
             if package.packageID == currentID {
                 return newPackage
@@ -110,7 +142,25 @@ final class ShippingLabelPackagesFormViewModel: ObservableObject {
         }
     }
 
-    private func configureResultsControllers() {
+    /// Observe validation state of each package and save it by package ID.
+    ///
+    func observeItemViewModels() {
+        itemViewModels.forEach { item in
+            item.$isValidTotalWeight
+                .sink { [weak self] isValid in
+                    self?.packagesValidation[item.selectedPackageID] = isValid
+                }
+                .store(in: &cancellables)
+        }
+    }
+
+    /// Disable Done button if any of the package validation fails.
+    ///
+    func configureDoneButton() {
+        doneButtonEnabled = packagesValidation.first(where: { $0.value == false }) == nil
+    }
+
+    func configureResultsControllers() {
         resultsControllers = ShippingLabelPackageDetailsResultsControllers(siteID: order.siteID,
                                                                            orderItems: order.items,
                                                                            storageManager: storageManager,
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageNumberRow.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageNumberRow.swift
@@ -4,10 +4,12 @@ import Foundation
 struct ShippingLabelPackageNumberRow: View {
     let packageNumber: Int
     let numberOfItems: Int
+    let isValid: Bool
 
-    init(packageNumber: Int, numberOfItems: Int) {
+    init(packageNumber: Int, numberOfItems: Int, isValid: Bool = true) {
         self.packageNumber = packageNumber
         self.numberOfItems = numberOfItems
+        self.isValid = isValid
     }
 
     var body: some View {
@@ -23,6 +25,9 @@ struct ShippingLabelPackageNumberRow: View {
                     .font(.body)
             }
             Spacer()
+            Image(uiImage: .noticeImage)
+                .foregroundColor(Color(.error))
+                .renderedIf(!isValid)
         }
     }
 }
@@ -45,5 +50,8 @@ struct ShippingLabelPackageNumberRow_Previews: PreviewProvider {
 
         ShippingLabelPackageNumberRow(packageNumber: 7, numberOfItems: 1)
             .previewLayout(.fixed(width: 375, height: 50))
+
+        ShippingLabelPackageNumberRow(packageNumber: 7, numberOfItems: 1, isValid: false)
+            .previewLayout(.fixed(width: 375, height: 50))
     }
 }
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/ShippingLabelFormViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/ShippingLabelFormViewController.swift
@@ -421,6 +421,9 @@ private extension ShippingLabelFormViewController {
             let vm = ShippingLabelPackagesFormViewModel(order: viewModel.order,
                                                         packagesResponse: viewModel.packagesResponse,
                                                         selectedPackages: inputPackages,
+                                                        onSelectionCompletion: { [weak self] selectedPackages in
+                                                            self?.viewModel.handlePackageDetailsValueChanges(details: selectedPackages)
+                                                        },
                                                         onPackageSyncCompletion: { [weak self] (packagesResponse) in
                                                           self?.viewModel.handleNewPackagesResponse(packagesResponse: packagesResponse)
                                                         })
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -1294,6 +1294,8 @@
 		DE525499268C8B32007A5829 /* UIRefreshControl+Woo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE525498268C8B32007A5829 /* UIRefreshControl+Woo.swift */; };
 		DE67D46726B98FD000EFE8DB /* Publisher+WithLatestFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE67D46626B98FD000EFE8DB /* Publisher+WithLatestFrom.swift */; };
 		DE67D46926BAA82600EFE8DB /* Publisher+WithLatestFromTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE67D46826BAA82600EFE8DB /* Publisher+WithLatestFromTests.swift */; };
+		DE7842ED26F061650030C792 /* NumberFormatter+Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE7842EC26F061650030C792 /* NumberFormatter+Localized.swift */; };
+		DE7842EF26F079A60030C792 /* NumberFormatter+LocalizedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE7842EE26F079A60030C792 /* NumberFormatter+LocalizedTests.swift */; };
 		DE8C94662646990000C94823 /* PluginListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8C94652646990000C94823 /* PluginListViewController.swift */; };
 		DE8C946E264699B600C94823 /* PluginListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8C946D264699B600C94823 /* PluginListViewModel.swift */; };
 		DEC2961F26BD1605005A056B /* ShippingLabelCustomsFormListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2961E26BD1605005A056B /* ShippingLabelCustomsFormListViewModel.swift */; };
@@ -2726,6 +2728,8 @@
 		DE525498268C8B32007A5829 /* UIRefreshControl+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIRefreshControl+Woo.swift"; sourceTree = "<group>"; };
 		DE67D46626B98FD000EFE8DB /* Publisher+WithLatestFrom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Publisher+WithLatestFrom.swift"; sourceTree = "<group>"; };
 		DE67D46826BAA82600EFE8DB /* Publisher+WithLatestFromTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Publisher+WithLatestFromTests.swift"; sourceTree = "<group>"; };
+		DE7842EC26F061650030C792 /* NumberFormatter+Localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NumberFormatter+Localized.swift"; sourceTree = "<group>"; };
+		DE7842EE26F079A60030C792 /* NumberFormatter+LocalizedTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NumberFormatter+LocalizedTests.swift"; sourceTree = "<group>"; };
 		DE8C94652646990000C94823 /* PluginListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginListViewController.swift; sourceTree = "<group>"; };
 		DE8C946D264699B600C94823 /* PluginListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginListViewModel.swift; sourceTree = "<group>"; };
 		DEC2961E26BD1605005A056B /* ShippingLabelCustomsFormListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingLabelCustomsFormListViewModel.swift; sourceTree = "<group>"; };
@@ -5233,6 +5237,7 @@
 				025C00CB2551524300FAC222 /* BarcodeScannerFrameScalerTests.swift */,
 				D88100D2257DD060008DE6F2 /* WordPressComSiteInfoWooTests.swift */,
 				DE67D46826BAA82600EFE8DB /* Publisher+WithLatestFromTests.swift */,
+				DE7842EE26F079A60030C792 /* NumberFormatter+LocalizedTests.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -5730,6 +5735,7 @@
 				DE4B3B5726A7041800EEF2D8 /* EdgeInsets+Woo.swift */,
 				DE67D46626B98FD000EFE8DB /* Publisher+WithLatestFrom.swift */,
 				DEC2962626C17AD8005A056B /* ShippingLabelCustomsForm+Localization.swift */,
+				DE7842EC26F061650030C792 /* NumberFormatter+Localized.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -7501,6 +7507,7 @@
 				CE35F11B2343F3B1007B2A6B /* TwoColumnHeadlineFootnoteTableViewCell.swift in Sources */,
 				D8C251DB230D288A00F49782 /* PushNotesManager.swift in Sources */,
 				0279F0DA252DB4BE0098D7DE /* ProductVariationDetailsFactory.swift in Sources */,
+				DE7842ED26F061650030C792 /* NumberFormatter+Localized.swift in Sources */,
 				748D34E12148291E00E21A2F /* TopPerformerDataViewController.swift in Sources */,
 				02C887712450285100E4470F /* BottomButtonContainerView.swift in Sources */,
 				0235BFD9246E959500778909 /* ProductFormActionsFactory.swift in Sources */,
@@ -7952,6 +7959,7 @@
 				4574745F24EA9ADE00CF49BC /* ProductTypeBottomSheetListSelectorCommandTests.swift in Sources */,
 				AEE2611126E6785400B142A0 /* EditAddressFormViewModelTests.swift in Sources */,
 				0212683724C049F000F8A892 /* ProductListMultiSelectorDataSourceTests.swift in Sources */,
+				DE7842EF26F079A60030C792 /* NumberFormatter+LocalizedTests.swift in Sources */,
 				5768315126694ADC00FDFB6C /* AuthenticationManagerTests.swift in Sources */,
 				D82DFB4C225F303200EFE2CB /* EmptyListMessageWithActionTests.swift in Sources */,
 				E10DFC78267331590083AFF2 /* ApplicationLogViewModelTests.swift in Sources */,
diff --git a/WooCommerce/WooCommerceTests/Extensions/NumberFormatter+LocalizedTests.swift b/WooCommerce/WooCommerceTests/Extensions/NumberFormatter+LocalizedTests.swift
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/Multi-package/ShippingLabelPackageItemViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/Multi-package/ShippingLabelPackageItemViewModelTests.swift
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/Multi-package/ShippingLabelPackagesFormViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/Multi-package/ShippingLabelPackagesFormViewModelTests.swift

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ struct ShippingLabelPackageItem: View {`
`23`	`23`
`24`	`24`	`var body: some View {`
`25`	`25`	`CollapsibleView(isCollapsible: isCollapsible, isCollapsed: $isCollapsed, safeAreaInsets: safeAreaInsets) {`
`26`		`- ShippingLabelPackageNumberRow(packageNumber: packageNumber, numberOfItems: viewModel.itemsRows.count)`
	`26`	`+ ShippingLabelPackageNumberRow(packageNumber: packageNumber, numberOfItems: viewModel.itemsRows.count, isValid: viewModel.isValidTotalWeight)`
`27`	`27`	`} content: {`
`28`	`28`	`ListHeaderView(text: Localization.itemsToFulfillHeader, alignment: .left)`
`29`	`29`	`.padding(.horizontal, insets: safeAreaInsets)`
`@@ -66,8 +66,13 @@ struct ShippingLabelPackageItem: View {`
`66`	`66`	`}`
`67`	`67`	`.background(Color(.systemBackground))`
`68`	`68`
`69`		`- ListHeaderView(text: Localization.footer, alignment: .left)`
`70`		`- .padding(.horizontal, insets: safeAreaInsets)`
	`69`	`+ if viewModel.isValidTotalWeight {`
	`70`	`+ ListHeaderView(text: Localization.footer, alignment: .left)`
	`71`	`+ .padding(.horizontal, insets: safeAreaInsets)`
	`72`	`+ } else {`
	`73`	`+ ValidationErrorRow(errorMessage: Localization.invalidWeight)`
	`74`	`+ .padding(.horizontal, insets: safeAreaInsets)`
	`75`	`+ }`
`71`	`76`	`}`
`72`	`77`	`}`
`73`	`78`	`}`
`@@ -82,6 +87,7 @@ private extension ShippingLabelPackageItem {`
`82`	`87`	`comment: "Title of the row for adding the package weight in Shipping Label Package Detail screen")`
`83`	`88`	`static let footer = NSLocalizedString("Sum of products and package weight",`
`84`	`89`	`comment: "Title of the footer in Shipping Label Package Detail screen")`
	`90`	`+ static let invalidWeight = NSLocalizedString("Invalid weight", comment: "Error message when total weight is invalid in Package Detail screen")`
`85`	`91`	`}`
`86`	`92`
`87`	`93`	`enum Constants {`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,12 @@ import Foundation`
`4`	`4`	`struct ShippingLabelPackageNumberRow: View {`
`5`	`5`	`let packageNumber: Int`
`6`	`6`	`let numberOfItems: Int`
	`7`	`+ let isValid: Bool`
`7`	`8`
`8`		`- init(packageNumber: Int, numberOfItems: Int) {`
	`9`	`+ init(packageNumber: Int, numberOfItems: Int, isValid: Bool = true) {`
`9`	`10`	`self.packageNumber = packageNumber`
`10`	`11`	`self.numberOfItems = numberOfItems`
	`12`	`+ self.isValid = isValid`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`var body: some View {`
`@@ -23,6 +25,9 @@ struct ShippingLabelPackageNumberRow: View {`
`23`	`25`	`.font(.body)`
`24`	`26`	`}`
`25`	`27`	`Spacer()`
	`28`	`+ Image(uiImage: .noticeImage)`
	`29`	`+ .foregroundColor(Color(.error))`
	`30`	`+ .renderedIf(!isValid)`
`26`	`31`	`}`
`27`	`32`	`}`
`28`	`33`	`}`
`@@ -45,5 +50,8 @@ struct ShippingLabelPackageNumberRow_Previews: PreviewProvider {`
`45`	`50`
`46`	`51`	`ShippingLabelPackageNumberRow(packageNumber: 7, numberOfItems: 1)`
`47`	`52`	`.previewLayout(.fixed(width: 375, height: 50))`
	`53`	`+`
	`54`	`+ ShippingLabelPackageNumberRow(packageNumber: 7, numberOfItems: 1, isValid: false)`
	`55`	`+ .previewLayout(.fixed(width: 375, height: 50))`
`48`	`56`	`}`
`49`	`57`	`}`