Skip to content

Commit 2f3397d

Browse files
committed
Explicitly capture weak self
1 parent 0ff31bc commit 2f3397d

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ extension ShippingLabelAddNewPackageViewModel {
7878
onCompletion(success)
7979

8080
// On success, reset tab state and save new package details
81-
guard success else { return }
82-
self?.customPackageVM = ShippingLabelCustomPackageFormViewModel()
83-
self?.onCompletion(newCustomPackage, nil, self?.packagesResponse)
81+
guard let self = self, success else { return }
82+
self.customPackageVM = ShippingLabelCustomPackageFormViewModel()
83+
self.onCompletion(newCustomPackage, nil, self.packagesResponse)
8484
}
8585
}
8686

@@ -101,10 +101,10 @@ extension ShippingLabelAddNewPackageViewModel {
101101
onCompletion(success)
102102

103103
// On success, reset tab state and save new package details
104-
guard success else { return }
105-
self?.customPackageVM = ShippingLabelCustomPackageFormViewModel()
106-
self?.servicePackageVM.packagesResponse = self?.packagesResponse
107-
self?.onCompletion(nil, selectedServicePackage, self?.packagesResponse)
104+
guard let self = self, success else { return }
105+
self.customPackageVM = ShippingLabelCustomPackageFormViewModel()
106+
self.servicePackageVM.packagesResponse = self.packagesResponse
107+
self.onCompletion(nil, selectedServicePackage, self.packagesResponse)
108108
}
109109
}
110110
}
@@ -125,7 +125,9 @@ private extension ShippingLabelAddNewPackageViewModel {
125125

126126
let action = ShippingLabelAction.createPackage(siteID: siteID,
127127
customPackage: customPackage,
128-
predefinedOption: predefinedOption) { result in
128+
predefinedOption: predefinedOption) { [weak self] result in
129+
guard let self = self else { return }
130+
129131
switch result {
130132
case .success:
131133
self.syncPackageDetails() { success in
@@ -142,7 +144,9 @@ private extension ShippingLabelAddNewPackageViewModel {
142144
/// Gets updated package list with new package. On completion, indicates if sync was successful.
143145
///
144146
func syncPackageDetails(onCompletion: ((Bool) -> Void)? = nil) {
145-
let action = ShippingLabelAction.packagesDetails(siteID: siteID) { result in
147+
let action = ShippingLabelAction.packagesDetails(siteID: siteID) { [weak self] result in
148+
guard let self = self else { return }
149+
146150
switch result {
147151
case .success(let value):
148152
self.packagesResponse = value

0 commit comments

Comments
 (0)