Skip to content

Commit 6fec81c

Browse files
committed
Display error alert if package creation fails
1 parent af21c7c commit 6fec81c

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Package Selection/Package Creation/ShippingLabelAddNewPackage.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ struct ShippingLabelAddNewPackage: View {
7777
})
7878
.disabled(isSyncing)
7979
.alert(isPresented: $showingAddPackageError, content: {
80-
Alert(title: Text(Localization.errorAlertTitle),
81-
message: Text(Localization.errorAlertMessage))
80+
let title = viewModel.error?.alertTitle ?? Localization.errorAlertTitle
81+
let message = viewModel.error?.errorDescription ?? Localization.errorAlertMessage
82+
return Alert(title: Text(title), message: Text(message))
8283
})
8384
})
8485
}
@@ -92,10 +93,9 @@ private extension ShippingLabelAddNewPackage {
9293
static let customPackage = NSLocalizedString("Custom Package", comment: "Custom Package menu in Shipping Label Add New Package flow")
9394
static let servicePackage = NSLocalizedString("Service Package", comment: "Service Package menu in Shipping Label Add New Package flow")
9495
static let doneButton = NSLocalizedString("Done", comment: "Done navigation button in the Add New Package screen in Shipping Label flow")
95-
static let errorAlertTitle = NSLocalizedString("Cannot add package",
96-
comment: "Title of the alert when there is a failure adding a package in the Shipping Label flow")
96+
static let errorAlertTitle = NSLocalizedString("Cannot add package", comment: "The title of the alert when there is a generic error adding the package")
9797
static let errorAlertMessage = NSLocalizedString("Unexpected error",
98-
comment: "Message of the alert when there is a failure adding a package in the Shipping Label flow")
98+
comment: "The message of the alert when there is an unexpected error adding the package")
9999
}
100100
}
101101

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Package Selection/Package Creation/ShippingLabelAddNewPackageViewModel.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ final class ShippingLabelAddNewPackageViewModel: ObservableObject {
3838
///
3939
private var packagesResponse: ShippingLabelPackagesResponse?
4040

41+
/// Error if package creation fails
42+
///
43+
private(set) var error: PackageCreationError?
44+
4145
/// Completion callback
4246
///
4347
typealias Completion = (_ customPackage: ShippingLabelCustomPackage? ,
@@ -135,6 +139,7 @@ private extension ShippingLabelAddNewPackageViewModel {
135139
onCompletion?(success)
136140
}
137141
case .failure(let error):
142+
self.error = error
138143
DDLogError("⛔️ Error creating package: \(error.localizedDescription)")
139144
onCompletion?(false)
140145
}

0 commit comments

Comments
 (0)