| Index: ios/chrome/browser/payments/shipping_option_selection_coordinator.mm
|
| diff --git a/ios/chrome/browser/payments/shipping_option_selection_coordinator.mm b/ios/chrome/browser/payments/shipping_option_selection_coordinator.mm
|
| index 8d37c51738599c000fb86febbb78ec990f1338cb..ba8691f319b32678a069da09e7fe9954650ea175 100644
|
| --- a/ios/chrome/browser/payments/shipping_option_selection_coordinator.mm
|
| +++ b/ios/chrome/browser/payments/shipping_option_selection_coordinator.mm
|
| @@ -53,11 +53,10 @@
|
| // delayedNotifyDelegateOfSelection.
|
| _viewController.view.userInteractionEnabled = YES;
|
|
|
| - [_viewController setIsLoading:NO];
|
| - NSString* errorMessage =
|
| - payment_request_util::GetShippingOptionSelectorErrorMessage(
|
| - _paymentRequest);
|
| - [_viewController setErrorMessage:errorMessage];
|
| + [_viewController setPending:NO];
|
| + [_viewController setErrorMessage:payment_request_util::
|
| + GetShippingOptionSelectorErrorMessage(
|
| + _paymentRequest)];
|
| [_viewController loadModel];
|
| [[_viewController collectionView] reloadData];
|
| }
|
| @@ -84,7 +83,10 @@
|
| static_cast<int64_t>(0.2 * NSEC_PER_SEC)),
|
| dispatch_get_main_queue(), ^{
|
| ShippingOptionSelectionCoordinator* strongSelf = weakSelf;
|
| - [strongSelf.viewController setIsLoading:YES];
|
| + // Early return if the coordinator has been deallocated.
|
| + if (!strongSelf)
|
| + return;
|
| + [strongSelf.viewController setPending:YES];
|
| [strongSelf.viewController loadModel];
|
| [[strongSelf.viewController collectionView] reloadData];
|
|
|
|
|