Skip to content

Commit 8989c16

Browse files
committed
Show order number title in editing flow
1 parent 9098d37 commit 8989c16

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrder.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ struct NewOrder: View {
131131
.ignoresSafeArea(.container, edges: [.horizontal])
132132
}
133133
}
134-
.navigationTitle(Localization.title)
134+
.navigationTitle(viewModel.title)
135135
.navigationBarTitleDisplayMode(.inline)
136136
.toolbar {
137137
ToolbarItem(placement: .cancellationAction) {
@@ -245,7 +245,6 @@ private extension NewOrder {
245245
}
246246

247247
enum Localization {
248-
static let title = NSLocalizedString("New Order", comment: "Title for the order creation screen")
249248
static let createButton = NSLocalizedString("Create", comment: "Button to create an order on the New Order screen")
250249
static let doneButton = NSLocalizedString("Done", comment: "Button to dismiss the Order Editing screen")
251250
static let cancelButton = NSLocalizedString("Cancel", comment: "Button to cancel the creation of an order on the New Order screen")

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrderViewModel.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@ final class NewOrderViewModel: ObservableObject {
3737
featureFlagService.isFeatureFlagEnabled(.splitViewInOrdersTab) && flow == .creation
3838
}
3939

40+
var title: String {
41+
switch flow {
42+
case .creation:
43+
return Localization.titleForNewOrder
44+
case .editing(let order):
45+
return String.localizedStringWithFormat(Localization.titleWithOrderNumber, order.number)
46+
}
47+
}
48+
4049
/// Active navigation bar trailing item.
4150
/// Defaults to create button.
4251
///
@@ -856,6 +865,8 @@ extension NewOrderViewModel {
856865

857866
private extension NewOrderViewModel {
858867
enum Localization {
868+
static let titleForNewOrder = NSLocalizedString("New Order", comment: "Title for the order creation screen")
869+
static let titleWithOrderNumber = NSLocalizedString("Order #%1$@", comment: "Order number title. Parameters: %1$@ - order number")
859870
static let errorMessageOrderCreation = NSLocalizedString("Unable to create new order", comment: "Notice displayed when order creation fails")
860871
static let errorMessageOrderSync = NSLocalizedString("Unable to load taxes for order",
861872
comment: "Notice displayed when taxes cannot be synced for new order")

0 commit comments

Comments
 (0)