sacred-art
diff --git a/‎.github/workflow-examples/automatic_deployment_production.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflow-examples/automatic_deployment_production.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflow-examples/poll_for_changed_configuration.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflow-examples/poll_for_changed_configuration.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/pull_request_review.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/pull_request_review.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎CHANGELOG.md‎
Lines changed: 20 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎assets/js/theme/account.js‎
Lines changed: 5 additions & 14 deletions b/‎assets/js/theme/account.js‎
Lines changed: 5 additions & 14 deletions
diff --git a/‎assets/js/theme/cart.js‎
Lines changed: 19 additions & 60 deletions b/‎assets/js/theme/cart.js‎
Lines changed: 19 additions & 60 deletions
diff --git a/‎assets/js/theme/cart/shipping-estimator.js‎
Lines changed: 2 additions & 6 deletions b/‎assets/js/theme/cart/shipping-estimator.js‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎assets/js/theme/common/product-details.js‎
Lines changed: 2 additions & 0 deletions b/‎assets/js/theme/common/product-details.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎assets/js/theme/global.js‎
Lines changed: 1 addition & 7 deletions b/‎assets/js/theme/global.js‎
Lines changed: 1 addition & 7 deletions
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [12.x]
+        node: [14.x]
 
     steps:
     - name: Checkout code
@@ -47,7 +47,7 @@ jobs:
       env:
         URL: ${{ secrets.STENCIL_STORE_URL_PRODUCTION }}
         TOKEN: ${{ secrets.STENCIL_ACCESS_TOKEN_PRODUCTION }}
-      run: stencil init -u $URL -t $TOKEN -p 3000
+      run: stencil init -u $URL -t $TOKEN -p 3000 -h https://api.bigcommerce.com
 
     - name: Push theme live, automatically deleting oldest theme if necessary
       run: stencil push -a -d -c 1
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [12.x]
+        node: [14.x]
 
     steps:
     - name: Checkout code
@@ -47,7 +47,7 @@ jobs:
       env:
         URL: ${{ secrets.STENCIL_STORE_URL_PRODUCTION }}
         TOKEN: ${{ secrets.STENCIL_ACCESS_TOKEN_PRODUCTION }}
-      run: stencil init -u $URL -t $TOKEN -p 3000
+      run: stencil init -u $URL -t $TOKEN -p 3000 -h https://api.bigcommerce.com
 
     - name: Check for an updated configuration on the live default storefront (channel ID 1)
       run: stencil pull -c 1
 
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [12.x]
+        node: [14.x]
 
     steps:
     - name: Checkout code
 
@@ -6,6 +6,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Draft
 
+## 6.4.1 (05-16-2022)
+- Incorrect handling of unsuccessful item removing from cart on the Cart page. [#2211](https://github.com/bigcommerce/cornerstone/issues/2211)
+
+## 6.4.0 (05-11-2022)
+- Remove adminBar translations from da/no lang files [#2209](https://github.com/bigcommerce/cornerstone/issues/2209)
+- Translation updates April 2022 [#2204](https://github.com/bigcommerce/cornerstone/issues/2204)
+- Product image not shown in Pinterest preview if not signed in.[#2203](https://github.com/bigcommerce/cornerstone/issues/2203)
+- Remove nanobar (loading progress bar). [#2192](https://github.com/bigcommerce/cornerstone/issues/2192)
+- Fix Workflow examples missing api host. [#2161](https://github.com/bigcommerce/cornerstone/pull/2161)
+- Remove sweetAlert. [#2189](https://github.com/bigcommerce/cornerstone/issues/2189)
+- Apply security updates (April 2022) [#2200](https://github.com/bigcommerce/cornerstone/issues/2200)
+- Reviews form not submitting after quick view opening on PDP. [#2201](https://github.com/bigcommerce/cornerstone/issues/2201)
+- Social media icons failing wave scan with "Empty Link". [#2202](https://github.com/bigcommerce/cornerstone/issues/2202)
+- Search results containing % symbol result in errored page. [#2205](https://github.com/bigcommerce/cornerstone/issues/2205)
+- Remove translations for adminBar component [#2196](https://github.com/bigcommerce/cornerstone/issues/2196)
+- Remove adminBar. [#2191](https://github.com/bigcommerce/cornerstone/issues/2191)
+- When price list price is set for currency, the cart does not respect product's price.[#2190](https://github.com/bigcommerce/cornerstone/issues/2190)
+- Stored Payment Methods form can be submitted without selecting a Country.[#2194](https://github.com/bigcommerce/cornerstone/issues/2194)
+- Show pickup details in storefront for BOPIS orders. [#2199](https://github.com/bigcommerce/cornerstone/pull/2199)
+
 ## 6.3.0 (03-11-2022)
 - Update blog component to use H1 tags on posts [#2179](https://github.com/bigcommerce/cornerstone/issues/2179)
 - Remove Compare Form. [#2162](https://github.com/bigcommerce/cornerstone/pull/2162)
 
@@ -13,7 +13,7 @@ import {
 } from './common/utils/form-utils';
 import { createTranslationDictionary } from './common/utils/translations-utils';
 import { creditCardType, storeInstrument, Validators as CCValidators, Formatters as CCFormatters } from './common/payment-method';
-import swal from './global/sweet-alert';
+import { showAlertModal } from './global/modal';
 import compareProducts from './global/compare-products';
 
 export default class Account extends PageManager {
@@ -131,10 +131,7 @@ export default class Account extends PageManager {
 
             if (!submitForm) {
                 event.preventDefault();
-                swal.fire({
-                    text: this.context.selectItem,
-                    icon: 'error',
-                });
+                showAlertModal(this.context.selectItem);
             }
         });
     }
@@ -209,10 +206,7 @@ export default class Account extends PageManager {
                 return true;
             }
 
-            swal.fire({
-                text: errorMessage,
-                icon: 'error',
-            });
+            showAlertModal(errorMessage);
 
             return event.preventDefault();
         });
@@ -227,7 +221,7 @@ export default class Account extends PageManager {
         $paymentMethodForm.find('#address1.form-field').attr('data-validation', `{ "type": "singleline", "label": "${this.context.address1Label}", "required": true, "maxlength": 0 }`);
         $paymentMethodForm.find('#address2.form-field').attr('data-validation', `{ "type": "singleline", "label": "${this.context.address2Label}", "required": false, "maxlength": 0 }`);
         $paymentMethodForm.find('#city.form-field').attr('data-validation', `{ "type": "singleline", "label": "${this.context.cityLabel}", "required": true, "maxlength": 0 }`);
-        $paymentMethodForm.find('#country.form-field').attr('data-validation', `{ "type": "singleselect", "label": "${this.context.countryLabel}", "required": true, prefix: "${this.context.chooseCountryLabel}" }`);
+        $paymentMethodForm.find('#country.form-field').attr('data-validation', `{ "type": "singleselect", "label": "${this.context.countryLabel}", "required": true, "prefix": "${this.context.chooseCountryLabel}" }`);
         $paymentMethodForm.find('#state.form-field').attr('data-validation', `{ "type": "singleline", "label": "${this.context.stateLabel}", "required": true, "maxlength": 0 }`);
         $paymentMethodForm.find('#postal_code.form-field').attr('data-validation', `{ "type": "singleline", "label": "${this.context.postalCodeLabel}", "required": true, "maxlength": 0 }`);
 
@@ -313,10 +307,7 @@ export default class Account extends PageManager {
                 storeInstrument(this.context, data, () => {
                     window.location.href = this.context.paymentMethodsUrl;
                 }, () => {
-                    swal.fire({
-                        text: this.context.generic_error,
-                        icon: 'error',
-                    });
+                    showAlertModal(this.context.generic_error);
                 });
             }
         });
 
@@ -4,8 +4,7 @@ import checkIsGiftCertValid from './common/gift-certificate-validator';
 import { createTranslationDictionary } from './common/utils/translations-utils';
 import utils from '@bigcommerce/stencil-utils';
 import ShippingEstimator from './cart/shipping-estimator';
-import { defaultModal, ModalEvents } from './global/modal';
-import swal from './global/sweet-alert';
+import { defaultModal, showAlertModal, ModalEvents } from './global/modal';
 import CartItemDetails from './common/cart-item-details';
 
 export default class Cart extends PageManager {
@@ -45,15 +44,9 @@ export default class Cart extends PageManager {
         const newQty = $target.data('action') === 'inc' ? oldQty + 1 : oldQty - 1;
         // Does not quality for min/max quantity
         if (newQty < minQty) {
-            return swal.fire({
-                text: minError,
-                icon: 'error',
-            });
+            return showAlertModal(minError);
         } else if (maxQty > 0 && newQty > maxQty) {
-            return swal.fire({
-                text: maxError,
-                icon: 'error',
-            });
+            return showAlertModal(maxError);
         }
 
         this.$overlay.show();
@@ -68,10 +61,7 @@ export default class Cart extends PageManager {
                 this.refreshContent(remove);
             } else {
                 $el.val(oldQty);
-                swal.fire({
-                    text: response.data.errors.join('\n'),
-                    icon: 'error',
-                });
+                showAlertModal(response.data.errors.join('\n'));
             }
         });
     }
@@ -91,22 +81,13 @@ export default class Cart extends PageManager {
         if (!newQty) {
             invalidEntry = $el.val();
             $el.val(oldQty);
-            return swal.fire({
-                text: this.context.invalidEntryMessage.replace('[ENTRY]', invalidEntry),
-                icon: 'error',
-            });
+            return showAlertModal(this.context.invalidEntryMessage.replace('[ENTRY]', invalidEntry));
         } else if (newQty < minQty) {
             $el.val(oldQty);
-            return swal.fire({
-                text: minError,
-                icon: 'error',
-            });
+            return showAlertModal(minError);
         } else if (maxQty > 0 && newQty > maxQty) {
             $el.val(oldQty);
-            return swal.fire({
-                text: maxError,
-                icon: 'error',
-            });
+            return showAlertModal(maxError);
         }
 
         this.$overlay.show();
@@ -120,10 +101,8 @@ export default class Cart extends PageManager {
                 this.refreshContent(remove);
             } else {
                 $el.val(oldQty);
-                swal.fire({
-                    text: response.data.errors.join('\n'),
-                    icon: 'error',
-                });
+
+                return showAlertModal(response.data.errors.join('\n'));
             }
         });
     }
@@ -134,10 +113,8 @@ export default class Cart extends PageManager {
             if (response.data.status === 'succeed') {
                 this.refreshContent(true);
             } else {
-                swal.fire({
-                    text: response.data.errors.join('\n'),
-                    icon: 'error',
-                });
+                this.$overlay.hide();
+                showAlertModal(response.data.errors.join('\n'));
             }
         });
     }
@@ -190,10 +167,7 @@ export default class Cart extends PageManager {
                 const data = result.data || {};
 
                 if (err) {
-                    swal.fire({
-                        text: err,
-                        icon: 'error',
-                    });
+                    showAlertModal(err);
                     return false;
                 }
 
@@ -286,16 +260,13 @@ export default class Cart extends PageManager {
         $('.cart-remove', this.$cartContent).on('click', event => {
             const itemId = $(event.currentTarget).data('cartItemid');
             const string = $(event.currentTarget).data('confirmDelete');
-            swal.fire({
-                text: string,
+            showAlertModal(string, {
                 icon: 'warning',
                 showCancelButton: true,
-                cancelButtonText: this.context.cancelButtonText,
-            }).then((result) => {
-                if (result.value) {
+                onConfirm: () => {
                     // remove item from cart
                     cartRemoveItem(itemId);
-                }
+                },
             });
             event.preventDefault();
         });
@@ -338,20 +309,14 @@ export default class Cart extends PageManager {
 
             // Empty code
             if (!code) {
-                return swal.fire({
-                    text: $codeInput.data('error'),
-                    icon: 'error',
-                });
+                return showAlertModal($codeInput.data('error'));
             }
 
             utils.api.cart.applyCode(code, (err, response) => {
                 if (response.data.status === 'success') {
                     this.refreshContent();
                 } else {
-                    swal.fire({
-                        html: response.data.errors.join('\n'),
-                        icon: 'error',
-                    });
+                    showAlertModal(response.data.errors.join('\n'));
                 }
             });
         });
@@ -383,20 +348,14 @@ export default class Cart extends PageManager {
 
             if (!checkIsGiftCertValid(code)) {
                 const validationDictionary = createTranslationDictionary(this.context);
-                return swal.fire({
-                    text: validationDictionary.invalid_gift_certificate,
-                    icon: 'error',
-                });
+                return showAlertModal(validationDictionary.invalid_gift_certificate);
             }
 
             utils.api.cart.applyGiftCertificate(code, (err, resp) => {
                 if (resp.data.status === 'success') {
                     this.refreshContent();
                 } else {
-                    swal.fire({
-                        html: resp.data.errors.join('\n'),
-                        icon: 'error',
-                    });
+                    showAlertModal(resp.data.errors.join('\n'));
                 }
             });
         });
 
@@ -3,7 +3,7 @@ import nod from '../common/nod';
 import utils from '@bigcommerce/stencil-utils';
 import { Validators, announceInputErrorMessage } from '../common/utils/form-utils';
 import collapsibleFactory from '../common/collapsible';
-import swal from '../global/sweet-alert';
+import { showAlertModal } from '../global/modal';
 
 export default class ShippingEstimator {
     constructor($element, shippingErrorMessages) {
@@ -114,11 +114,7 @@ export default class ShippingEstimator {
         // Requests the states for a country with AJAX
         stateCountry(this.$state, this.context, { useIdForStates: true }, (err, field) => {
             if (err) {
-                swal.fire({
-                    text: err,
-                    icon: 'error',
-                });
-
+                showAlertModal(err);
                 throw new Error(err);
             }
 
 
@@ -11,6 +11,7 @@ import forms from '../common/models/forms';
 import { normalizeFormData } from './utils/api';
 import { isBrowserIE, convertIntoArray } from './utils/ie-helpers';
 import bannerUtils from './utils/banner-utils';
+import currencySelector from '../global/currency-selector';
 
 export default class ProductDetails extends ProductDetailsBase {
     constructor($scope, context, productAttributesData = {}) {
@@ -399,6 +400,7 @@ export default class ProductDetails extends ProductDetailsBase {
 
         // Add item to cart
         utils.api.cart.itemAdd(normalizeFormData(new FormData(form)), (err, response) => {
+            currencySelector(response.data.cart_id);
             const errorMessage = err || response.data.error;
 
             $addToCartBtn
 
@@ -11,16 +11,12 @@ import foundation from './global/foundation';
 import quickView from './global/quick-view';
 import cartPreview from './global/cart-preview';
 import privacyCookieNotification from './global/cookieNotification';
-import adminBar from './global/adminBar';
 import carousel from './common/carousel';
-import loadingProgressBar from './global/loading-progress-bar';
 import svgInjector from './global/svg-injector';
 
 export default class Global extends PageManager {
     onReady() {
-        const {
-            channelId, cartId, productId, categoryId, secureBaseUrl, maintenanceModeSettings, adminBarLanguage,
-        } = this.context;
+        const { cartId, secureBaseUrl } = this.context;
         cartPreview(secureBaseUrl, cartId);
         quickSearch();
         currencySelector(cartId);
@@ -30,8 +26,6 @@ export default class Global extends PageManager {
         menu();
         mobileMenuToggle();
         privacyCookieNotification();
-        adminBar(secureBaseUrl, channelId, maintenanceModeSettings, JSON.parse(adminBarLanguage), productId, categoryId);
-        loadingProgressBar();
         svgInjector();
     }
 }