Merge pull request #5672 from woocommerce/issue/5569-crash-product-images

Product images: fix crash when tapping on an image while another image is pending upload

Author: jaclync

RELEASE-NOTES.txt

@@ -9,6 +9,7 @@
 - [***] In-Person Payments: Now you can collect Simple Payments on the go. [https://github.com/woocommerce/woocommerce-ios/pull/5635]
 - [*] Products: After generating a new variation for a variable product, you are now taken directly to edit the new variation. [https://github.com/woocommerce/woocommerce-ios/pull/5649]
 - [*] Dashboard: the visitor count in the Today tab is now shown when Jetpack site stats are enabled.
+- [*] Add/Edit Product Images: tapping on the last `n` images while `n` images are pending upload does not crash the app anymore. [https://github.com/woocommerce/woocommerce-ios/pull/5672]
 
 8.2
 -----

WooCommerce/Classes/ViewRelated/Products/Media/ProductImagesCollectionViewController.swift

@@ -123,8 +123,14 @@ extension ProductImagesCollectionViewController {
             return
         }
 
+        let selectedImageIndex: Int = {
+            // In case of any pending images, deduct the number of pending images from the index.
+            let imageStatusIndex = indexPath.row
+            let numberOfPendingImages = productImageStatuses.count - productImageStatuses.images.count
+            return imageStatusIndex - numberOfPendingImages
+        }()
         let productImagesGalleryViewController = ProductImagesGalleryViewController(images: productImageStatuses.images,
-                                                                                    selectedIndex: indexPath.row,
+                                                                                    selectedIndex: selectedImageIndex,
                                                                                     isDeletionEnabled: isDeletionEnabled,
                                                                                     productUIImageLoader: productUIImageLoader) { [weak self] (productImage) in
                                                                                         self?.onDeletion(productImage)