Merge remote-tracking branch 'tango/MC-16233' into PR-05-29-2019

Author: Spandana Chittimala

app/code/Magento/Review/view/frontend/web/js/process-reviews.js

@@ -50,18 +50,23 @@ define([
 
         $(function () {
             $('.product-info-main .reviews-actions a').click(function (event) {
-                var anchor;
+                var anchor, addReviewBlock;
 
                 event.preventDefault();
                 anchor = $(this).attr('href').replace(/^.*?(#|$)/, '');
-                $('.product.data.items [data-role="content"]').each(function (index) { //eslint-disable-line
-                    if (this.id == 'reviews') { //eslint-disable-line eqeqeq
-                        $('.product.data.items').tabs('activate', index);
-                        $('html, body').animate({
-                            scrollTop: $('#' + anchor).offset().top - 50
-                        }, 300);
-                    }
-                });
+                addReviewBlock = $('.block.review-add .block-content #' + anchor);
+
+                if (addReviewBlock.length) {
+                    $('.product.data.items [data-role="content"]').each(function (index) { //eslint-disable-line
+                        if (this.id == 'reviews') { //eslint-disable-line eqeqeq
+                            $('.product.data.items').tabs('activate', index);
+                        }
+                    });
+                    $('html, body').animate({
+                        scrollTop: addReviewBlock.offset().top - 50
+                    }, 300);
+                }
+
             });
         });
     };