From 79c64d67ad8b0d43b4194ae6bc949066c70f7d3c Mon Sep 17 00:00:00 2001
From: Yurii Zusik <yurii.zusik@bigcommerce.com>
Date: Tue, 10 Nov 2020 12:17:27 +0200
Subject: [PATCH] fix(storefront): BCTHEME-315 Write a Review modal cause
 TypeError

---
 CHANGELOG.md               |  1 +
 assets/js/theme/product.js | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b1548b247..c6ea5e90d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Draft
+- Write a Review modal cause TypeError. [#1899](https://github.com/bigcommerce/cornerstone/pull/1899)
 
 ## 4.12.0 (11-03-2020)
 - Reduce lodash usage in compare-products.js and image-gallery.js [#1827](https://github.com/bigcommerce/cornerstone/pull/1827)
diff --git a/assets/js/theme/product.js b/assets/js/theme/product.js
index ad48754866..0c4c20020f 100644
--- a/assets/js/theme/product.js
+++ b/assets/js/theme/product.js
@@ -28,8 +28,6 @@ export default class Product extends PageManager {
             }
         });
 
-        $(document).on('opened.fndtn.reveal', () => this.reviewModal.setupFocusableElements(WRITE_REVIEW));
-
         let validator;
 
         // Init collapsible
@@ -40,9 +38,16 @@ export default class Product extends PageManager {
 
         videoGallery();
 
+        this.bulkPricingHandler();
+
         const $reviewForm = classifyForm('.writeReview-form');
+
+        if ($reviewForm.length === 0) return;
+
         const review = new Review($reviewForm);
 
+        $(document).on('opened.fndtn.reveal', () => this.reviewModal.setupFocusableElements(WRITE_REVIEW));
+
         $('body').on('click', '[data-reveal-id="modal-review-form"]', () => {
             validator = review.registerValidation(this.context);
             this.ariaDescribeReviewInputs($reviewForm);
@@ -58,7 +63,6 @@ export default class Product extends PageManager {
         });
 
         this.productReviewHandler();
-        this.bulkPricingHandler();
     }
 
     ariaDescribeReviewInputs($form) {