Skip to content

Commit 8f84812

Browse files
committed
Rearrange extensions order
1 parent 737d28e commit 8f84812

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/EditAddressFormViewModel.swift

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,8 @@ extension EditAddressFormViewModel {
5757
case done(enabled: Bool)
5858
case loading
5959
}
60-
}
61-
62-
private extension EditAddressFormViewModel {
63-
func updateFieldsWithOriginalAddress() {
64-
fields.update(from: originalAddress)
65-
}
66-
67-
/// Calculates what navigation trailing item should be shown depending on our internal state.
68-
///
69-
func bindNavigationTrailingItemPublisher() {
70-
Publishers.CombineLatest($fields, performingNetworkRequest)
71-
.map { [originalAddress] fields, performingNetworkRequest -> NavigationItem in
72-
guard !performingNetworkRequest else {
73-
return .loading
74-
}
75-
return .done(enabled: originalAddress != fields.toAddress())
76-
}
77-
.assign(to: &$navigationTrailingItem)
78-
}
79-
}
8060

81-
extension EditAddressFormViewModel {
82-
/// Type to hold values from all the form fields
61+
/// Type to hold values from all the form fields
8362
///
8463
struct FormFields {
8564
// MARK: User Fields
@@ -128,3 +107,22 @@ extension EditAddressFormViewModel {
128107
}
129108
}
130109
}
110+
111+
private extension EditAddressFormViewModel {
112+
func updateFieldsWithOriginalAddress() {
113+
fields.update(from: originalAddress)
114+
}
115+
116+
/// Calculates what navigation trailing item should be shown depending on our internal state.
117+
///
118+
func bindNavigationTrailingItemPublisher() {
119+
Publishers.CombineLatest($fields, performingNetworkRequest)
120+
.map { [originalAddress] fields, performingNetworkRequest -> NavigationItem in
121+
guard !performingNetworkRequest else {
122+
return .loading
123+
}
124+
return .done(enabled: originalAddress != fields.toAddress())
125+
}
126+
.assign(to: &$navigationTrailingItem)
127+
}
128+
}

0 commit comments

Comments
 (0)