npm - @pelcro/react-pelcro-js - Versions diffs - 3.2.0-beta.3 → 3.2.0-beta.6 - Mend

@pelcro/react-pelcro-js 3.2.0-beta.3 → 3.2.0-beta.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/index.cjs.js CHANGED Viewed

@@ -3461,9 +3461,9 @@ var paymentMethod_fr = {
 	select: select
 };
-var title$f = "Enter your email to subscribe to our newsletter";
+var title$h = "Enter your email to subscribe to our newsletter";
 var updateTitle$1 = "Update newsletter selections";
-var subtitle$7 = "We may use your email for other marketing communication";
+var subtitle$9 = "We may use your email for other marketing communication";
 var labels$p = {
 	submit: "Submit",
 	firstName: "First name",
@@ -3480,16 +3480,16 @@ var messages$r = {
 	here: "here"
 };
 var newsletter_en = {
-	title: title$f,
+	title: title$h,
 	updateTitle: updateTitle$1,
-	subtitle: subtitle$7,
+	subtitle: subtitle$9,
 	labels: labels$p,
 	messages: messages$r
 };
-var title$e = "Entrez votre adresse courriel pour vous abonner à notre infolettre";
+var title$g = "Entrez votre adresse courriel pour vous abonner à notre infolettre";
 var updateTitle = "Mettre à jour son choix d'infolettres";
-var subtitle$6 = "Nous pouvons utiliser votre adresse courriel pour d’autres communications marketing";
+var subtitle$8 = "Nous pouvons utiliser votre adresse courriel pour d’autres communications marketing";
 var labels$o = {
 	submit: "Lire l’article !",
 	firstName: "Prénom",
@@ -3506,9 +3506,9 @@ var messages$q = {
 	here: "ici"
 };
 var newsletter_fr = {
-	title: title$e,
+	title: title$g,
 	updateTitle: updateTitle,
-	subtitle: subtitle$6,
+	subtitle: subtitle$8,
 	labels: labels$o,
 	messages: messages$q
 };
@@ -3765,8 +3765,8 @@ var login_fr = {
 	errors: errors$4
 };
-var title$d = "Create an account";
-var subtitle$5 = "Enter your email and password below";
+var title$f = "Create an account";
+var subtitle$7 = "Enter your email and password below";
 var labels$h = {
 	signUpFacebook: "Sign up with Facebook",
 	signUpGoogle: "Sign up with Google",
@@ -3851,8 +3851,8 @@ var redeem$1 = {
 	}
 };
 var register_en = {
-	title: title$d,
-	subtitle: subtitle$5,
+	title: title$f,
+	subtitle: subtitle$7,
 	labels: labels$h,
 	messages: messages$h,
 	errors: errors$3,
@@ -3860,8 +3860,8 @@ var register_en = {
 	redeem: redeem$1
 };
-var title$c = "Créer un compte";
-var subtitle$4 = "Entrez votre courriel et votre mot de passe ci-dessous";
+var title$e = "Créer un compte";
+var subtitle$6 = "Entrez votre courriel et votre mot de passe ci-dessous";
 var labels$g = {
 	signUpFacebook: "Inscrivez-vous avec Facebook",
 	signUpGoogle: "Inscrivez-vous avec Google",
@@ -3947,8 +3947,8 @@ var redeem = {
 	}
 };
 var register_fr = {
-	title: title$c,
-	subtitle: subtitle$4,
+	title: title$e,
+	subtitle: subtitle$6,
 	labels: labels$g,
 	messages: messages$g,
 	errors: errors$2,
@@ -4008,7 +4008,7 @@ var userEdit_fr = {
 	messages: messages$e
 };
-var title$b = "Enter your shipping address";
+var title$d = "Enter your shipping address";
 var selectAddressTitle$1 = "Please select an address";
 var selectAddressSubtitle$1 = "Select one of your saved addresses, or add a new one";
 var labels$d = {
@@ -4031,7 +4031,7 @@ var messages$d = {
 	subRedeemed: "Your subscription has been redeemed."
 };
 var address_en = {
-	title: title$b,
+	title: title$d,
 	selectAddressTitle: selectAddressTitle$1,
 	selectAddressSubtitle: selectAddressSubtitle$1,
 	labels: labels$d,
@@ -4039,7 +4039,7 @@ var address_en = {
 	messages: messages$d
 };
-var title$a = "Entrez votre adresse de livraison";
+var title$c = "Entrez votre adresse de livraison";
 var selectAddressTitle = "Veuillez sélectionner une adresse";
 var selectAddressSubtitle = "Choisissez l'une de vos adresses ou créez-en une nouvelle";
 var labels$c = {
@@ -4062,7 +4062,7 @@ var messages$c = {
 	subRedeemed: "Votre abonnement a bien été activé."
 };
 var address_fr = {
-	title: title$a,
+	title: title$c,
 	selectAddressTitle: selectAddressTitle,
 	selectAddressSubtitle: selectAddressSubtitle,
 	labels: labels$c,
@@ -4070,8 +4070,8 @@ var address_fr = {
 	messages: messages$c
 };
-var title$9 = "Reset your password";
-var subtitle$3 = "Enter a new password below";
+var title$b = "Reset your password";
+var subtitle$5 = "Enter a new password below";
 var email$3 = "Email";
 var password$3 = "Password";
 var confirmPassword$1 = "Confirm password";
@@ -4079,8 +4079,8 @@ var submit$5 = "Submit";
 var required$5 = "Required";
 var passwordUpdated$1 = "Password has been updated, please login with the new password";
 var passwordReset_en = {
-	title: title$9,
-	subtitle: subtitle$3,
+	title: title$b,
+	subtitle: subtitle$5,
 	email: email$3,
 	password: password$3,
 	confirmPassword: confirmPassword$1,
@@ -4089,8 +4089,8 @@ var passwordReset_en = {
 	passwordUpdated: passwordUpdated$1
 };
-var title$8 = "Réinitialiser votre mot de passe";
-var subtitle$2 = "Entrez un nouveau mot de passe ci-dessous";
+var title$a = "Réinitialiser votre mot de passe";
+var subtitle$4 = "Entrez un nouveau mot de passe ci-dessous";
 var email$2 = "Adresse courriel";
 var password$2 = "Mot de passe";
 var confirmPassword = "Confirmer le mot de passe";
@@ -4098,8 +4098,8 @@ var submit$4 = "Soumettre";
 var required$4 = "Champs obligatoires";
 var passwordUpdated = "Votre mot de passe a été mis à jour, veuillez vous connecter avec celui-ci";
 var passwordReset_fr = {
-	title: title$8,
-	subtitle: subtitle$2,
+	title: title$a,
+	subtitle: subtitle$4,
 	email: email$2,
 	password: password$2,
 	confirmPassword: confirmPassword,
@@ -4108,7 +4108,7 @@ var passwordReset_fr = {
 	passwordUpdated: passwordUpdated
 };
-var title$7 = "Forgot your password?";
+var title$9 = "Forgot your password?";
 var email$1 = "Email";
 var password$1 = "Password";
 var submit$3 = "Submit";
@@ -4119,7 +4119,7 @@ var messages$b = {
 	loginHere: "login here."
 };
 var passwordForgot_en = {
-	title: title$7,
+	title: title$9,
 	email: email$1,
 	password: password$1,
 	submit: submit$3,
@@ -4128,7 +4128,7 @@ var passwordForgot_en = {
 	messages: messages$b
 };
-var title$6 = "Mot de passe oublié ?";
+var title$8 = "Mot de passe oublié ?";
 var email = "Courriel";
 var password = "Mot de passe";
 var submit$2 = "Soumettre";
@@ -4139,7 +4139,7 @@ var messages$a = {
 	loginHere: "Connectez-vous ici"
 };
 var passwordForgot_fr = {
-	title: title$6,
+	title: title$8,
 	email: email,
 	password: password,
 	submit: submit$2,
@@ -4148,7 +4148,7 @@ var passwordForgot_fr = {
 	messages: messages$a
 };
-var title$5 = "Change your password";
+var title$7 = "Change your password";
 var currentPassword$1 = "Current password";
 var newPassword$1 = "New password";
 var confirmNewPassword$1 = "Confirm new password";
@@ -4158,7 +4158,7 @@ var passwordChanged$1 = "Password has been changed, please login with the new pa
 var passwordsNotMatching$1 = "Passwords don't match";
 var weakPassword$1 = "Your password must contain at least 6 characters";
 var passwordChange_en = {
-	title: title$5,
+	title: title$7,
 	currentPassword: currentPassword$1,
 	newPassword: newPassword$1,
 	confirmNewPassword: confirmNewPassword$1,
@@ -4169,7 +4169,7 @@ var passwordChange_en = {
 	weakPassword: weakPassword$1
 };
-var title$4 = "Changez votre mot de passe";
+var title$6 = "Changez votre mot de passe";
 var currentPassword = "Mot de passe actuel";
 var newPassword = "Nouveau mot de passe";
 var confirmNewPassword = "Confirmer le nouveau mot de passe";
@@ -4179,7 +4179,7 @@ var passwordChanged = "Le mot de passe a été modifié, veuillez vous connecter
 var passwordsNotMatching = "Les mots de passe ne correspondent pas";
 var weakPassword = "Votre mot de passe doit contenir au moins 6";
 var passwordChange_fr = {
-	title: title$4,
+	title: title$6,
 	currentPassword: currentPassword,
 	newPassword: newPassword,
 	confirmNewPassword: confirmNewPassword,
@@ -4190,8 +4190,8 @@ var passwordChange_fr = {
 	weakPassword: weakPassword
 };
-var title$3 = "Votre panier";
-var subtitle$1 = "Terminez votre achat ci-dessous";
+var title$5 = "Votre panier";
+var subtitle$3 = "Terminez votre achat ci-dessous";
 var name$1 = "Produit";
 var quantity$1 = "Quantité";
 var price$1 = "Prix";
@@ -4202,8 +4202,8 @@ var confirm$3 = "Passer à la caisse";
 var empty$1 = "Votre panier est vide.";
 var removeAll$1 = "Vider";
 var cart_fr = {
-	title: title$3,
-	subtitle: subtitle$1,
+	title: title$5,
+	subtitle: subtitle$3,
 	name: name$1,
 	quantity: quantity$1,
 	price: price$1,
@@ -4215,8 +4215,8 @@ var cart_fr = {
 	removeAll: removeAll$1
 };
-var title$2 = "Your shopping cart";
-var subtitle = "Comple your purchase below";
+var title$4 = "Your shopping cart";
+var subtitle$2 = "Comple your purchase below";
 var name = "Name";
 var quantity = "Quantity";
 var price = "Price";
@@ -4227,8 +4227,8 @@ var confirm$2 = "Checkout";
 var empty = "Your cart is empty.";
 var removeAll = "Remove all";
 var cart_en = {
-	title: title$2,
-	subtitle: subtitle,
+	title: title$4,
+	subtitle: subtitle$2,
 	name: name,
 	quantity: quantity,
 	price: price,
@@ -4666,7 +4666,7 @@ var verifyEmail_fr = {
 	messages: messages
 };
-var title$1 = "Invoice details";
+var title$3 = "Invoice details";
 var labels$1 = {
 	summary: "Summary",
 	total: "Total",
@@ -4679,12 +4679,12 @@ var buttons$1 = {
 	pay: "Pay now"
 };
 var invoiceDetails_en = {
-	title: title$1,
+	title: title$3,
 	labels: labels$1,
 	buttons: buttons$1
 };
-var title = "Invoice details";
+var title$2 = "Invoice details";
 var labels = {
 	summary: "Summary",
 	total: "Total",
@@ -4697,11 +4697,37 @@ var buttons = {
 	pay: "Pay now"
 };
 var invoiceDetails_fr = {
-	title: title,
+	title: title$2,
 	labels: labels,
 	buttons: buttons
 };
+var title$1 = "Renewal options";
+var subtitle$1 = "Select one of the options below to continue";
+var next$1 = "Next";
+var addNew$1 = "Add Another Subscription";
+var renew$1 = "Renew Existing Subscription";
+var subscriptionOptions_en = {
+	title: title$1,
+	subtitle: subtitle$1,
+	next: next$1,
+	addNew: addNew$1,
+	renew: renew$1
+};
+var title = "Renewal options";
+var subtitle = "Select one of the options below to continue";
+var next = "Next";
+var addNew = "Add Another Subscription";
+var renew = "Renew Existing Subscription";
+var subscriptionOptions_fr = {
+	title: title,
+	subtitle: subtitle,
+	next: next,
+	addNew: addNew,
+	renew: renew
+};
 function create$1(createState) {
   let state;
   const listeners = new Set();
@@ -6051,7 +6077,7 @@ class PelcroActions {
         view,
         cartItems,
         ...otherStateFields
-      } = initialState$i;
+      } = initialState$j;
       this.set(otherStateFields);
     });
@@ -6075,6 +6101,16 @@ class PelcroActions {
         });
       }
+      if (view === "subscription-options") {
+        const noRenewableProducts = getRenewableProducts().length === 0;
+        if (noRenewableProducts) {
+          return this.set({
+            view: "plan-select"
+          });
+        }
+      }
       this.set({
         view
       });
@@ -6149,6 +6185,26 @@ class PelcroActions {
       }
     });
+    _defineProperty$3(this, "setProductsList", products => {
+      if (!Array.isArray(products)) {
+        return console.error(`setProductsList expects an array of products as an argument, got an argument of type ${typeof products} instead`);
+      }
+      const allowedProducts = window.Pelcro.product.list();
+      const validProducts = products.filter(product => {
+        const isValidProduct = allowedProducts.some(allowedProduct => allowedProduct.id === (product === null || product === void 0 ? void 0 : product.id) && allowedProduct.name === (product === null || product === void 0 ? void 0 : product.name));
+        if (!isValidProduct) {
+          console.warn(`setProductsList expects an array of products that exist in the list of valid products (window.Pelcro.product.list()), but it recieved a product which doesn't exist in that list:`, product);
+        }
+        return isValidProduct;
+      });
+      this.set({
+        productsList: validProducts
+      });
+    });
     _defineProperty$3(this, "setProduct", id => {
       const product = window.Pelcro.product.getById(id);
       if (!product) return console.error("invalid product id");
@@ -6370,10 +6426,12 @@ class PelcroCallbacks {
 }
-const initialState$i = {
+var _window$Pelcro$produc, _window$Pelcro;
+const initialState$j = {
   // View
   view: null,
   // Plans
+  productsList: (_window$Pelcro$produc = (_window$Pelcro = window.Pelcro) === null || _window$Pelcro === void 0 ? void 0 : _window$Pelcro.product.list()) !== null && _window$Pelcro$produc !== void 0 ? _window$Pelcro$produc : [],
   product: null,
   plan: null,
   isGift: false,
@@ -6400,7 +6458,7 @@ const createPelcroStore = () => createStore(middleware_3((set, get) => {
   return {
     // Store setter
     set,
-    ...initialState$i,
+    ...initialState$j,
     // State actions
     ...actions,
     // Callbacks
@@ -6755,6 +6813,30 @@ function userMustVerifyEmail() {
   const isUserEmailVerified = (_window$Pelcro$user$r9 = (_window$Pelcro$user$r10 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r10 === void 0 ? void 0 : _window$Pelcro$user$r10.email_confirm) !== null && _window$Pelcro$user$r9 !== void 0 ? _window$Pelcro$user$r9 : false;
   return window.Pelcro.user.isAuthenticated() && isEmailVerificationEnabled && !isUserEmailVerified;
 }
+function getRenewableProducts() {
+  var _window$Pelcro$subscr, _window$Pelcro$subscr2;
+  const renewableSubs = (_window$Pelcro$subscr = (_window$Pelcro$subscr2 = window.Pelcro.subscription.list()) === null || _window$Pelcro$subscr2 === void 0 ? void 0 : _window$Pelcro$subscr2.filter(sub => sub.status === "active" && sub.cancel_at_period_end === 1)) !== null && _window$Pelcro$subscr !== void 0 ? _window$Pelcro$subscr : [];
+  const renewableProductsIds = [...new Set(renewableSubs.map(sub => sub.plan.product.id))];
+  const renewablePlansIds = [...new Set(renewableSubs.map(sub => sub.plan.id))];
+  const {
+    productsList
+  } = usePelcro.getStore();
+  return productsList.map(product => {
+    if (renewableProductsIds.includes(product.id)) {
+      const renewablePlans = getRenewablePlansOnly(product);
+      return { ...product,
+        plans: renewablePlans
+      };
+    }
+  }).filter(product => product);
+  function getRenewablePlansOnly(product) {
+    var _product$plans$filter, _product$plans;
+    return (_product$plans$filter = product === null || product === void 0 ? void 0 : (_product$plans = product.plans) === null || _product$plans === void 0 ? void 0 : _product$plans.filter(plan => renewablePlansIds.includes(plan.id))) !== null && _product$plans$filter !== void 0 ? _product$plans$filter : [];
+  }
+}
 const resources = {
   en: {
@@ -6779,7 +6861,8 @@ const resources = {
     dashboard: dashboard_en,
     select: select_en,
     notification: notification_en,
-    invoiceDetails: invoiceDetails_en
+    invoiceDetails: invoiceDetails_en,
+    subscriptionOptions: subscriptionOptions_en
   },
   fr: {
     common: common_fr,
@@ -6803,7 +6886,8 @@ const resources = {
     dashboard: dashboard_fr,
     select: select_fr,
     notification: notification_fr,
-    invoiceDetails: invoiceDetails_fr
+    invoiceDetails: invoiceDetails_fr,
+    subscriptionOptions: subscriptionOptions_fr
   }
 }; // set UI language to the page language or default to the language in site settings
@@ -7094,8 +7178,8 @@ const saveToMetadataButton = new SaveToMetadataButtonClass();
 let e={data:""},t=t=>"undefined"!=typeof window?((t?t.querySelector("#_goober"):window._goober)||Object.assign((t||document.head).appendChild(document.createElement("style")),{innerHTML:" ",id:"_goober"})).firstChild:t||e,l=/(?:([\u0080-\uFFFF\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(})/g,a=/\/\*[^]*?\*\/|\s\s+|\n/g,n=(e,t)=>{let r,l="",a="",o="";for(let c in e){let s=e[c];"object"==typeof s?(r=t?t.replace(/([^,])+/g,e=>c.replace(/([^,])+/g,t=>/&/.test(t)?t.replace(/&/g,e):e?e+" "+t:t)):c,a+="@"==c[0]?"f"==c[1]?n(s,c):c+"{"+n(s,"k"==c[1]?"":t)+"}":n(s,r)):"@"==c[0]&&"i"==c[1]?l=c+" "+s+";":(c=c.replace(/[A-Z]/g,"-$&").toLowerCase(),o+=n.p?n.p(c,s):c+":"+s+";");}return o[0]?(r=t?t+"{"+o+"}":o,l+r+a):l+a},o={},c=e=>{let t="";for(let r in e)t+=r+("object"==typeof e[r]?c(e[r]):e[r]);return t},s=(e,t,r,s,i)=>{let p="object"==typeof e?c(e):e,u=o[p]||(o[p]=(e=>{let t=0,r=11;for(;t<e.length;)r=101*r+e.charCodeAt(t++)>>>0;return "go"+r})(p));if(!o[u]){let t="object"==typeof e?e:(e=>{let t,r=[{}];for(;t=l.exec(e.replace(a,""));)t[4]&&r.shift(),t[3]?r.unshift(r[0][t[3]]=r[0][t[3]]||{}):t[4]||(r[0][t[1]]=t[2]);return r[0]})(e);o[u]=n(i?{["@keyframes "+u]:t}:t,r?"":"."+u);}return ((e,t,r)=>{-1==t.data.indexOf(e)&&(t.data=r?e+t.data:t.data+e);})(o[u],t,s),u},i=(e,t,r)=>e.reduce((e,l,a)=>{let o=t[a];if(o&&o.call){let e=o(r),t=e&&e.props&&e.props.className||/^go/.test(e)&&e;o=t?"."+t:e&&"object"==typeof e?e.props?"":n(e,""):e;}return e+l+(null==o?"":o)},"");function p(e){let r=this||{},l=e.call?e(r.p):e;return s(l.unshift?l.raw?i(l,[].slice.call(arguments,1),r.p):l.reduce((e,t)=>t?Object.assign(e,t.call?t(r.p):t):e,{}):l,t(r.target),r.g,r.o,r.k)}let u,f,d;p.bind({g:1});let b=p.bind({k:1});function h(e,t,r,l){n.p=t,u=e,f=r,d=l;}function y(e,t){let r=this||{};return function(){let l=arguments;function a(n,o){let c=Object.assign({},n),s=c.className||a.className;r.p=Object.assign({theme:f&&f()},c),r.o=/ *go\d+/.test(s),c.className=p.apply(r,l)+(s?" "+s:""),t&&(c.ref=o);let i=c.as||e;return d&&i[0]&&d(c),u(i,c)}return t?t(a):a}}
-function _extends$z() {
-  _extends$z = Object.assign || function (target) {
+function _extends$A() {
+  _extends$A = Object.assign || function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
@@ -7109,7 +7193,7 @@ function _extends$z() {
     return target;
   };
-  return _extends$z.apply(this, arguments);
+  return _extends$A.apply(this, arguments);
 }
 function _taggedTemplateLiteralLoose(strings, raw) {
@@ -7199,7 +7283,7 @@ var clearFromRemoveQueue = function clearFromRemoveQueue(toastId) {
 var reducer = function reducer(state, action) {
   switch (action.type) {
     case ActionType.ADD_TOAST:
-      return _extends$z({}, state, {
+      return _extends$A({}, state, {
         toasts: [action.toast].concat(state.toasts).slice(0, TOAST_LIMIT)
       });
@@ -7209,9 +7293,9 @@ var reducer = function reducer(state, action) {
         clearFromRemoveQueue(action.toast.id);
       }
-      return _extends$z({}, state, {
+      return _extends$A({}, state, {
         toasts: state.toasts.map(function (t) {
-          return t.id === action.toast.id ? _extends$z({}, t, action.toast) : t;
+          return t.id === action.toast.id ? _extends$A({}, t, action.toast) : t;
         })
       });
@@ -7238,9 +7322,9 @@ var reducer = function reducer(state, action) {
         });
       }
-      return _extends$z({}, state, {
+      return _extends$A({}, state, {
         toasts: state.toasts.map(function (t) {
-          return t.id === toastId || toastId === undefined ? _extends$z({}, t, {
+          return t.id === toastId || toastId === undefined ? _extends$A({}, t, {
             visible: false
           }) : t;
         })
@@ -7248,28 +7332,28 @@ var reducer = function reducer(state, action) {
     case ActionType.REMOVE_TOAST:
       if (action.toastId === undefined) {
-        return _extends$z({}, state, {
+        return _extends$A({}, state, {
           toasts: []
         });
       }
-      return _extends$z({}, state, {
+      return _extends$A({}, state, {
         toasts: state.toasts.filter(function (t) {
           return t.id !== action.toastId;
         })
       });
     case ActionType.START_PAUSE:
-      return _extends$z({}, state, {
+      return _extends$A({}, state, {
         pausedAt: action.time
       });
     case ActionType.END_PAUSE:
       var diff = action.time - (state.pausedAt || 0);
-      return _extends$z({}, state, {
+      return _extends$A({}, state, {
         pausedAt: undefined,
         toasts: state.toasts.map(function (t) {
-          return _extends$z({}, t, {
+          return _extends$A({}, t, {
             pauseDuration: t.pauseDuration + diff
           });
         })
@@ -7316,12 +7400,12 @@ var useStore = function useStore(toastOptions) {
   var mergedToasts = state.toasts.map(function (t) {
     var _toastOptions$t$type, _toastOptions, _toastOptions$t$type2;
-    return _extends$z({}, toastOptions, toastOptions[t.type], t, {
+    return _extends$A({}, toastOptions, toastOptions[t.type], t, {
       duration: t.duration || ((_toastOptions$t$type = toastOptions[t.type]) == null ? void 0 : _toastOptions$t$type.duration) || ((_toastOptions = toastOptions) == null ? void 0 : _toastOptions.duration) || defaultTimeouts[t.type],
-      style: _extends$z({}, toastOptions.style, (_toastOptions$t$type2 = toastOptions[t.type]) == null ? void 0 : _toastOptions$t$type2.style, t.style)
+      style: _extends$A({}, toastOptions.style, (_toastOptions$t$type2 = toastOptions[t.type]) == null ? void 0 : _toastOptions$t$type2.style, t.style)
     });
   });
-  return _extends$z({}, state, {
+  return _extends$A({}, state, {
     toasts: mergedToasts
   });
 };
@@ -7331,7 +7415,7 @@ var createToast = function createToast(message, type, opts) {
     type = 'blank';
   }
-  return _extends$z({
+  return _extends$A({
     createdAt: Date.now(),
     visible: true,
     type: type,
@@ -7381,14 +7465,14 @@ toast.remove = function (toastId) {
 };
 toast.promise = function (promise, msgs, opts) {
-  var id = toast.loading(msgs.loading, _extends$z({}, opts, opts == null ? void 0 : opts.loading));
+  var id = toast.loading(msgs.loading, _extends$A({}, opts, opts == null ? void 0 : opts.loading));
   promise.then(function (p) {
-    toast.success(resolveValue(msgs.success, p), _extends$z({
+    toast.success(resolveValue(msgs.success, p), _extends$A({
       id: id
     }, opts, opts == null ? void 0 : opts.success));
     return p;
   })["catch"](function (e) {
-    toast.error(resolveValue(msgs.error, e), _extends$z({
+    toast.error(resolveValue(msgs.error, e), _extends$A({
       id: id
     }, opts, opts == null ? void 0 : opts.error));
   });
@@ -7727,7 +7811,7 @@ var ToastBar = /*#__PURE__*/React.memo(function (_ref2) {
   var message = React.createElement(Message, Object.assign({}, toast.ariaProps), resolveValue(toast.message, toast));
   return React.createElement(ToastBarBase, {
     className: toast.className,
-    style: _extends$z({}, animationStyle, style, toast.style)
+    style: _extends$A({}, animationStyle, style, toast.style)
   }, typeof children === 'function' ? children({
     icon: icon,
     message: message
@@ -7757,7 +7841,7 @@ var getPositionStyle = function getPositionStyle(position, offset) {
   } : position.includes('right') ? {
     justifyContent: 'flex-end'
   } : {};
-  return _extends$z({
+  return _extends$A({
     left: 0,
     right: 0,
     display: 'flex',
@@ -7784,7 +7868,7 @@ var Toaster = function Toaster(_ref) {
       handlers = _useToaster.handlers;
   return React.createElement("div", {
-    style: _extends$z({
+    style: _extends$A({
       position: 'fixed',
       zIndex: 9999,
       top: DEFAULT_OFFSET,
@@ -7819,82 +7903,82 @@ var Toaster = function Toaster(_ref) {
   }));
 };
-var _path$w;
+var _path$x;
-function _extends$y() { _extends$y = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$y.apply(this, arguments); }
+function _extends$z() { _extends$z = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$z.apply(this, arguments); }
 function SvgCheckSolid(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$y({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$z({
     xmlns: "http://www.w3.org/2000/svg",
     className: "h-5 w-5",
     viewBox: "0 0 20 20",
     fill: "currentColor"
-  }, props), _path$w || (_path$w = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$x || (_path$x = /*#__PURE__*/React__namespace.createElement("path", {
     fillRule: "evenodd",
     d: "M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z",
     clipRule: "evenodd"
   })));
 }
-var _path$v;
+var _path$w;
-function _extends$x() { _extends$x = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$x.apply(this, arguments); }
+function _extends$y() { _extends$y = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$y.apply(this, arguments); }
 function SvgXIcon(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$x({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$y({
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20",
     fill: "currentColor"
-  }, props), _path$v || (_path$v = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$w || (_path$w = /*#__PURE__*/React__namespace.createElement("path", {
     fill: "evenodd",
     d: "M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z",
     clipRule: "evenodd"
   })));
 }
-var _path$u;
+var _path$v;
-function _extends$w() { _extends$w = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$w.apply(this, arguments); }
+function _extends$x() { _extends$x = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$x.apply(this, arguments); }
 function SvgXIconSolid(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$w({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$x({
     className: "plc-w-4 plc-h-4",
     fill: "currentColor",
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 100 100"
-  }, props), _path$u || (_path$u = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$v || (_path$v = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M94.842 48.408c0 24.852-20.148 44.999-45.002 44.999-24.851 0-44.997-20.146-44.997-44.999 0-24.854 20.146-45 44.997-45 24.853 0 45.002 20.146 45.002 45zM71.073 64.841L54.73 48.497l16.344-16.344-4.979-4.979-16.343 16.345-16.343-16.344-4.799 4.799 16.344 16.344L28.61 64.661l4.979 4.978 16.344-16.344 16.343 16.344 4.797-4.798z"
   })));
 }
-var _path$t;
+var _path$u;
-function _extends$v() { _extends$v = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$v.apply(this, arguments); }
+function _extends$w() { _extends$w = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$w.apply(this, arguments); }
 function SvgExclamation(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$v({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$w({
     className: "plc-w-4 plc-h-4 plc-mr-1",
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20",
     fill: "currentColor"
-  }, props), _path$t || (_path$t = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$u || (_path$u = /*#__PURE__*/React__namespace.createElement("path", {
     fillRule: "evenodd",
     d: "M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7 4a1 1 0 11-2 0 1 1 0 012 0zm-1-9a1 1 0 00-1 1v4a1 1 0 102 0V6a1 1 0 00-1-1z",
     clipRule: "evenodd"
   })));
 }
-var _path$s, _path2$4;
+var _path$t, _path2$4;
-function _extends$u() { _extends$u = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$u.apply(this, arguments); }
+function _extends$v() { _extends$v = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$v.apply(this, arguments); }
 function SvgSpinner(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$u({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$v({
     className: "plc-animate-spin",
     viewBox: "0 0 24 24",
     fill: "currentColor",
     xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path$s || (_path$s = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$t || (_path$t = /*#__PURE__*/React__namespace.createElement("path", {
     opacity: 0.2,
     fill: "evenodd",
     clipRule: "evenodd",
@@ -8184,7 +8268,9 @@ const init$1 = () => {
           return switchToAddressView();
         });
       } else {
-        pelcroSubscribeButtonsByClass[j].addEventListener("click", () => switchView("plan-select"));
+        pelcroSubscribeButtonsByClass[j].addEventListener("click", () => {
+          return switchView("subscription-options");
+        });
       }
     }
   }
@@ -8346,7 +8432,8 @@ function Link({
 const init = () => {
   const {
     switchView,
-    set
+    set,
+    setProductsList
   } = usePelcro.getStore();
   const entitlementsProtectedElements = document.querySelectorAll("[data-pelcro-entitlements]");
@@ -8397,7 +8484,8 @@ const init = () => {
           }
           notify.dismiss(NOTIFICATION_ID);
-          switchView("_plan-select-entitlements");
+          setProductsList(window.Pelcro.product.getByEntitlements(entitlements));
+          switchView("plan-select");
         }
       }, "Subscribe"), "now to get full page access.")), {
         className: "pelcro-notification-entitlement",
@@ -8783,7 +8871,7 @@ const loadPaymentSDKs = () => {
   } // Load Vantiv SDKs
-  const supportsVantiv = Boolean(window.Pelcro.site.read().vantiv_pay_page_id);
+  const supportsVantiv = Boolean(window.Pelcro.site.read().vantiv_gateway_settings);
   if (supportsVantiv) {
     if (!window.jQuery) {
@@ -8791,7 +8879,10 @@ const loadPaymentSDKs = () => {
     }
     if (!window.EprotectIframeClient) {
-      window.Pelcro.helpers.loadSDK("https://request.eprotect.vantivprelive.com/eProtect/js/eProtect-iframe-client.min.js", "vantiv-eprotect-sdk");
+      const PRELIVE_URL = "https://request.eprotect.vantivprelive.com/eProtect/js/eProtect-iframe-client.min.js";
+      const PRODUCTION_URL = "https://request.eprotect.vantivcnp.com/eProtect/js/eProtect-iframe-client4.min.js";
+      const scriptUrlToUse = window.Pelcro.site.read().vantiv_gateway_settings.environment === "production" ? PRODUCTION_URL : PRELIVE_URL;
+      window.Pelcro.helpers.loadSDK(scriptUrlToUse, "vantiv-eprotect-sdk");
     }
   }
 };
@@ -9225,7 +9316,7 @@ const PelcroModalController = ({
     type
   }) => (type === null || type === void 0 ? void 0 : type.viewId) === "dashboard-open"), React__default['default'].Children.map(children, child => child).find(({
     type
-  }) => (type === null || type === void 0 ? void 0 : type.viewId) === "notification"), view === "_plan-select-entitlements" && React__default['default'].Children.map(children, child => child).find(({
+  }) => (type === null || type === void 0 ? void 0 : type.viewId) === "notification"), view === "_plan-select-renew" && React__default['default'].Children.map(children, child => child).find(({
     type
   }) => (type === null || type === void 0 ? void 0 : type.viewId) === "plan-select"), React__default['default'].Children.map(children, child => child).find(({
     type
@@ -9506,8 +9597,10 @@ const LOAD_PAYMENT_METHODS = "LOAD_PAYMENT_METHODS";
 const GET_NEWSLETTERS_FETCH = "GET_NEWSLETTERS_FETCH";
 const GET_NEWSLETTERS_SUCCESS = "GET_NEWSLETTERS_SUCCESS";
 const SWITCH_TO_UPDATE = "SWITCH_TO_UPDATE";
+const SWITCH_TO_RENEW = "SWITCH_TO_RENEW";
+const SWITCH_TO_NEW = "SWITCH_TO_NEW";
-const initialState$h = {
+const initialState$i = {
   email: "",
   password: "",
   emailError: null,
@@ -9518,10 +9611,10 @@ const initialState$h = {
     content: ""
   }
 };
-const store$h = /*#__PURE__*/React.createContext(initialState$h);
+const store$i = /*#__PURE__*/React.createContext(initialState$i);
 const {
-  Provider: Provider$h
-} = store$h;
+  Provider: Provider$i
+} = store$i;
 const LoginContainer = ({
   style,
@@ -9628,7 +9721,7 @@ const LoginContainer = ({
         });
       case RESET_LOGIN_FORM:
-        return initialState$h;
+        return initialState$i;
       case DISABLE_LOGIN_BUTTON:
         return lib_7({ ...state,
@@ -9646,12 +9739,12 @@ const LoginContainer = ({
       default:
         return state;
     }
-  }, initialState$h);
+  }, initialState$i);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-login-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$h, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$i, {
     value: {
       state,
       dispatch
@@ -9659,12 +9752,12 @@ const LoginContainer = ({
   }, children.length ? children.map((child, i) => {
     if (child) {
       return /*#__PURE__*/React__default['default'].cloneElement(child, {
-        store: store$h,
+        store: store$i,
         key: i
       });
     }
   }) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$h
+    store: store$i
   })));
 };
@@ -9909,7 +10002,7 @@ const LoginButton = ({
       buttonDisabled
     },
     dispatch
-  } = React.useContext(store$h);
+  } = React.useContext(store$i);
   const {
     t
   } = useTranslation("login");
@@ -9930,23 +10023,23 @@ const LoginButton = ({
 };
 const LoginEmail = props => /*#__PURE__*/React__default['default'].createElement(Email, Object.assign({
-  store: store$h
+  store: store$i
 }, props));
 const LoginPassword = props => /*#__PURE__*/React__default['default'].createElement(Password, Object.assign({
-  store: store$h
+  store: store$i
 }, props));
-var _path$r;
+var _path$s;
-function _extends$t() { _extends$t = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$t.apply(this, arguments); }
+function _extends$u() { _extends$u = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$u.apply(this, arguments); }
 function SvgCheck(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$t({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$u({
     xmlns: "http://www.w3.org/2000/svg",
     fill: "currentColor",
     viewBox: "0 0 20 20"
-  }, props), _path$r || (_path$r = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$s || (_path$s = /*#__PURE__*/React__namespace.createElement("path", {
     fillRule: "evenodd",
     d: "M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z",
     clipRule: "evenodd"
@@ -10011,7 +10104,7 @@ var facebookLoginRenderProps = createCommonjsModule(function (module, exports) {
 var FacebookLogin = unwrapExports(facebookLoginRenderProps);
 facebookLoginRenderProps.FacebookLogin;
-const initialState$g = {
+const initialState$h = {
   email: "",
   password: "",
   emailError: null,
@@ -10028,10 +10121,10 @@ const initialState$g = {
     content: ""
   }
 };
-const store$g = /*#__PURE__*/React.createContext(initialState$g);
+const store$h = /*#__PURE__*/React.createContext(initialState$h);
 const {
-  Provider: Provider$g
-} = store$g;
+  Provider: Provider$h
+} = store$h;
 const RegisterContainer = ({
   style,
@@ -10214,7 +10307,7 @@ const RegisterContainer = ({
         });
       case RESET_LOGIN_FORM:
-        return initialState$g;
+        return initialState$h;
       case DISABLE_REGISTRATION_BUTTON:
         return lib_7({ ...state,
@@ -10232,12 +10325,12 @@ const RegisterContainer = ({
       default:
         return state;
     }
-  }, initialState$g);
+  }, initialState$h);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-register-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$g, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$h, {
     value: {
       state,
       dispatch
@@ -10245,12 +10338,12 @@ const RegisterContainer = ({
   }, children.length ? children.map((child, i) => {
     if (child) {
       return /*#__PURE__*/React__default['default'].cloneElement(child, {
-        store: store$g,
+        store: store$h,
         key: i
       });
     }
   }) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$g
+    store: store$h
   })));
 };
 /**
@@ -10265,15 +10358,15 @@ function hasSecurityTokenEnabled$1() {
   return hasSecuritySdkLoaded;
 }
-var _path$q;
+var _path$r;
-function _extends$s() { _extends$s = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$s.apply(this, arguments); }
+function _extends$t() { _extends$t = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$t.apply(this, arguments); }
 function SvgFacebookLogo(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$s({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$t({
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "88.428 12.828 107.543 207.085"
-  }, props), _path$q || (_path$q = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$r || (_path$r = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M158.232 219.912v-94.461h31.707l4.747-36.813h-36.454V65.134c0-10.658 2.96-17.922 18.245-17.922l19.494-.009V14.278c-3.373-.447-14.944-1.449-28.406-1.449-28.106 0-47.348 17.155-47.348 48.661v27.149H88.428v36.813h31.788v94.461l38.016-.001z",
     fill: "#3c5a9a"
   })));
@@ -10290,10 +10383,10 @@ const FacebookLoginButton = ({
   const facebookLoginEnabled = (_window$Pelcro$site$r = window.Pelcro.site.read()) === null || _window$Pelcro$site$r === void 0 ? void 0 : _window$Pelcro$site$r.facebook_app_id;
   const {
     dispatch: loginDispatch
-  } = React.useContext(store$h);
+  } = React.useContext(store$i);
   const {
     dispatch: registerDispatch
-  } = React.useContext(store$g);
+  } = React.useContext(store$h);
   const onSuccess = facebookUser => {
     loginDispatch === null || loginDispatch === void 0 ? void 0 : loginDispatch({
@@ -10346,15 +10439,15 @@ var googleLogin = createCommonjsModule(function (module, exports) {
 unwrapExports(googleLogin);
 var googleLogin_1 = googleLogin.GoogleLogin;
-var _path$p, _path2$3, _path3$1, _path4;
+var _path$q, _path2$3, _path3$1, _path4;
-function _extends$r() { _extends$r = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$r.apply(this, arguments); }
+function _extends$s() { _extends$s = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$s.apply(this, arguments); }
 function SvgGoogleLogo(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$r({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$s({
     viewBox: "0 0 24 24",
     xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path$p || (_path$p = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$q || (_path$q = /*#__PURE__*/React__namespace.createElement("path", {
     fill: "#4285F4",
     d: "M23.745 12.27c0-.79-.07-1.54-.19-2.27h-11.3v4.51h6.47c-.29 1.48-1.14 2.73-2.4 3.58v3h3.86c2.26-2.09 3.56-5.17 3.56-8.82z"
   })), _path2$3 || (_path2$3 = /*#__PURE__*/React__namespace.createElement("path", {
@@ -10380,10 +10473,10 @@ const GoogleLoginButton = ({
   const googleLoginEnabled = (_window$Pelcro$site$r = window.Pelcro.site.read()) === null || _window$Pelcro$site$r === void 0 ? void 0 : _window$Pelcro$site$r.google_app_id;
   const {
     dispatch: loginDispatch
-  } = React.useContext(store$h);
+  } = React.useContext(store$i);
   const {
     dispatch: registerDispatch
-  } = React.useContext(store$g);
+  } = React.useContext(store$h);
   const onSuccess = response => {
     var _response$getAuthResp, _profile$getEmail, _profile$getGivenName, _profile$getFamilyNam, _profile$getEmail2, _profile$getGivenName2, _profile$getFamilyNam2;
@@ -10431,15 +10524,15 @@ const GoogleLoginButton = ({
   }) : null;
 };
-var _path$o;
+var _path$p;
-function _extends$q() { _extends$q = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$q.apply(this, arguments); }
+function _extends$r() { _extends$r = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$r.apply(this, arguments); }
 function SvgAuth0Logo(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$q({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$r({
     viewBox: "0 0 256 285",
     xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path$o || (_path$o = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$p || (_path$p = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M220.412 0h-92.415l28.562 89.006h92.416l-74.77 53.077 28.57 89.511c48.128-35.06 63.854-88.12 46.208-142.588L220.413 0zM7.018 89.006h92.416L127.997 0H35.589L7.019 89.006c-17.655 54.468-1.92 107.529 46.207 142.588l28.563-89.51-74.77-53.078zm46.208 142.588l74.77 52.97 74.77-52.97-74.77-53.847-74.77 53.847z"
   })));
 }
@@ -10479,10 +10572,10 @@ const Auth0LoginButton = ({
   }, [auth0Enabled, auth0Loaded]);
   const {
     dispatch: loginDispatch
-  } = React.useContext(store$h);
+  } = React.useContext(store$i);
   const {
     dispatch: registerDispatch
-  } = React.useContext(store$g);
+  } = React.useContext(store$h);
   function handleClick() {
     var _auth0InstanceRef$cur, _auth0InstanceRef$cur2, _auth0InstanceRef$cur3;
@@ -10615,15 +10708,15 @@ function LoginView(props) {
   }, /*#__PURE__*/React__default['default'].createElement(GoogleLoginButton, null), /*#__PURE__*/React__default['default'].createElement(FacebookLoginButton, null), /*#__PURE__*/React__default['default'].createElement(Auth0LoginButton, null))))));
 }
-var _path$n, _path2$2, _path3;
+var _path$o, _path2$2, _path3;
-function _extends$p() { _extends$p = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$p.apply(this, arguments); }
+function _extends$q() { _extends$q = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$q.apply(this, arguments); }
 function SvgPelcroAuthorship(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$p({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$q({
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 -80.652 497.072 179.991"
-  }, props), _path$n || (_path$n = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$o || (_path$o = /*#__PURE__*/React__namespace.createElement("path", {
     fill: "none",
     stroke: "#4a4a4a",
     d: "M487.89 42.299c0 13.158-10.671 23.829-23.829 23.829H37.074c-13.162 0-23.832-10.671-23.832-23.829v-63.552c0-13.158 10.67-23.831 23.832-23.831H464.06c13.158 0 23.829 10.672 23.829 23.831l.001 63.552z"
@@ -10770,11 +10863,11 @@ function LoginModal({
 LoginModal.viewId = "login";
 const RegisterEmail = props => /*#__PURE__*/React__default['default'].createElement(Email, Object.assign({
-  store: store$g
+  store: store$h
 }, props));
 const RegisterPassword = props => /*#__PURE__*/React__default['default'].createElement(Password, Object.assign({
-  store: store$g
+  store: store$h
 }, props));
 const RegisterButton = ({
@@ -10794,7 +10887,7 @@ const RegisterButton = ({
       buttonDisabled
     },
     dispatch
-  } = React.useContext(store$g);
+  } = React.useContext(store$h);
   const {
     t
   } = useTranslation("register");
@@ -10932,7 +11025,7 @@ function FirstName({
 }
 const RegisterFirstName = props => /*#__PURE__*/React__default['default'].createElement(FirstName, Object.assign({
-  store: store$g
+  store: store$h
 }, props));
 function LastName({
@@ -10963,7 +11056,7 @@ function LastName({
 }
 const RegisterLastName = props => /*#__PURE__*/React__default['default'].createElement(LastName, Object.assign({
-  store: store$g
+  store: store$h
 }, props));
 /**
@@ -11087,7 +11180,7 @@ function TextInput({
 const RegisterTextInput = props => {
   return /*#__PURE__*/React__default['default'].createElement(TextInput, Object.assign({}, props, {
-    store: store$g
+    store: store$h
   }));
 };
@@ -11234,6 +11327,7 @@ function SelectModalWithHook(props) {
     (_props$onDisplay = props.onDisplay) === null || _props$onDisplay === void 0 ? void 0 : _props$onDisplay.call(props);
   }, []);
   const {
+    productsList,
     isGift,
     plan,
     product,
@@ -11243,11 +11337,12 @@ function SelectModalWithHook(props) {
     view,
     set
   } = usePelcro();
-  const entitlementsProtectedElements = document.querySelectorAll("[data-pelcro-entitlements]");
-  const entitlements = entitlementsProtectedElements.length > 0 ? getEntitlementsFromElem(entitlementsProtectedElements[0]) : null;
+  const isRenewingSub = view === "_plan-select-renew";
   return /*#__PURE__*/React__default['default'].createElement(SelectModalWithTrans, {
+    productsList: productsList,
     isGift: isGift,
-    disableGifting: isRenewingGift,
+    disableGifting: isRenewingGift || isRenewingSub,
+    isRenewingSub: isRenewingSub,
     plan: plan,
     product: product,
     onClose: () => {
@@ -11261,8 +11356,10 @@ function SelectModalWithHook(props) {
       plan,
       isGift
     }),
-    setView: switchView,
-    matchingEntitlements: view === "_plan-select-entitlements" ? entitlements : null
+    setSubscriptionIdToRenew: subscriptionIdToRenew => set({
+      subscriptionIdToRenew
+    }),
+    setView: switchView
   });
 }
 SelectModalWithHook.viewId = "plan-select";
@@ -11294,10 +11391,10 @@ class SelectModal extends React.Component {
         });
       }
-      if (this.state.productList.length === 1) {
+      if (this.props.productsList.length === 1) {
         this.setState({
-          product: this.state.productList[0],
-          planList: this.state.productList[0].plans,
+          product: this.props.productsList[0],
+          planList: this.props.productsList[0].plans,
           mode: "plan"
         });
       }
@@ -11314,7 +11411,7 @@ class SelectModal extends React.Component {
     });
     _defineProperty$3(this, "onProductChange", e => {
-      const product = window.Pelcro.product.list()[e.target.selectedIndex];
+      const product = productsList[e.target.selectedIndex];
       this.setState({
         product: product,
         plan: product.plans[0]
@@ -11380,7 +11477,7 @@ class SelectModal extends React.Component {
     _defineProperty$3(this, "renderProducts", () => {
       const userDidSelectProduct = Boolean(this.state.mode === "plan");
-      const productsToShow = userDidSelectProduct ? [this.state.product] : this.state.productList;
+      const productsToShow = userDidSelectProduct ? [this.state.product] : this.props.productsList;
       return productsToShow.map((product, index) => {
         return this.renderOneProduct(product, index);
       });
@@ -11393,7 +11490,7 @@ class SelectModal extends React.Component {
         return this.renderOneProduct(this.state.product);
       }
-      const [productsThatMatchArticleTag, allProductsMinusMatched] = productsWithMatchedTaggedFirst(); // Render normal products if there are no available matching products
+      const [productsThatMatchArticleTag, allProductsMinusMatched] = productsWithMatchedTaggedFirst(this.props.productsList); // Render normal products if there are no available matching products
       if (!(productsThatMatchArticleTag !== null && productsThatMatchArticleTag !== void 0 && productsThatMatchArticleTag.length)) {
         return this.renderProducts();
@@ -11409,10 +11506,7 @@ class SelectModal extends React.Component {
         className: "plc-text-sm plc-font-semibold"
       }, this.locale("labels.restrictiveArticles.or")), allProductsMinusMatched.map((product, index) => this.renderOneProduct(product, index))));
-      function productsWithMatchedTaggedFirst() {
-        var _window$Pelcro$produc;
-        const allProducts = (_window$Pelcro$produc = window.Pelcro.product.list()) !== null && _window$Pelcro$produc !== void 0 ? _window$Pelcro$produc : [];
+      function productsWithMatchedTaggedFirst(allProducts) {
         const productsThatMatchArticleTag = window.Pelcro.product.getByMatchingPageTags();
         const allProductsMinusMatched = allProducts.filter(product => !productsThatMatchArticleTag.some(matchedProduct => matchedProduct.id === product.id));
         return [productsThatMatchArticleTag, allProductsMinusMatched];
@@ -11446,7 +11540,7 @@ class SelectModal extends React.Component {
     _defineProperty$3(this, "selectProduct", e => {
       const id = e.target.dataset.key;
-      for (const product of this.state.productList) {
+      for (const product of this.props.productsList) {
         if (+product.id === +id) {
           var _this$state$plan;
@@ -11499,6 +11593,14 @@ class SelectModal extends React.Component {
     _defineProperty$3(this, "submitOption", () => {
       this.props.setProductAndPlan(this.state.product, this.state.plan, this.state.isGift);
+      if (this.props.isRenewingSub) {
+        var _matchingSub$id;
+        const matchingSub = window.Pelcro.subscription.list().find(sub => sub.plan.id === this.state.plan.id && sub.status === "active" && sub.cancel_at_period_end === 1);
+        this.props.setSubscriptionIdToRenew((_matchingSub$id = matchingSub === null || matchingSub === void 0 ? void 0 : matchingSub.id) !== null && _matchingSub$id !== void 0 ? _matchingSub$id : null);
+      }
       const {
         product,
         isGift
@@ -11536,8 +11638,7 @@ class SelectModal extends React.Component {
       plan: {},
       isGift: props.isGift,
       disabled: true,
-      mode: "product",
-      productList: props.matchingEntitlements ? window.Pelcro.product.getByEntitlements(props.matchingEntitlements) : window.Pelcro.product.list()
+      mode: "product"
     };
     this.product = this.props.product || window.Pelcro.paywall.getProduct();
     this.locale = this.props.t;
@@ -11545,7 +11646,7 @@ class SelectModal extends React.Component {
   }
   render() {
-    var _window$Pelcro$produc2, _window$Pelcro$produc3, _window$Pelcro$site$r;
+    var _this$props$productsL, _this$props$productsL2, _window$Pelcro$site$r;
     const {
       disableGifting
@@ -11579,7 +11680,7 @@ class SelectModal extends React.Component {
       className: "plc-mb-6 plc-text-center plc-text-gray-900 pelcro-title-wrapper"
     }, /*#__PURE__*/React__default['default'].createElement("h4", {
       className: "plc-text-2xl plc-font-semibold"
-    }, this.product && this.product.paywall.select_title || ((_window$Pelcro$produc2 = window.Pelcro.product.list()[0]) === null || _window$Pelcro$produc2 === void 0 ? void 0 : _window$Pelcro$produc2.paywall.select_title)), /*#__PURE__*/React__default['default'].createElement("p", null, this.product && this.product.paywall.select_subtitle || ((_window$Pelcro$produc3 = window.Pelcro.product.list()[0]) === null || _window$Pelcro$produc3 === void 0 ? void 0 : _window$Pelcro$produc3.paywall.select_subtitle))), /*#__PURE__*/React__default['default'].createElement("div", {
+    }, this.product && this.product.paywall.select_title || ((_this$props$productsL = this.props.productsList[0]) === null || _this$props$productsL === void 0 ? void 0 : _this$props$productsL.paywall.select_title)), /*#__PURE__*/React__default['default'].createElement("p", null, this.product && this.product.paywall.select_subtitle || ((_this$props$productsL2 = this.props.productsList[0]) === null || _this$props$productsL2 === void 0 ? void 0 : _this$props$productsL2.paywall.select_subtitle))), /*#__PURE__*/React__default['default'].createElement("div", {
       className: "pelcro-select-products-wrapper"
     }, (_window$Pelcro$site$r = window.Pelcro.site.read()) !== null && _window$Pelcro$site$r !== void 0 && _window$Pelcro$site$r.restrictive_paywall_metatags_enabled ? this.renderMatchingProductsFirst() : this.renderProducts()), this.state.mode === "plan" && /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
       className: "plc-overflow-y-scroll plc-max-h-72 pelcro-select-plans-wrapper"
@@ -12743,20 +12844,21 @@ var es_12 = es.injectStripe;
 var es_13 = es.StripeProvider;
 /**
- * @TODO: All subscription related business logic should end up moving
+ * @TODO: All payment related business logic should end up moving
  * to this service, and out of react components.
  */
 /**
- * Enum for subscription types
+ * Enum for payment types
  * @readonly
  * @enum {string}
  */
-const SUBSCRIPTION_TYPES = {
+const PAYMENT_TYPES = {
   CREATE_SUBSCRIPTION: "CREATE_SUBSCRIPTION",
   CREATE_GIFTED_SUBSCRIPTION: "CREATE_GIFTED_SUBSCRIPTION",
   RENEW_SUBSCRIPTION: "RENEW_SUBSCRIPTION",
   RENEW_GIFTED_SUBSCRIPTION: "RENEW_GIFTED_SUBSCRIPTION",
+  PURCHASE_ECOMMERCE_ORDER: "PURCHASE_ECOMMERCE_ORDER",
   PAY_INVOICE: "PAY_INVOICE"
 };
@@ -12764,9 +12866,8 @@ var _isPaymentGatewayInvalid = /*#__PURE__*/new WeakMap();
 var _generateUserError = /*#__PURE__*/new WeakMap();
-class Subscription {
+class Payment {
   /**
-   * Subscription service  constructor
    * @param {(StripeGateway|PaypalGateway|VantivGateway)} paymentGateway
    */
   constructor(paymentGateway) {
@@ -12778,7 +12879,7 @@ class Subscription {
       if (!options.type) {
         callback(_classPrivateFieldGet(this, _generateUserError).call(this), null);
-        return console.error("No subscription type provided");
+        return console.error("No payment type provided");
       } // delegate execution to paymentgateway
@@ -12796,21 +12897,21 @@ class Subscription {
       writable: true,
       value: () => {
         return {
-          error: new Error("An error has occured in the subscription service, please try again later")
+          error: new Error("An error has occured in the payment service, please try again later")
         };
       }
     });
     if (_classPrivateFieldGet(this, _isPaymentGatewayInvalid).call(this, paymentGateway)) {
       this.paymentGateway = null;
-      console.error("Incompatible subscription gateway");
+      console.error("Incompatible payment gateway");
     } else {
       this.paymentGateway = paymentGateway;
     }
   }
   /**
-   * @typedef subscriptionOptions
-   * @property {SUBSCRIPTION_TYPES} type
+   * @typedef paymentOptions
+   * @property {PAYMENT_TYPES} type
    * @property {string} token
    * @property {object} plan
    * @property {object} [product]
@@ -12821,6 +12922,7 @@ class Subscription {
    * @property {string} addressId
    * @property {number} invoiceId
    * @property {boolean} isExistingSource
+   * @property {Array} items
    */
   /**
@@ -12831,8 +12933,8 @@ class Subscription {
    */
   /**
-   * Subscription execution method
-   * @param {subscriptionOptions} options subscription options
+   * Payment execution method
+   * @param {paymentOptions} options payment options
    * @param {executeCallback} callback
    * @return {void}
    */
@@ -12845,7 +12947,7 @@ const PAYMENT_GATEWAYS_ENUM = {
   vantiv: "vantiv"
 };
 /**
- * Subscription Strategies
+ * Payment Strategies
  */
 /**
@@ -12862,6 +12964,8 @@ var _renewSubscription = /*#__PURE__*/new WeakMap();
 var _renewGiftedSubscription = /*#__PURE__*/new WeakMap();
+var _purchaseEcommerceOrder = /*#__PURE__*/new WeakMap();
 var _payInvoice = /*#__PURE__*/new WeakMap();
 class StripeGateway {
@@ -12872,7 +12976,7 @@ class StripeGateway {
     });
     _defineProperty$3(this, "execute", (options, callback) => {
-      const types = SUBSCRIPTION_TYPES;
+      const types = PAYMENT_TYPES;
       switch (options.type) {
         case types.CREATE_SUBSCRIPTION:
@@ -12887,11 +12991,14 @@ class StripeGateway {
         case types.RENEW_GIFTED_SUBSCRIPTION:
           return _classPrivateFieldGet(this, _renewGiftedSubscription).call(this, options, callback);
+        case types.PURCHASE_ECOMMERCE_ORDER:
+          return _classPrivateFieldGet(this, _purchaseEcommerceOrder).call(this, options, callback);
         case types.PAY_INVOICE:
           return _classPrivateFieldGet(this, _payInvoice).call(this, options, callback);
         default:
-          console.error("Unsupported subscriptiion method: Stripe Gateway");
+          console.error("Unsupported payment method: Stripe Gateway");
       }
     });
@@ -12999,6 +13106,35 @@ class StripeGateway {
       }
     });
+    _purchaseEcommerceOrder.set(this, {
+      writable: true,
+      value: (options, callback) => {
+        const {
+          token,
+          items,
+          couponCode,
+          addressId,
+          isExistingSource
+        } = options;
+        const params = isExistingSource ? {
+          source_id: token
+        } : {
+          payment_gateway: _classPrivateFieldGet(this, _paymentGateway),
+          gateway_token: token
+        };
+        window.Pelcro.ecommerce.order.create({
+          items,
+          coupon_code: couponCode,
+          ...params,
+          ...(addressId && {
+            address_id: addressId
+          })
+        }, (err, res) => {
+          callback(err, res);
+        });
+      }
+    });
     _payInvoice.set(this, {
       writable: true,
       value: (options, callback) => {
@@ -13042,7 +13178,7 @@ class PaypalGateway {
     });
     _defineProperty$3(this, "execute", (options, callback) => {
-      const types = SUBSCRIPTION_TYPES;
+      const types = PAYMENT_TYPES;
       switch (options.type) {
         case types.CREATE_SUBSCRIPTION:
@@ -13145,6 +13281,10 @@ var _createGiftedSubscription3 = /*#__PURE__*/new WeakMap();
 var _renewGiftedSubscription2 = /*#__PURE__*/new WeakMap();
+var _purchaseEcommerceOrder2 = /*#__PURE__*/new WeakMap();
+var _payInvoice3 = /*#__PURE__*/new WeakMap();
 class VantivGateway {
   constructor() {
     _paymentGateway3.set(this, {
@@ -13153,7 +13293,7 @@ class VantivGateway {
     });
     _defineProperty$3(this, "execute", (options, callback) => {
-      const types = SUBSCRIPTION_TYPES;
+      const types = PAYMENT_TYPES;
       switch (options.type) {
         case types.CREATE_SUBSCRIPTION:
@@ -13167,12 +13307,15 @@ class VantivGateway {
         case types.RENEW_GIFTED_SUBSCRIPTION:
           return _classPrivateFieldGet(this, _renewGiftedSubscription2).call(this, options, callback);
-        // TODO: implement paying invoices as well
-        // case types.PAY_INVOICE:
-        //   return this.#payInvoice(options, callback);
+        case types.PURCHASE_ECOMMERCE_ORDER:
+          return _classPrivateFieldGet(this, _purchaseEcommerceOrder2).call(this, options, callback);
+        case types.PAY_INVOICE:
+          return _classPrivateFieldGet(this, _payInvoice3).call(this, options, callback);
         default:
-          console.error("Unsupported subscriptiion method: vantiv Gateway");
+          console.error("Unsupported payment method: vantiv Gateway");
       }
     });
@@ -13305,13 +13448,63 @@ class VantivGateway {
         });
       }
     });
-  }
-}
+    _purchaseEcommerceOrder2.set(this, {
+      writable: true,
+      value: (options, callback) => {
+        const {
+          token,
+          items,
+          couponCode,
+          addressId,
+          isExistingSource
+        } = options;
+        const params = isExistingSource ? {
+          source_id: token
+        } : {
+          payment_gateway: _classPrivateFieldGet(this, _paymentGateway3),
+          gateway_token: token
+        };
+        window.Pelcro.ecommerce.order.create({
+          items,
+          coupon_code: couponCode,
+          ...params,
+          ...(addressId && {
+            address_id: addressId
+          })
+        }, (err, res) => {
+          callback(err, res);
+        });
+      }
+    });
-/**
- * @typedef {Object} PaymentStateType
- * @property {boolean} disableSubmit
+    _payInvoice3.set(this, {
+      writable: true,
+      value: (options, callback) => {
+        const {
+          token,
+          invoiceId
+        } = options;
+        const params = options.isExistingSource ? {
+          source_id: token,
+          invoice_id: invoiceId
+        } : {
+          payment_gateway: _classPrivateFieldGet(this, _paymentGateway3),
+          gateway_token: token,
+          invoice_id: invoiceId
+        };
+        window.Pelcro.invoice.pay(params, (err, res) => {
+          callback(err, res);
+        });
+      }
+    });
+  }
+}
+/**
+ * @typedef {Object} PaymentStateType
+ * @property {boolean} disableSubmit
  * @property {boolean} isLoading
  * @property {boolean} disableCouponButton
  * @property {object} couponObject
@@ -13329,7 +13522,7 @@ class VantivGateway {
 /** @type {PaymentStateType} */
-const initialState$f = {
+const initialState$g = {
   disableSubmit: false,
   isLoading: false,
   disableCouponButton: false,
@@ -13348,10 +13541,10 @@ const initialState$f = {
     content: ""
   }
 };
-const store$f = /*#__PURE__*/React.createContext(initialState$f);
+const store$g = /*#__PURE__*/React.createContext(initialState$g);
 const {
-  Provider: Provider$f
-} = store$f;
+  Provider: Provider$g
+} = store$g;
 const PaymentMethodContainerWithoutStripe = ({
   style,
@@ -13397,22 +13590,22 @@ const PaymentMethodContainerWithoutStripe = ({
     updateTotalAmountWithTax();
   }, []);
-  function submitVantivPayment() {
-    if (!selectedPaymentMethodId) {
-      if (!vantivInstanceRef.current) {
-        return console.error("Vantiv sdk script wasn't loaded, you need to load vantiv sdk before rendering the vantiv payment flow");
-      }
-      const orderId = `pelcro-${new Date().getTime()}`; // calls handleVantivPayment
+  const submitVantivPayment = () => {
+    if (selectedPaymentMethodId) {
+      return handleVantivPayment(null);
+    }
-      vantivInstanceRef.current.getPaypageRegistrationId({
-        id: orderId,
-        orderId: orderId
-      });
-    } else {
-      handleVantivPayment(null);
+    if (!vantivInstanceRef.current) {
+      return console.error("Vantiv sdk script wasn't loaded, you need to load vantiv sdk before rendering the vantiv payment flow");
     }
-  }
+    const orderId = `pelcro-${new Date().getTime()}`; // calls handleVantivPayment
+    vantivInstanceRef.current.getPaypageRegistrationId({
+      id: orderId,
+      orderId: orderId
+    });
+  };
   function handleVantivPayment(paymentRequest) {
     if (paymentRequest) {
@@ -13425,19 +13618,18 @@ const PaymentMethodContainerWithoutStripe = ({
       }
     }
-    const subscription = new Subscription(new VantivGateway());
+    const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (type === "createPayment") {
       handleVantivSubscription();
-    } // TODO: handle other types of payments
-    // } else if (type === "orderCreate") {
-    //   purchase(stripeSource, state, dispatch);
-    // } else if (type === "invoicePayment") {
-    //   payInvoice(new StripeGateway(), stripeSource.id, dispatch);
-    // }
+    } else if (type === "orderCreate") {
+      purchase(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
+    } else if (type === "invoicePayment") {
+      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
+    }
     function handleVantivSubscription() {
+      const payment = new Payment(new VantivGateway());
       const createSubscription = !isGift && !subscriptionIdToRenew;
       const renewSubscription = !isGift && subscriptionIdToRenew;
       const giftSubscriprition = isGift && !subscriptionIdToRenew;
@@ -13445,11 +13637,10 @@ const PaymentMethodContainerWithoutStripe = ({
       const {
         couponCode
       } = state;
-      const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
       if (renewGift) {
-        return subscription.execute({
-          type: SUBSCRIPTION_TYPES.RENEW_GIFTED_SUBSCRIPTION,
+        return payment.execute({
+          type: PAYMENT_TYPES.RENEW_GIFTED_SUBSCRIPTION,
           token: isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest,
           plan,
           couponCode,
@@ -13465,8 +13656,8 @@ const PaymentMethodContainerWithoutStripe = ({
           onSuccess(res);
         });
       } else if (giftSubscriprition) {
-        return subscription.execute({
-          type: SUBSCRIPTION_TYPES.CREATE_GIFTED_SUBSCRIPTION,
+        return payment.execute({
+          type: PAYMENT_TYPES.CREATE_GIFTED_SUBSCRIPTION,
           token: isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest,
           quantity: plan.quantity,
           plan,
@@ -13483,8 +13674,8 @@ const PaymentMethodContainerWithoutStripe = ({
           onSuccess(res);
         });
       } else if (renewSubscription) {
-        return subscription.execute({
-          type: SUBSCRIPTION_TYPES.RENEW_SUBSCRIPTION,
+        return payment.execute({
+          type: PAYMENT_TYPES.RENEW_SUBSCRIPTION,
           token: isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest,
           quantity: plan.quantity,
           plan,
@@ -13501,8 +13692,8 @@ const PaymentMethodContainerWithoutStripe = ({
           onSuccess(res);
         });
       } else if (createSubscription) {
-        return subscription.execute({
-          type: SUBSCRIPTION_TYPES.CREATE_SUBSCRIPTION,
+        return payment.execute({
+          type: PAYMENT_TYPES.CREATE_SUBSCRIPTION,
           token: isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest,
           quantity: plan.quantity,
           plan,
@@ -13526,12 +13717,13 @@ const PaymentMethodContainerWithoutStripe = ({
     const cardProcessor = getSiteCardProcessor();
     if (cardProcessor === "vantiv" && !selectedPaymentMethodId) {
-      var _window$Pelcro$site$r;
+      var _window$Pelcro$site$r, _window$Pelcro$site$r2;
-      const payPageId = (_window$Pelcro$site$r = window.Pelcro.site.read()) === null || _window$Pelcro$site$r === void 0 ? void 0 : _window$Pelcro$site$r.vantiv_pay_page_id;
+      const payPageId = (_window$Pelcro$site$r = window.Pelcro.site.read()) === null || _window$Pelcro$site$r === void 0 ? void 0 : _window$Pelcro$site$r.vantiv_gateway_settings.pay_page_id;
+      const reportGroup = (_window$Pelcro$site$r2 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r2 === void 0 ? void 0 : _window$Pelcro$site$r2.vantiv_gateway_settings.report_group;
       vantivInstanceRef.current = new window.EprotectIframeClient({
         paypageId: payPageId,
-        reportGroup: payPageId,
+        reportGroup: reportGroup,
         style: "pelcro",
         height: "245",
         timeout: 50000,
@@ -13620,9 +13812,9 @@ const PaymentMethodContainerWithoutStripe = ({
   const updateTotalAmountWithTax = () => {
-    var _window$Pelcro$site$r2;
+    var _window$Pelcro$site$r3;
-    const taxesEnabled = (_window$Pelcro$site$r2 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r2 === void 0 ? void 0 : _window$Pelcro$site$r2.taxes_enabled;
+    const taxesEnabled = (_window$Pelcro$site$r3 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r3 === void 0 ? void 0 : _window$Pelcro$site$r3.taxes_enabled;
     if (taxesEnabled && type === "createPayment") {
       dispatch({
@@ -13972,7 +14164,7 @@ const PaymentMethodContainerWithoutStripe = ({
   const handlePaypalSubscription = (state, paypalNonce) => {
-    const subscription = new Subscription(new PaypalGateway());
+    const payment = new Payment(new PaypalGateway());
     const {
       couponCode
     } = state;
@@ -13981,8 +14173,8 @@ const PaymentMethodContainerWithoutStripe = ({
      */
     if (giftRecipient) {
-      return subscription.execute({
-        type: SUBSCRIPTION_TYPES.CREATE_GIFTED_SUBSCRIPTION,
+      return payment.execute({
+        type: PAYMENT_TYPES.CREATE_GIFTED_SUBSCRIPTION,
         token: paypalNonce,
         quantity: plan.quantity,
         plan,
@@ -14015,8 +14207,8 @@ const PaymentMethodContainerWithoutStripe = ({
       });
     }
-    return subscription.execute({
-      type: SUBSCRIPTION_TYPES.CREATE_SUBSCRIPTION,
+    return payment.execute({
+      type: PAYMENT_TYPES.CREATE_SUBSCRIPTION,
       token: paypalNonce,
       quantity: plan.quantity,
       plan,
@@ -14048,7 +14240,7 @@ const PaymentMethodContainerWithoutStripe = ({
     });
   };
-  const purchase = (stripeSource, state, dispatch) => {
+  const purchase = (gatewayService, gatewayToken, state, dispatch) => {
     const isQuickPurchase = !Array.isArray(order);
     const mappedOrderItems = isQuickPurchase ? [{
       sku_id: order.id,
@@ -14060,14 +14252,14 @@ const PaymentMethodContainerWithoutStripe = ({
     const {
       couponCode
     } = state;
-    window.Pelcro.ecommerce.order.create({
-      source_id: stripeSource.isExistingSource ? stripeSource.id : undefined,
-      stripe_token: !stripeSource.isExistingSource ? stripeSource.id : undefined,
+    const payment = new Payment(gatewayService);
+    payment.execute({
+      type: PAYMENT_TYPES.PURCHASE_ECOMMERCE_ORDER,
+      token: gatewayToken,
+      isExistingSource: Boolean(selectedPaymentMethodId),
       items: mappedOrderItems,
-      coupon_code: couponCode,
-      ...(selectedAddressId && {
-        address_id: selectedAddressId
-      })
+      addressId: selectedAddressId,
+      couponCode
     }, (err, res) => {
       dispatch({
         type: DISABLE_SUBMIT,
@@ -14105,9 +14297,9 @@ const PaymentMethodContainerWithoutStripe = ({
   };
   const payInvoice = (gatewayService, gatewayToken, dispatch) => {
-    const subscription = new Subscription(gatewayService);
-    return subscription.execute({
-      type: SUBSCRIPTION_TYPES.PAY_INVOICE,
+    const payment = new Payment(gatewayService);
+    return payment.execute({
+      type: PAYMENT_TYPES.PAY_INVOICE,
       token: gatewayToken,
       isExistingSource: Boolean(selectedPaymentMethodId),
       invoiceId: invoice.id
@@ -14267,13 +14459,13 @@ const PaymentMethodContainerWithoutStripe = ({
   const resolveTaxCalculation = () => {
-    var _window$Pelcro$site$r3;
+    var _window$Pelcro$site$r4;
     if (type === "invoicePayment") {
       return new Promise(resolve => resolve());
     }
-    const taxesEnabled = (_window$Pelcro$site$r3 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r3 === void 0 ? void 0 : _window$Pelcro$site$r3.taxes_enabled;
+    const taxesEnabled = (_window$Pelcro$site$r4 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r4 === void 0 ? void 0 : _window$Pelcro$site$r4.taxes_enabled;
     return new Promise((resolve, reject) => {
       // resolve early if taxes isn't enabled
       if (!taxesEnabled) {
@@ -14345,7 +14537,7 @@ const PaymentMethodContainerWithoutStripe = ({
     if (stripeSource && type === "createPayment") {
       subscribe(stripeSource, state, dispatch);
     } else if (stripeSource && type === "orderCreate") {
-      purchase(stripeSource, state, dispatch);
+      purchase(new StripeGateway(), stripeSource.id, state, dispatch);
     } else if (stripeSource && type === "invoicePayment") {
       payInvoice(new StripeGateway(), stripeSource.id, dispatch);
     }
@@ -14551,21 +14743,21 @@ const PaymentMethodContainerWithoutStripe = ({
       default:
         return state;
     }
-  }, initialState$f);
+  }, initialState$g);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-payment-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$f, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$g, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$f,
+    store: store$g,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$f
+    store: store$g
   })));
 };
@@ -14587,7 +14779,7 @@ const PaymentMethodContainer = props => {
       stripeAccount: window.Pelcro.site.read().account_id,
       locale: getPageOrDefaultLanguage()
     }, /*#__PURE__*/React__default['default'].createElement(es_11, null, /*#__PURE__*/React__default['default'].createElement(UnwrappedForm, Object.assign({
-      store: store$f
+      store: store$g
     }, props))));
   }
@@ -14640,7 +14832,7 @@ const PelcroPaymentRequestButton = props => {
       currentPlan,
       updatedPrice
     }
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const updatePaymentRequest = () => {
     // Make sure payment request is up to date, eg. user added a coupon code.
@@ -14716,7 +14908,7 @@ const DiscountedPrice = props => {
       taxAmount,
       percentOff
     }
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const {
     order,
     plan
@@ -14766,7 +14958,7 @@ const SubmitPaymentMethod = ({
       isLoading,
       updatedPrice
     }
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const planQuantity = (_plan$quantity = plan === null || plan === void 0 ? void 0 : plan.quantity) !== null && _plan$quantity !== void 0 ? _plan$quantity : 1;
   const price = updatedPrice !== null && updatedPrice !== void 0 ? updatedPrice : plan === null || plan === void 0 ? void 0 : plan.amount;
   const priceFormatted = getFormattedPriceByLocal(price * planQuantity, plan === null || plan === void 0 ? void 0 : plan.currency, getPageOrDefaultLanguage());
@@ -14787,17 +14979,17 @@ const SubmitPaymentMethod = ({
   }, t("labels.pay"), " ", priceFormatted && priceFormatted) : t("labels.submit"));
 };
-var _path$m;
+var _path$n;
-function _extends$o() { _extends$o = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$o.apply(this, arguments); }
+function _extends$p() { _extends$p = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$p.apply(this, arguments); }
 function SvgArrowLeft(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$o({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$p({
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$m || (_path$m = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$n || (_path$n = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -14816,7 +15008,7 @@ const ApplyCouponButton = ({
       disableCouponButton
     },
     dispatch
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const {
     t
   } = useTranslation("checkoutForm");
@@ -14850,7 +15042,7 @@ const CouponCodeField = props => {
       couponCode,
       couponError
     }
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const onCouponCodeChange = e => {
     dispatch({
@@ -14879,17 +15071,17 @@ const CouponCodeField = props => {
   }, props));
 };
-var _path$l;
+var _path$m;
-function _extends$n() { _extends$n = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$n.apply(this, arguments); }
+function _extends$o() { _extends$o = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$o.apply(this, arguments); }
 function SvgTicket(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$n({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$o({
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$l || (_path$l = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$m || (_path$m = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -14906,7 +15098,7 @@ const CouponCode = ({
     state: {
       enableCouponField
     }
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const {
     t
   } = useTranslation("checkoutForm");
@@ -15163,7 +15355,7 @@ const PaypalSubscribeButton = props => {
   const {
     dispatch,
     state
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const {
     product,
     plan,
@@ -15249,16 +15441,16 @@ const BankRedirection = () => {
   }));
 };
-var _path$k;
+var _path$l;
-function _extends$m() { _extends$m = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$m.apply(this, arguments); }
+function _extends$n() { _extends$n = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$n.apply(this, arguments); }
 function SvgLock(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$m({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$n({
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20",
     fill: "currentColor"
-  }, props), _path$k || (_path$k = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$l || (_path$l = /*#__PURE__*/React__namespace.createElement("path", {
     fillRule: "evenodd",
     d: "M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z",
     clipRule: "evenodd"
@@ -15275,7 +15467,7 @@ const SelectedPaymentMethod = () => {
     state: {
       isLoading
     }
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const {
     switchView,
     selectedPaymentMethodId
@@ -15317,7 +15509,7 @@ const TaxAmount = () => {
     state: {
       taxAmount
     }
-  } = React.useContext(store$f);
+  } = React.useContext(store$g);
   const {
     plan
   } = usePelcro();
@@ -15481,12 +15673,12 @@ function SubscriptionRenewModal({
 }
 SubscriptionRenewModal.viewId = "subscription-renew";
-var _path$j;
+var _path$k;
-function _extends$l() { _extends$l = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$l.apply(this, arguments); }
+function _extends$m() { _extends$m = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$m.apply(this, arguments); }
 function SvgGift(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$l({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$m({
     className: "plc-w-6 plc-h-6 plc-mr-2",
     fill: "none",
     stroke: "currentColor",
@@ -15495,7 +15687,7 @@ function SvgGift(props) {
     strokeWidth: 2,
     viewBox: "0 0 24 24",
     xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path$j || (_path$j = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$k || (_path$k = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M20 12v10H4V12M2 7h20v5H2zM12 22V7M12 7H7.5a2.5 2.5 0 010-5C11 2 12 7 12 7zM12 7h4.5a2.5 2.5 0 000-5C13 2 12 7 12 7z"
   })));
 }
@@ -15836,7 +16028,7 @@ class DefaultNewsLetter extends React.Component {
 const NewsLetter = withTranslation("newsletter")(DefaultNewsLetter);
-const initialState$e = {
+const initialState$f = {
   didSubToNewslettersBefore: false,
   newsletters: [],
   isListLoading: true,
@@ -15846,10 +16038,10 @@ const initialState$e = {
     content: ""
   }
 };
-const store$e = /*#__PURE__*/React.createContext(initialState$e);
+const store$f = /*#__PURE__*/React.createContext(initialState$f);
 const {
-  Provider: Provider$e
-} = store$e;
+  Provider: Provider$f
+} = store$f;
 const NewsletterUpdateContainer = ({
   style,
@@ -15962,7 +16154,7 @@ const NewsletterUpdateContainer = ({
       default:
         return state;
     }
-  }, initialState$e);
+  }, initialState$f);
   React.useEffect(() => {
     const getUserNewsletters = () => {
       var _window$Pelcro$user$r3, _window$Pelcro$user$r4;
@@ -16006,7 +16198,7 @@ const NewsletterUpdateContainer = ({
     style: { ...style
     },
     className: `pelcro-container pelcro-newsletter-update-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$e, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$f, {
     value: {
       state,
       dispatch
@@ -16014,12 +16206,12 @@ const NewsletterUpdateContainer = ({
   }, children.length ? children.map((child, i) => {
     if (child) {
       return /*#__PURE__*/React__default['default'].cloneElement(child, {
-        store: store$e,
+        store: store$f,
         key: i
       });
     }
   }) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$e
+    store: store$f
   })));
 };
@@ -16034,7 +16226,7 @@ const NewsletterUpdateButton = ({
       isSubmitting,
       isListLoading
     }
-  } = React.useContext(store$e);
+  } = React.useContext(store$f);
   const {
     t
   } = useTranslation("newsletter");
@@ -16064,7 +16256,7 @@ const NewsletterUpdateList = () => {
       newsletters,
       isListLoading
     }
-  } = React.useContext(store$e);
+  } = React.useContext(store$f);
   if (isListLoading) {
     return /*#__PURE__*/React__default['default'].createElement(Loader, {
@@ -16268,7 +16460,7 @@ function SubscriptionCreateModal({
 SubscriptionCreateModal.viewId = "subscription-create";
 var _window$Pelcro$user$r, _window$Pelcro$user$r2, _window$Pelcro$user$r3, _window$Pelcro$user$r4, _window$Pelcro$user$r5;
-const initialState$d = {
+const initialState$e = {
   email: (_window$Pelcro$user$r = window.Pelcro.user.read()) === null || _window$Pelcro$user$r === void 0 ? void 0 : _window$Pelcro$user$r.email,
   firstName: (_window$Pelcro$user$r2 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.first_name,
   lastName: (_window$Pelcro$user$r3 = window.Pelcro.user.read()) === null || _window$Pelcro$user$r3 === void 0 ? void 0 : _window$Pelcro$user$r3.last_name,
@@ -16281,10 +16473,10 @@ const initialState$d = {
     content: ""
   }
 };
-const store$d = /*#__PURE__*/React.createContext(initialState$d);
+const store$e = /*#__PURE__*/React.createContext(initialState$e);
 const {
-  Provider: Provider$d
-} = store$d;
+  Provider: Provider$e
+} = store$e;
 const UserUpdateContainer = ({
   style,
@@ -16416,27 +16608,27 @@ const UserUpdateContainer = ({
       default:
         return state;
     }
-  }, initialState$d);
+  }, initialState$e);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-user-update-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$d, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$e, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$d,
+    store: store$e,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$d
+    store: store$e
   })));
 };
 const UserUpdateEmail = props => /*#__PURE__*/React__default['default'].createElement(Email, Object.assign({
   disabled: true,
-  store: store$d
+  store: store$e
 }, props));
 const UserUpdateButton = ({
@@ -16449,7 +16641,7 @@ const UserUpdateButton = ({
       buttonDisabled
     },
     dispatch
-  } = React.useContext(store$d);
+  } = React.useContext(store$e);
   const {
     t
   } = useTranslation("userEdit");
@@ -16466,11 +16658,11 @@ const UserUpdateButton = ({
 };
 const UserUpdateFirstName = props => /*#__PURE__*/React__default['default'].createElement(FirstName, Object.assign({
-  store: store$d
+  store: store$e
 }, props));
 const UserUpdateLastName = props => /*#__PURE__*/React__default['default'].createElement(LastName, Object.assign({
-  store: store$d
+  store: store$e
 }, props));
 function Phone({
@@ -16499,22 +16691,22 @@ function Phone({
 }
 const UserUpdatePhone = props => /*#__PURE__*/React__default['default'].createElement(Phone, Object.assign({
-  store: store$d
+  store: store$e
 }, props));
 var userSolidIcon = "data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20class%3D%22plc-h-5%20plc-w-5%22%20viewBox%3D%220%200%2020%2020%22%20fill%3D%22white%22%3E%20%20%3Cpath%20transform%3D%22translate%280%2C2%29%22%20fill-rule%3D%22evenodd%22%20d%3D%22M10%209a3%203%200%20100-6%203%203%200%20000%206zm-7%209a7%207%200%201114%200H3z%22%20clip-rule%3D%22evenodd%22%20%2F%3E%3C%2Fsvg%3E";
-var _path$i;
+var _path$j;
-function _extends$k() { _extends$k = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$k.apply(this, arguments); }
+function _extends$l() { _extends$l = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$l.apply(this, arguments); }
 function SvgEdit(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$k({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$l({
     className: "plc-w-6 plc-h-6",
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20",
     fill: "currentColor"
-  }, props), _path$i || (_path$i = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$j || (_path$j = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M13.586 3.586a2 2 0 112.828 2.828l-.793.793-2.828-2.828.793-.793zm-2.207 2.207L3 14.172V17h2.828l8.38-8.379-2.83-2.828z"
   })));
 }
@@ -16646,16 +16838,16 @@ function DisplayName({
 }
 const UserUpdateDisplayName = props => /*#__PURE__*/React__default['default'].createElement(DisplayName, Object.assign({
-  store: store$d
+  store: store$e
 }, props));
 const UserUpdateTextInput = props => {
   return /*#__PURE__*/React__default['default'].createElement(TextInput, Object.assign({}, props, {
-    store: store$d
+    store: store$e
   }));
 };
-const initialState$c = {
+const initialState$d = {
   isSubmitting: false,
   firstName: "",
   firstNameError: "",
@@ -16680,10 +16872,10 @@ const initialState$c = {
     content: ""
   }
 };
-const store$c = /*#__PURE__*/React.createContext(initialState$c);
+const store$d = /*#__PURE__*/React.createContext(initialState$d);
 const {
-  Provider: Provider$c
-} = store$c;
+  Provider: Provider$d
+} = store$d;
 const getNewlyCreatedAddress = addresses => addresses[addresses.length - 1];
@@ -16890,7 +17082,7 @@ const AddressCreateContainer = ({
       default:
         return state;
     }
-  }, initialState$c);
+  }, initialState$d);
   React.useEffect(() => {
     const getStates = () => {
       dispatch({
@@ -16922,16 +17114,16 @@ const AddressCreateContainer = ({
     style: { ...style
     },
     className: `pelcro-container pelcro-address-create-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$c, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$d, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$c,
+    store: store$d,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$c
+    store: store$d
   })));
 };
@@ -16942,7 +17134,7 @@ function AddressCreateFirstName(props) {
       firstName,
       firstNameError
     }
-  } = React.useContext(store$c);
+  } = React.useContext(store$d);
   const handleBlur = () => {
     return dispatch({
@@ -16985,7 +17177,7 @@ function AddressCreateLastName(props) {
       lastName,
       lastNameError
     }
-  } = React.useContext(store$c);
+  } = React.useContext(store$d);
   const handleBlur = () => {
     return dispatch({
@@ -17028,7 +17220,7 @@ function AddressCreateLine1(props) {
       line1,
       line1Error
     }
-  } = React.useContext(store$c);
+  } = React.useContext(store$d);
   const handleBlur = () => {
     return dispatch({
@@ -17071,7 +17263,7 @@ function AddressCreateCity(props) {
       city,
       cityError
     }
-  } = React.useContext(store$c);
+  } = React.useContext(store$d);
   const handleBlur = () => {
     return dispatch({
@@ -17114,7 +17306,7 @@ function AddressCreatePostalCode(props) {
       postalCode,
       postalCodeError
     }
-  } = React.useContext(store$c);
+  } = React.useContext(store$d);
   const handleBlur = () => {
     return dispatch({
@@ -17160,7 +17352,7 @@ const AddressCreateSubmit = ({
     state: {
       isSubmitting
     }
-  } = React.useContext(store$c);
+  } = React.useContext(store$d);
   const {
     t
   } = useTranslation("address");
@@ -17271,7 +17463,7 @@ function CountrySelect({
 }
 const AddressCreateCountrySelect = props => /*#__PURE__*/React__default['default'].createElement(CountrySelect, Object.assign({
-  store: store$c
+  store: store$d
 }, props));
 function StateSelect({
@@ -17359,7 +17551,7 @@ function StateSelect({
 }
 const AddressCreateStateSelect = props => /*#__PURE__*/React__default['default'].createElement(StateSelect, Object.assign({
-  store: store$c
+  store: store$d
 }, props));
 const AddressCreateView = props => {
@@ -17464,18 +17656,18 @@ AddressCreateModal.viewId = "address-create";
 const AddressCreateTextInput = props => {
   return /*#__PURE__*/React__default['default'].createElement(TextInput, Object.assign({}, props, {
-    store: store$c
+    store: store$d
   }));
 };
 const AddressCreateLine2 = props => {
   return /*#__PURE__*/React__default['default'].createElement(TextInput, Object.assign({
     fieldName: "line2",
-    store: store$c
+    store: store$d
   }, props));
 };
-const initialState$b = {
+const initialState$c = {
   isSubmitting: false,
   firstName: "",
   firstNameError: "",
@@ -17500,10 +17692,10 @@ const initialState$b = {
     content: ""
   }
 };
-const store$b = /*#__PURE__*/React.createContext(initialState$b);
+const store$c = /*#__PURE__*/React.createContext(initialState$c);
 const {
-  Provider: Provider$b
-} = store$b;
+  Provider: Provider$c
+} = store$c;
 const AddressUpdateContainer = ({
   style,
@@ -17555,7 +17747,7 @@ const AddressUpdateContainer = ({
       const thisAddress = addresses[address];
       if (+thisAddress.id === +addressId) {
-        const newState = { ...initialState$b,
+        const newState = { ...initialState$c,
           firstName: thisAddress.first_name,
           lastName: thisAddress.last_name,
           line1: thisAddress.line1,
@@ -17688,7 +17880,7 @@ const AddressUpdateContainer = ({
       default:
         return state;
     }
-  }, initialState$b);
+  }, initialState$c);
   React.useEffect(() => {
     const getStates = () => {
       dispatch({
@@ -17720,21 +17912,21 @@ const AddressUpdateContainer = ({
     style: { ...style
     },
     className: `pelcro-container pelcro-address-update-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$b, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$c, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$b,
+    store: store$c,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$b
+    store: store$c
   })));
 };
 const AddressUpdateCountrySelect = props => /*#__PURE__*/React__default['default'].createElement(CountrySelect, Object.assign({
-  store: store$b
+  store: store$c
 }, props));
 function AddressUpdateFirstName(props) {
@@ -17744,7 +17936,7 @@ function AddressUpdateFirstName(props) {
       firstName,
       firstNameError
     }
-  } = React.useContext(store$b);
+  } = React.useContext(store$c);
   const handleBlur = () => {
     return dispatch({
@@ -17787,7 +17979,7 @@ function AddressUpdateLastName(props) {
       lastName,
       lastNameError
     }
-  } = React.useContext(store$b);
+  } = React.useContext(store$c);
   const handleBlur = () => {
     return dispatch({
@@ -17830,7 +18022,7 @@ function AddressUpdateLine1(props) {
       line1,
       line1Error
     }
-  } = React.useContext(store$b);
+  } = React.useContext(store$c);
   const handleBlur = () => {
     return dispatch({
@@ -17870,7 +18062,7 @@ const AddressUpdateLine2 = props => {
   return /*#__PURE__*/React__default['default'].createElement(TextInput, Object.assign({
     fieldName: "line2"
   }, props, {
-    store: store$b
+    store: store$c
   }));
 };
@@ -17881,7 +18073,7 @@ function AddressUpdateCity(props) {
       city,
       cityError
     }
-  } = React.useContext(store$b);
+  } = React.useContext(store$c);
   const handleBlur = () => {
     return dispatch({
@@ -17924,7 +18116,7 @@ function AddressUpdatePostalCode(props) {
       postalCode,
       postalCodeError
     }
-  } = React.useContext(store$b);
+  } = React.useContext(store$c);
   const handleBlur = () => {
     return dispatch({
@@ -17970,7 +18162,7 @@ const AddressUpdateSubmit = ({
     state: {
       isSubmitting
     }
-  } = React.useContext(store$b);
+  } = React.useContext(store$c);
   const {
     t
   } = useTranslation("address");
@@ -17986,7 +18178,7 @@ const AddressUpdateSubmit = ({
 };
 const AddressUpdateStateSelect = props => /*#__PURE__*/React__default['default'].createElement(StateSelect, Object.assign({
-  store: store$b
+  store: store$c
 }, props));
 const AddressUpdateView = props => {
@@ -18069,7 +18261,7 @@ AddressUpdateModal.viewId = "address-edit";
 const AddressUpdateTextInput = props => {
   return /*#__PURE__*/React__default['default'].createElement(TextInput, Object.assign({}, props, {
-    store: store$b
+    store: store$c
   }));
 };
@@ -18152,7 +18344,7 @@ const PaymentMethodUpdateModal = props => {
 };
 PaymentMethodUpdateModal.viewId = "payment-method-update";
-const initialState$a = {
+const initialState$b = {
   email: "",
   password: "",
   passwordError: null,
@@ -18165,10 +18357,10 @@ const initialState$a = {
     content: ""
   }
 };
-const store$a = /*#__PURE__*/React.createContext(initialState$a);
+const store$b = /*#__PURE__*/React.createContext(initialState$b);
 const {
-  Provider: Provider$a
-} = store$a;
+  Provider: Provider$b
+} = store$b;
 const PasswordResetContainer = ({
   style,
@@ -18225,7 +18417,7 @@ const PasswordResetContainer = ({
       type: SET_EMAIL,
       payload: window.Pelcro.helpers.getURLParameter("email")
     });
-    initialState$a.email = window.Pelcro.helpers.getURLParameter("email");
+    initialState$b.email = window.Pelcro.helpers.getURLParameter("email");
     dispatch({
       type: SET_TOKEN,
       payload: window.Pelcro.helpers.getURLParameter("token")
@@ -18285,26 +18477,26 @@ const PasswordResetContainer = ({
       default:
         return state;
     }
-  }, initialState$a);
+  }, initialState$b);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-password-reset-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$a, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$b, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$a,
+    store: store$b,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$a
+    store: store$b
   })));
 };
 const PasswordResetPassword = props => /*#__PURE__*/React__default['default'].createElement(Password, Object.assign({
-  store: store$a
+  store: store$b
 }, props));
 const PasswordResetButton = ({
@@ -18317,7 +18509,7 @@ const PasswordResetButton = ({
       buttonDisabled
     },
     dispatch
-  } = React.useContext(store$a);
+  } = React.useContext(store$b);
   const {
     t
   } = useTranslation("passwordReset");
@@ -18334,14 +18526,14 @@ const PasswordResetButton = ({
 };
 const PasswordResetEmail = props => /*#__PURE__*/React__default['default'].createElement(Email, Object.assign({
-  store: store$a
+  store: store$b
 }, props, {
   value: window.Pelcro.helpers.getURLParameter("email"),
   disabled: true
 }));
 const PasswordResetConfirmPassword = props => /*#__PURE__*/React__default['default'].createElement(ConfirmPassword, Object.assign({
-  store: store$a
+  store: store$b
 }, props));
 const PasswordResetView = props => {
@@ -18393,7 +18585,7 @@ const PasswordResetModal = ({
 };
 PasswordResetModal.viewId = "password-reset";
-const initialState$9 = {
+const initialState$a = {
   email: "",
   emailError: null,
   buttonDisabled: false,
@@ -18402,10 +18594,10 @@ const initialState$9 = {
     content: ""
   }
 };
-const store$9 = /*#__PURE__*/React.createContext(initialState$9);
+const store$a = /*#__PURE__*/React.createContext(initialState$a);
 const {
-  Provider: Provider$9
-} = store$9;
+  Provider: Provider$a
+} = store$a;
 const PasswordForgotContainer = ({
   style,
@@ -18483,21 +18675,21 @@ const PasswordForgotContainer = ({
       default:
         return state;
     }
-  }, initialState$9);
+  }, initialState$a);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-password-forgot-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$9, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$a, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$9,
+    store: store$a,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$9
+    store: store$a
   })));
 };
@@ -18513,7 +18705,7 @@ const PasswordForgotButton = ({
       emailError
     },
     dispatch
-  } = React.useContext(store$9);
+  } = React.useContext(store$a);
   const {
     t
   } = useTranslation("passwordForgot");
@@ -18534,7 +18726,7 @@ const PasswordForgotButton = ({
 };
 const PasswordForgotEmail = props => /*#__PURE__*/React__default['default'].createElement(Email, Object.assign({
-  store: store$9
+  store: store$a
 }, props));
 const PasswordForgotView = props => {
@@ -18584,7 +18776,7 @@ const PasswordForgotModal = ({
 };
 PasswordForgotModal.viewId = "password-forgot";
-const initialState$8 = {
+const initialState$9 = {
   currentPassword: "",
   newPassword: "",
   confirmNewPassword: "",
@@ -18598,10 +18790,10 @@ const initialState$8 = {
     content: ""
   }
 };
-const store$8 = /*#__PURE__*/React.createContext(initialState$8);
+const store$9 = /*#__PURE__*/React.createContext(initialState$9);
 const {
-  Provider: Provider$8
-} = store$8;
+  Provider: Provider$9
+} = store$9;
 const PasswordChangeContainer = ({
   style,
   className = "",
@@ -18753,21 +18945,21 @@ const PasswordChangeContainer = ({
       default:
         return state;
     }
-  }, initialState$8);
+  }, initialState$9);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-password-change-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$8, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$9, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$8,
+    store: store$9,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$8
+    store: store$9
   })));
 };
@@ -18778,7 +18970,7 @@ function PasswordChangeCurrentPassword(props) {
       currentPassword,
       currentPasswordError
     }
-  } = React.useContext(store$8);
+  } = React.useContext(store$9);
   const handleBlur = React.useCallback(() => {
     return dispatch({
       type: VALIDATE_PASSWORD
@@ -18812,7 +19004,7 @@ function PasswordChangeNewPassword(props) {
       newPassword,
       newPasswordError
     }
-  } = React.useContext(store$8);
+  } = React.useContext(store$9);
   const handleBlur = React.useCallback(() => {
     return dispatch({
       type: VALIDATE_NEW_PASSWORD
@@ -18846,7 +19038,7 @@ function PasswordChangeConfirmNewPassword(props) {
       confirmNewPassword,
       confirmNewPasswordError
     }
-  } = React.useContext(store$8);
+  } = React.useContext(store$9);
   const handleBlur = React.useCallback(() => {
     return dispatch({
       type: VALIDATE_CONFIRM_NEW_PASSWORD
@@ -18887,7 +19079,7 @@ const PasswordChangeButton = ({
       confirmNewPasswordError
     },
     dispatch
-  } = React.useContext(store$8);
+  } = React.useContext(store$9);
   const {
     t
   } = useTranslation("passwordChange");
@@ -18953,17 +19145,17 @@ const PasswordChangeModal = ({
 };
 PasswordChangeModal.viewId = "password-change";
-const initialState$7 = {
+const initialState$8 = {
   buttonDisabled: false,
   alert: {
     type: "error",
     content: ""
   }
 };
-const store$7 = /*#__PURE__*/React.createContext(initialState$7);
+const store$8 = /*#__PURE__*/React.createContext(initialState$8);
 const {
-  Provider: Provider$7
-} = store$7;
+  Provider: Provider$8
+} = store$8;
 const CartContainer = ({
   style,
@@ -19054,21 +19246,21 @@ const CartContainer = ({
       default:
         return state;
     }
-  }, initialState$7);
+  }, initialState$8);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-cart-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$7, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$8, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$7,
+    store: store$8,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$7
+    store: store$8
   })));
 };
@@ -19105,7 +19297,7 @@ const CartSubmit = ({
       buttonDisabled
     },
     dispatch
-  } = React.useContext(store$7);
+  } = React.useContext(store$8);
   const {
     t
   } = useTranslation("cart");
@@ -19136,7 +19328,7 @@ const CartTotalPrice = () => {
     state: {
       alert
     }
-  } = React.useContext(store$7);
+  } = React.useContext(store$8);
   const {
     cartItems
   } = usePelcro();
@@ -19449,7 +19641,7 @@ const OrderConfirmModal = props => {
 };
 OrderConfirmModal.viewId = "order-confirm";
-const initialState$6 = {
+const initialState$7 = {
   email: "",
   firstName: "",
   lastName: "",
@@ -19461,10 +19653,10 @@ const initialState$6 = {
     content: ""
   }
 };
-const store$6 = /*#__PURE__*/React.createContext(initialState$6);
+const store$7 = /*#__PURE__*/React.createContext(initialState$7);
 const {
-  Provider: Provider$6
-} = store$6;
+  Provider: Provider$7
+} = store$7;
 const GiftCreateContainer = ({
   style,
@@ -19568,21 +19760,21 @@ const GiftCreateContainer = ({
       default:
         return state;
     }
-  }, initialState$6);
+  }, initialState$7);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-gift-create-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$6, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$7, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$6,
+    store: store$7,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$6
+    store: store$7
   })));
 };
@@ -19596,7 +19788,7 @@ const GiftCreateSubmitButton = ({
     state: {
       disableSubmit
     }
-  } = React.useContext(store$6);
+  } = React.useContext(store$7);
   const {
     t
   } = useTranslation("register");
@@ -19613,29 +19805,29 @@ const GiftCreateSubmitButton = ({
 const GiftCreateEmail = props => /*#__PURE__*/React__default['default'].createElement(Email, Object.assign({
   initWithUserEmail: false,
-  store: store$6
+  store: store$7
 }, props));
 const GiftCreateFirstName = props => /*#__PURE__*/React__default['default'].createElement(FirstName, Object.assign({
-  store: store$6
+  store: store$7
 }, props));
 const GiftCreateLastName = props => /*#__PURE__*/React__default['default'].createElement(LastName, Object.assign({
-  store: store$6
+  store: store$7
 }, props));
-var _path$h;
+var _path$i;
-function _extends$j() { _extends$j = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$j.apply(this, arguments); }
+function _extends$k() { _extends$k = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$k.apply(this, arguments); }
 function SvgInfoCircle(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$j({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$k({
     xmlns: "http://www.w3.org/2000/svg",
     className: "plc-w-5 plc-h-5",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$h || (_path$h = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$i || (_path$i = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -19706,7 +19898,7 @@ const GiftCreateStartDate = props => {
   const {
     dispatch,
     state
-  } = React.useContext(store$6);
+  } = React.useContext(store$7);
   const handleInputChange = value => {
     dispatch({
@@ -19779,7 +19971,7 @@ function GiftCreateMessage(props) {
   const {
     dispatch,
     state
-  } = React.useContext(store$6);
+  } = React.useContext(store$7);
   const MAX_CHARS_COUNT = 200;
   const remainingCharsCount = (_ref = MAX_CHARS_COUNT - ((_state$giftMessage = state.giftMessage) === null || _state$giftMessage === void 0 ? void 0 : _state$giftMessage.length)) !== null && _ref !== void 0 ? _ref : 0;
@@ -19903,7 +20095,7 @@ const GiftCreateModal = ({
 };
 GiftCreateModal.viewId = "gift-create";
-const initialState$5 = {
+const initialState$6 = {
   giftCode: "",
   buttonDisabled: true,
   alert: {
@@ -19911,10 +20103,10 @@ const initialState$5 = {
     content: ""
   }
 };
-const store$5 = /*#__PURE__*/React.createContext(initialState$5);
+const store$6 = /*#__PURE__*/React.createContext(initialState$6);
 const {
-  Provider: Provider$5
-} = store$5;
+  Provider: Provider$6
+} = store$6;
 const GiftRedeemContainer = ({
   style,
@@ -19979,21 +20171,21 @@ const GiftRedeemContainer = ({
       default:
         return state;
     }
-  }, initialState$5);
+  }, initialState$6);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-gift-redeem-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$5, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$6, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$5,
+    store: store$6,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$5
+    store: store$6
   })));
 };
@@ -20030,7 +20222,7 @@ function GiftCode({
 }
 const GiftRedeemCode = props => /*#__PURE__*/React__default['default'].createElement(GiftCode, Object.assign({
-  store: store$5
+  store: store$6
 }, props));
 const GiftRedeemSubmitButton = ({
@@ -20043,7 +20235,7 @@ const GiftRedeemSubmitButton = ({
     state: {
       disableSubmit
     }
-  } = React.useContext(store$5);
+  } = React.useContext(store$6);
   const {
     t
   } = useTranslation("register");
@@ -20136,7 +20328,7 @@ const moveDefaultAddressToStart = addresses => {
   return [defaultAddress, ...addressesWithoutDefault];
 };
-const initialState$4 = {
+const initialState$5 = {
   addresses: [],
   selectedAddressId: null,
   isSubmitting: false,
@@ -20145,10 +20337,10 @@ const initialState$4 = {
     content: ""
   }
 };
-const store$4 = /*#__PURE__*/React.createContext(initialState$4);
+const store$5 = /*#__PURE__*/React.createContext(initialState$5);
 const {
-  Provider: Provider$4
-} = store$4;
+  Provider: Provider$5
+} = store$5;
 const AddressSelectContainer = ({
   style,
@@ -20243,7 +20435,7 @@ const AddressSelectContainer = ({
       default:
         return state;
     }
-  }, initialState$4);
+  }, initialState$5);
   React.useEffect(() => {
     var _window$Pelcro$user$r;
@@ -20256,16 +20448,16 @@ const AddressSelectContainer = ({
     style: { ...style
     },
     className: `pelcro-container pelcro-address-select-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$4, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$5, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$4,
+    store: store$5,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$4
+    store: store$5
   })));
 };
@@ -20276,7 +20468,7 @@ const AddressSelectList = () => {
       addresses,
       selectedAddressId
     }
-  } = React.useContext(store$4);
+  } = React.useContext(store$5);
   const handleAddressSelect = event => {
     dispatch({
@@ -20320,7 +20512,7 @@ const AddressSelectSubmit = ({
       selectedAddressId,
       isSubmitting
     }
-  } = React.useContext(store$4);
+  } = React.useContext(store$5);
   const {
     t
   } = useTranslation("address");
@@ -20416,7 +20608,7 @@ const moveDefaultPaymentMethodToStart = paymentMethods => {
   return [defaultPaymentMethod, ...paymentMethodsWithoutDefault];
 };
-const initialState$3 = {
+const initialState$4 = {
   paymentMethods: [],
   selectedPaymentMethodId: null,
   isSubmitting: false,
@@ -20425,10 +20617,10 @@ const initialState$3 = {
     content: ""
   }
 };
-const store$3 = /*#__PURE__*/React.createContext(initialState$3);
+const store$4 = /*#__PURE__*/React.createContext(initialState$4);
 const {
-  Provider: Provider$3
-} = store$3;
+  Provider: Provider$4
+} = store$4;
 const PaymentMethodSelectContainer = ({
   style,
@@ -20487,7 +20679,7 @@ const PaymentMethodSelectContainer = ({
       default:
         return state;
     }
-  }, initialState$3);
+  }, initialState$4);
   React.useEffect(() => {
     var _window$Pelcro$user$r3;
@@ -20500,16 +20692,16 @@ const PaymentMethodSelectContainer = ({
     style: { ...style
     },
     className: `pelcro-container pelcro-payment-select-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$3, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$4, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$3,
+    store: store$4,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$3
+    store: store$4
   })));
 };
@@ -20523,7 +20715,7 @@ const PaymentMethodSelectList = () => {
       paymentMethods,
       selectedPaymentMethodId
     }
-  } = React.useContext(store$3);
+  } = React.useContext(store$4);
   const handlePaymentMethodSelect = event => {
     dispatch({
@@ -20573,7 +20765,7 @@ const PaymentMethodSelectSubmit = ({
       selectedPaymentMethodId,
       isSubmitting
     }
-  } = React.useContext(store$3);
+  } = React.useContext(store$4);
   return /*#__PURE__*/React__default['default'].createElement(Button, Object.assign({
     onClick: () => {
       dispatch({
@@ -20647,8 +20839,8 @@ const PaymentMethodSelectModal = ({
 };
 PaymentMethodSelectModal.viewId = "payment-method-select";
-function _extends$i() {
-  _extends$i = Object.assign || function (target) {
+function _extends$j() {
+  _extends$j = Object.assign || function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
@@ -20662,7 +20854,7 @@ function _extends$i() {
     return target;
   };
-  return _extends$i.apply(this, arguments);
+  return _extends$j.apply(this, arguments);
 }
 function _objectWithoutPropertiesLoose(source, excluded) {
@@ -20846,7 +21038,7 @@ function render(props, propsBag, defaultTag, features, visible) {
     return match(strategy, (_match = {}, _match[RenderStrategy.Unmount] = function () {
       return null;
     }, _match[RenderStrategy.Hidden] = function () {
-      return _render(_extends$i({}, _rest, {
+      return _render(_extends$j({}, _rest, {
         hidden: true,
         style: {
           display: 'none'
@@ -21374,7 +21566,7 @@ function TransitionChild(props) {
   var passthroughProps = rest;
   return React__default['default'].createElement(NestingContext.Provider, {
     value: nesting
-  }, render(_extends$i({}, passthroughProps, propsWeControl), propsBag, DEFAULT_TRANSITION_CHILD_TAG, TransitionChildRenderFeatures, state === TreeStates.Visible));
+  }, render(_extends$j({}, passthroughProps, propsWeControl), propsBag, DEFAULT_TRANSITION_CHILD_TAG, TransitionChildRenderFeatures, state === TreeStates.Visible));
 }
 function Transition(props) {
@@ -21418,7 +21610,7 @@ function Transition(props) {
     value: nestingBag
   }, React__default['default'].createElement(TransitionContext.Provider, {
     value: transitionBag
-  }, render(_extends$i({}, sharedProps, {
+  }, render(_extends$j({}, sharedProps, {
     as: React.Fragment,
     children: React__default['default'].createElement(TransitionChild, Object.assign({}, sharedProps, passthroughProps))
   }), propsBag, React.Fragment, TransitionChildRenderFeatures, state === TreeStates.Visible)));
@@ -21545,12 +21737,12 @@ var ActionTypes;
 })(ActionTypes || (ActionTypes = {}));
 (_reducers = {}, _reducers[ActionTypes.CloseMenu] = function (state) {
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     activeItemIndex: null,
     menuState: MenuStates.Closed
   });
 }, _reducers[ActionTypes.OpenMenu] = function (state) {
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     menuState: MenuStates.Open
   });
 }, _reducers[ActionTypes.GoToItem] = function (state, action) {
@@ -21569,7 +21761,7 @@ var ActionTypes;
     }
   });
   if (state.searchQuery === '' && state.activeItemIndex === activeItemIndex) return state;
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     searchQuery: '',
     activeItemIndex: activeItemIndex
   });
@@ -21580,19 +21772,19 @@ var ActionTypes;
     return ((_item$dataRef$current = item.dataRef.current.textValue) == null ? void 0 : _item$dataRef$current.startsWith(searchQuery)) && !item.dataRef.current.disabled;
   });
-  if (match === -1 || match === state.activeItemIndex) return _extends$i({}, state, {
+  if (match === -1 || match === state.activeItemIndex) return _extends$j({}, state, {
     searchQuery: searchQuery
   });
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     searchQuery: searchQuery,
     activeItemIndex: match
   });
 }, _reducers[ActionTypes.ClearSearch] = function (state) {
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     searchQuery: ''
   });
 }, _reducers[ActionTypes.RegisterItem] = function (state, action) {
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     items: [].concat(state.items, [{
       id: action.id,
       dataRef: action.dataRef
@@ -21605,7 +21797,7 @@ var ActionTypes;
     return a.id === action.id;
   });
   if (idx !== -1) nextItems.splice(idx, 1);
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     items: nextItems,
     activeItemIndex: function () {
       if (idx === state.activeItemIndex) return null;
@@ -21644,19 +21836,19 @@ var ActionTypes$1;
 (_reducers$1 = {}, _reducers$1[ActionTypes$1.CloseListbox] = function (state) {
   if (state.disabled) return state;
   if (state.listboxState === ListboxStates.Closed) return state;
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     activeOptionIndex: null,
     listboxState: ListboxStates.Closed
   });
 }, _reducers$1[ActionTypes$1.OpenListbox] = function (state) {
   if (state.disabled) return state;
   if (state.listboxState === ListboxStates.Open) return state;
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     listboxState: ListboxStates.Open
   });
 }, _reducers$1[ActionTypes$1.SetDisabled] = function (state, action) {
   if (state.disabled === action.disabled) return state;
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     disabled: action.disabled
   });
 }, _reducers$1[ActionTypes$1.GoToOption] = function (state, action) {
@@ -21677,7 +21869,7 @@ var ActionTypes$1;
     }
   });
   if (state.searchQuery === '' && state.activeOptionIndex === activeOptionIndex) return state;
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     searchQuery: '',
     activeOptionIndex: activeOptionIndex
   });
@@ -21690,10 +21882,10 @@ var ActionTypes$1;
     return !option.dataRef.current.disabled && ((_option$dataRef$curre = option.dataRef.current.textValue) == null ? void 0 : _option$dataRef$curre.startsWith(searchQuery));
   });
-  if (match === -1 || match === state.activeOptionIndex) return _extends$i({}, state, {
+  if (match === -1 || match === state.activeOptionIndex) return _extends$j({}, state, {
     searchQuery: searchQuery
   });
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     searchQuery: searchQuery,
     activeOptionIndex: match
   });
@@ -21701,11 +21893,11 @@ var ActionTypes$1;
   if (state.disabled) return state;
   if (state.listboxState === ListboxStates.Closed) return state;
   if (state.searchQuery === '') return state;
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     searchQuery: ''
   });
 }, _reducers$1[ActionTypes$1.RegisterOption] = function (state, action) {
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     options: [].concat(state.options, [{
       id: action.id,
       dataRef: action.dataRef
@@ -21718,7 +21910,7 @@ var ActionTypes$1;
     return a.id === action.id;
   });
   if (idx !== -1) nextOptions.splice(idx, 1);
-  return _extends$i({}, state, {
+  return _extends$j({}, state, {
     options: nextOptions,
     activeOptionIndex: function () {
       if (idx === state.activeOptionIndex) return null;
@@ -21779,18 +21971,18 @@ const getPaymentCardIcon = name => {
   }));
 };
-var _path$g;
+var _path$h;
-function _extends$h() { _extends$h = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$h.apply(this, arguments); }
+function _extends$i() { _extends$i = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$i.apply(this, arguments); }
 function SvgChevronRight(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$h({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$i({
     className: "plc-w-6 plc-h-6",
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$g || (_path$g = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$h || (_path$h = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22006,18 +22198,18 @@ const SavedItems = ({
   });
 };
-var _path$f;
+var _path$g;
-function _extends$g() { _extends$g = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$g.apply(this, arguments); }
+function _extends$h() { _extends$h = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$h.apply(this, arguments); }
 function SvgRefresh(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$g({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$h({
     className: "plc-w-4 plc-h-4 plc-mr-1",
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$f || (_path$f = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$g || (_path$g = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22025,35 +22217,35 @@ function SvgRefresh(props) {
   })));
 }
-var _path$e;
+var _path$f;
-function _extends$f() { _extends$f = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$f.apply(this, arguments); }
+function _extends$g() { _extends$g = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$g.apply(this, arguments); }
 function SvgCalendar(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$f({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$g({
     xmlns: "http://www.w3.org/2000/svg",
     className: "plc-h-4 plc-w-4 plc-mr-1",
     viewBox: "0 0 20 20",
     fill: "currentColor"
-  }, props), _path$e || (_path$e = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$f || (_path$f = /*#__PURE__*/React__namespace.createElement("path", {
     fillRule: "evenodd",
     d: "M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z",
     clipRule: "evenodd"
   })));
 }
-var _path$d;
+var _path$e;
-function _extends$e() { _extends$e = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$e.apply(this, arguments); }
+function _extends$f() { _extends$f = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$f.apply(this, arguments); }
 function SvgPlus(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$e({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$f({
     className: "plc-w-5 plc-h-5",
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$d || (_path$d = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$e || (_path$e = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22061,17 +22253,17 @@ function SvgPlus(props) {
   })));
 }
-var _path$c;
+var _path$d;
-function _extends$d() { _extends$d = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$d.apply(this, arguments); }
+function _extends$e() { _extends$e = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$e.apply(this, arguments); }
 function SvgCheckMark(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$d({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$e({
     className: "plc-w-4 plc-h-4 plc-mr-1",
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20",
     fill: "currentColor"
-  }, props), _path$c || (_path$c = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$d || (_path$d = /*#__PURE__*/React__namespace.createElement("path", {
     fillRule: "evenodd",
     d: "M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z",
     clipRule: "evenodd"
@@ -22135,7 +22327,8 @@ const SubscriptionsItems = ({
   } = useTranslation("dashboard");
   const {
     switchView,
-    isAuthenticated
+    switchToAddressView,
+    switchToPaymentView
   } = usePelcro();
   const subs = getNonDonationSubs();
   if (subs.length === 0) return null;
@@ -22177,7 +22370,12 @@ const SubscriptionsItems = ({
       const plan = window.Pelcro.plan.getById(plan_id);
       setProductAndPlan(product, plan);
       setSubscriptionIdToRenew(sub.id);
-      setView("plan-select");
+      if (product.address_required) {
+        return switchToAddressView();
+      }
+      return switchToPaymentView();
     };
     const getPhases = () => {
@@ -22366,18 +22564,18 @@ Accordion.item = function AccordionItem({
   }, content)) : null;
 };
-var _path$b;
+var _path$c;
-function _extends$c() { _extends$c = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$c.apply(this, arguments); }
+function _extends$d() { _extends$d = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$d.apply(this, arguments); }
 function SvgExit(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$c({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$d({
     className: "plc-w-6 plc-h-6",
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$b || (_path$b = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$c || (_path$c = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22385,17 +22583,17 @@ function SvgExit(props) {
   })));
 }
-var _path$a;
+var _path$b;
-function _extends$b() { _extends$b = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$b.apply(this, arguments); }
+function _extends$c() { _extends$c = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$c.apply(this, arguments); }
 function SvgUser(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$b({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$c({
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$a || (_path$a = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$b || (_path$b = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22403,18 +22601,18 @@ function SvgUser(props) {
   })));
 }
-var _path$9;
+var _path$a;
-function _extends$a() { _extends$a = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$a.apply(this, arguments); }
+function _extends$b() { _extends$b = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$b.apply(this, arguments); }
 function SvgNewsletter(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$a({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$b({
     xmlns: "http://www.w3.org/2000/svg",
     className: "plc-h-5 plc-w-5",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$9 || (_path$9 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$a || (_path$a = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22422,18 +22620,18 @@ function SvgNewsletter(props) {
   })));
 }
-var _path$8;
+var _path$9;
-function _extends$9() { _extends$9 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$9.apply(this, arguments); }
+function _extends$a() { _extends$a = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$a.apply(this, arguments); }
 function SvgDocument(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$9({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$a({
     xmlns: "http://www.w3.org/2000/svg",
     className: "plc-h-6 plc-w-6 plc-mr-2",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$8 || (_path$8 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$9 || (_path$9 = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22441,18 +22639,18 @@ function SvgDocument(props) {
   })));
 }
-var _path$7;
+var _path$8;
-function _extends$8() { _extends$8 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$8.apply(this, arguments); }
+function _extends$9() { _extends$9 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$9.apply(this, arguments); }
 function SvgPaymentCard(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$8({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$9({
     className: "plc-w-6 plc-h-6 plc-mr-2",
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$7 || (_path$7 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$8 || (_path$8 = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22460,18 +22658,18 @@ function SvgPaymentCard(props) {
   })));
 }
-var _path$6, _path2$1;
+var _path$7, _path2$1;
-function _extends$7() { _extends$7 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$7.apply(this, arguments); }
+function _extends$8() { _extends$8 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$8.apply(this, arguments); }
 function SvgLocationPin(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$7({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$8({
     className: "plc-w-6 plc-h-6 plc-mr-2",
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$6 || (_path$6 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$7 || (_path$7 = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22486,10 +22684,10 @@ function SvgLocationPin(props) {
 var _switch;
-function _extends$6() { _extends$6 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$6.apply(this, arguments); }
+function _extends$7() { _extends$7 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$7.apply(this, arguments); }
 function SvgSubscription(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$6({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$7({
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 100 125",
     fill: "currentColor"
@@ -22504,18 +22702,18 @@ function SvgSubscription(props) {
   }))))));
 }
-var _path$5;
+var _path$6;
-function _extends$5() { _extends$5 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$5.apply(this, arguments); }
+function _extends$6() { _extends$6 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$6.apply(this, arguments); }
 function SvgShopping(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$5({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$6({
     className: "plc-w-6 plc-h-6 plc-mr-2",
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$5 || (_path$5 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$6 || (_path$6 = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22523,18 +22721,18 @@ function SvgShopping(props) {
   })));
 }
-var _path$4;
+var _path$5;
-function _extends$4() { _extends$4 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$4.apply(this, arguments); }
+function _extends$5() { _extends$5 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$5.apply(this, arguments); }
 function SvgBookmark(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$4({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$5({
     className: "plc-w-6 plc-h-6 plc-mr-2",
     xmlns: "http://www.w3.org/2000/svg",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$4 || (_path$4 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$5 || (_path$5 = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -22542,33 +22740,33 @@ function SvgBookmark(props) {
   })));
 }
-var _path$3;
+var _path$4;
-function _extends$3() { _extends$3 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$3.apply(this, arguments); }
+function _extends$4() { _extends$4 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$4.apply(this, arguments); }
 function SvgKey(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$3({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$4({
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 20 20",
     fill: "currentColor"
-  }, props), _path$3 || (_path$3 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$4 || (_path$4 = /*#__PURE__*/React__namespace.createElement("path", {
     fillRule: "evenodd",
     d: "M18 8a6 6 0 01-7.743 5.743L10 14l-1 1-1 1H6v2H2v-4l4.257-4.257A6 6 0 1118 8zm-6-4a1 1 0 100 2 2 2 0 012 2 1 1 0 102 0 4 4 0 00-4-4z",
     clipRule: "evenodd"
   })));
 }
-var _path$2;
+var _path$3;
-function _extends$2() { _extends$2 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$2.apply(this, arguments); }
+function _extends$3() { _extends$3 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$3.apply(this, arguments); }
 function SvgDonate(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$2({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$3({
     width: 24,
     height: 24,
     fill: "currentColor",
     xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path$2 || (_path$2 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$3 || (_path$3 = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M4 21h9.62a3.995 3.995 0 003.037-1.397l5.102-5.952a1 1 0 00-.442-1.6l-1.968-.656a3.043 3.043 0 00-2.823.503l-3.185 2.547-.617-1.235A3.98 3.98 0 009.146 11H4c-1.103 0-2 .897-2 2v6c0 1.103.897 2 2 2zm0-8h5.146c.763 0 1.448.423 1.789 1.105l.447.895H7v2h6.014a.996.996 0 00.442-.11l.003-.001.004-.002h.003l.002-.001h.004l.001-.001c.009.003.003-.001.003-.001.01 0 .002-.001.002-.001h.001l.002-.001.003-.001.002-.001.002-.001.003-.001.002-.001c.003 0 .001-.001.002-.001l.003-.002.002-.001.002-.001.003-.001.002-.001h.001l.002-.001h.001l.002-.001.002-.001c.009-.001.003-.001.003-.001l.002-.001a.915.915 0 00.11-.078l4.146-3.317c.262-.208.623-.273.94-.167l.557.186-4.133 4.823a2.029 2.029 0 01-1.52.688H4v-6zM16 2h-.017c-.163.002-1.006.039-1.983.705-.951-.648-1.774-.7-1.968-.704L12.002 2h-.004c-.801 0-1.555.313-2.119.878C9.313 3.445 9 4.198 9 5s.313 1.555.861 2.104l3.414 3.586a1.006 1.006 0 001.45-.001l3.396-3.568C18.688 6.555 19 5.802 19 5s-.313-1.555-.878-2.121A2.978 2.978 0 0016.002 2H16zm1 3c0 .267-.104.518-.311.725L14 8.55l-2.707-2.843C11.104 5.518 11 5.267 11 5s.104-.518.294-.708A.977.977 0 0111.979 4c.025.001.502.032 1.067.485.081.065.163.139.247.222l.707.707.707-.707c.084-.083.166-.157.247-.222.529-.425.976-.478 1.052-.484a.987.987 0 01.701.292c.189.189.293.44.293.707z"
   })));
 }
@@ -22895,9 +23093,10 @@ class Dashboard extends React.Component {
     }) => {
       if (isGift) {
         this.props.setProductAndPlan(null, null, true);
+        return this.props.setView("plan-select");
       }
-      return this.props.setView("plan-select");
+      return this.props.setView("subscription-options");
     });
     _defineProperty$3(this, "displayAddressCreate", () => {
@@ -23365,7 +23564,7 @@ const DashboardOpenButton = () => {
 };
 DashboardOpenButton.viewId = "dashboard-open";
-const initialState$2 = {
+const initialState$3 = {
   imageSrc: null,
   crop: {
     x: 0,
@@ -23379,10 +23578,10 @@ const initialState$2 = {
     content: ""
   }
 };
-const store$2 = /*#__PURE__*/React.createContext(initialState$2);
+const store$3 = /*#__PURE__*/React.createContext(initialState$3);
 const {
-  Provider: Provider$2
-} = store$2;
+  Provider: Provider$3
+} = store$3;
 const ProfilePicChangeContainer = ({
   style,
@@ -23516,21 +23715,21 @@ const ProfilePicChangeContainer = ({
       default:
         return state;
     }
-  }, initialState$2);
+  }, initialState$3);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-profile-picture-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$2, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$3, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$2,
+    store: store$3,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$2
+    store: store$3
   })));
 };
 /**
@@ -23592,7 +23791,7 @@ const ProfilePicChangeButton = ({
       isSubmitting
     },
     dispatch
-  } = React.useContext(store$2);
+  } = React.useContext(store$3);
   const {
     t
   } = useTranslation("userEdit");
@@ -24960,7 +25159,7 @@ const ProfilePicChangeCropper = ({
       zoom
     },
     dispatch
-  } = React.useContext(store$2);
+  } = React.useContext(store$3);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: `plc-relative plc-w-full plc-h-52 sm:plc-h-96 ${className}`
   }, /*#__PURE__*/React__default['default'].createElement(Cropper, Object.assign({
@@ -25002,7 +25201,7 @@ const ProfilePicChangeZoom = ({
       zoom
     },
     dispatch
-  } = React.useContext(store$2);
+  } = React.useContext(store$3);
   const {
     t
   } = useTranslation("userEdit");
@@ -25025,18 +25224,18 @@ const ProfilePicChangeZoom = ({
   }, otherProps)));
 };
-var _path$1;
+var _path$2;
-function _extends$1() { _extends$1 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$1.apply(this, arguments); }
+function _extends$2() { _extends$2 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$2.apply(this, arguments); }
 function SvgPhotograph(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$1({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$2({
     xmlns: "http://www.w3.org/2000/svg",
     className: "plc-h-6 plc-w-6",
     fill: "none",
     viewBox: "0 0 24 24",
     stroke: "currentColor"
-  }, props), _path$1 || (_path$1 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$2 || (_path$2 = /*#__PURE__*/React__namespace.createElement("path", {
     strokeLinecap: "round",
     strokeLinejoin: "round",
     strokeWidth: 2,
@@ -25054,7 +25253,7 @@ const ProfilePicChangeSelectButton = ({
     state: {
       isSubmitting
     }
-  } = React.useContext(store$2);
+  } = React.useContext(store$3);
   const {
     t
   } = useTranslation("userEdit");
@@ -25096,7 +25295,7 @@ const ProfilePicChangeRemoveButton = ({
     state: {
       isSubmitting
     }
-  } = React.useContext(store$2);
+  } = React.useContext(store$3);
   const {
     t
   } = useTranslation("userEdit");
@@ -25119,7 +25318,7 @@ const ProfilePicChangeWrapper = () => {
     state: {
       imageSrc
     }
-  } = React.useContext(store$2);
+  } = React.useContext(store$3);
   const {
     t
   } = useTranslation("userEdit");
@@ -25181,17 +25380,17 @@ function ProfilePicChangeModal({
 }
 ProfilePicChangeModal.viewId = "profile-picture";
-const initialState$1 = {
+const initialState$2 = {
   isSubmitting: false,
   alert: {
     type: "error",
     content: ""
   }
 };
-const store$1 = /*#__PURE__*/React.createContext(initialState$1);
+const store$2 = /*#__PURE__*/React.createContext(initialState$2);
 const {
-  Provider: Provider$1
-} = store$1;
+  Provider: Provider$2
+} = store$2;
 const EmailVerifyContainer = ({
   style,
@@ -25254,21 +25453,21 @@ const EmailVerifyContainer = ({
       default:
         return state;
     }
-  }, initialState$1);
+  }, initialState$2);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-email-verify-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider$1, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$2, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store: store$1,
+    store: store$2,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store: store$1
+    store: store$2
   })));
 };
@@ -25282,7 +25481,7 @@ const EmailVerifyResendButton = ({
     state: {
       isSubmitting
     }
-  } = React.useContext(store$1);
+  } = React.useContext(store$2);
   const {
     t
   } = useTranslation("verifyEmail");
@@ -25297,16 +25496,16 @@ const EmailVerifyResendButton = ({
   }, otherProps), name !== null && name !== void 0 ? name : t("labels.resend"));
 };
-var _path, _path2;
+var _path$1, _path2;
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends$1() { _extends$1 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$1.apply(this, arguments); }
 function SvgEmailVerify(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$1({
     className: "plc-w-6 plc-h-6",
     viewBox: "0 0 700 700",
     xmlns: "http://www.w3.org/2000/svg"
-  }, props), _path || (_path = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path$1 || (_path$1 = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M583.01 231.93a15.008 15.008 0 00-.887-3.875c-.562-1.254-1.129-2.508-1.695-3.762a14.686 14.686 0 00-1.898-1.789c-.438-.437-.653-1.027-1.153-1.414l-56.266-44.164v-52.484a15.555 15.555 0 00-15.554-15.555H434.56l-74.945-58.895a15.547 15.547 0 00-19.227 0l-74.945 58.895h-70.996a15.555 15.555 0 00-15.555 15.555v52.484l-56.266 44.16c-.496.39-.715.996-1.152 1.43v.004a13.37 13.37 0 00-1.898 1.773c-.22.426-.414.86-.59 1.305a14.158 14.158 0 00-1.106 2.457 15.009 15.009 0 00-.886 3.875c0 .48-.329.918-.329 1.398l.004 264.45a15.555 15.555 0 0015.555 15.555h435.55a15.555 15.555 0 0015.555-15.555v-264.45c0-.48-.278-.918-.325-1.398zm-41.176.809l-20.723 14.809v-31.11zm-191.83-150.73l34.223 26.883h-68.445zm-140 57.992h280v124.45c.07 1.593.383 3.168.934 4.664l-140.93 100.66-140.46-100.33c.214-.77.37-1.555.464-2.348zm-31.109 107.55l-20.719-14.81 20.719-16.27zm-31.113 234.67V263.56l193.18 137.99a15.562 15.562 0 0018.078 0l193.18-137.99v218.66z"
   })), _path2 || (_path2 = /*#__PURE__*/React__namespace.createElement("path", {
     d: "M324.33 291.81a15.56 15.56 0 0020.582-.297l85.555-77.777a15.56 15.56 0 00-20.938-23.023l-75.398 68.539-44.023-37.723a15.54 15.54 0 00-11.46-4.106 15.553 15.553 0 00-8.758 27.718z"
@@ -25410,11 +25609,11 @@ const invoicePaymentSubmitButton = props => {
   return /*#__PURE__*/React__default['default'].createElement(SubmitPaymentMethod, props);
 };
-const initialState = {};
-const store = /*#__PURE__*/React.createContext(initialState);
+const initialState$1 = {};
+const store$1 = /*#__PURE__*/React.createContext(initialState$1);
 const {
-  Provider
-} = store;
+  Provider: Provider$1
+} = store$1;
 const InvoiceDetailsContainer = ({
   style,
@@ -25435,21 +25634,21 @@ const InvoiceDetailsContainer = ({
       default:
         return state;
     }
-  }, initialState);
+  }, initialState$1);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: { ...style
     },
     className: `pelcro-container pelcro-invoice-details-container ${className}`
-  }, /*#__PURE__*/React__default['default'].createElement(Provider, {
+  }, /*#__PURE__*/React__default['default'].createElement(Provider$1, {
     value: {
       state,
       dispatch
     }
   }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
-    store,
+    store: store$1,
     key: i
   })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
-    store
+    store: store$1
   })));
 };
@@ -25481,7 +25680,7 @@ const InvoiceDetailsPayButton = ({
 }) => {
   const {
     dispatch
-  } = React.useContext(store);
+  } = React.useContext(store$1);
   const {
     t
   } = useTranslation("invoiceDetails");
@@ -25586,6 +25785,232 @@ const InvoiceDetailsModal = ({
 };
 InvoiceDetailsModal.viewId = "invoice-details";
+const initialState = {
+  selectedOption: ""
+};
+const store = /*#__PURE__*/React.createContext(initialState);
+const {
+  Provider
+} = store;
+const SubscriptionOptionsContainer = ({
+  style,
+  className = "",
+  onRenewSubSuccess = () => {},
+  onNewSubSuccess = () => {},
+  children,
+  ...props
+}) => {
+  const submit = ({
+    selectedOption
+  }, dispatch) => {
+    if (selectedOption === "renew") return onRenewSubSuccess();
+    if (selectedOption === "new") return onNewSubSuccess();
+  };
+  const [state, dispatch] = useReducerWithSideEffects((state, action) => {
+    switch (action.type) {
+      case SWITCH_TO_NEW:
+        return lib_7({ ...state,
+          selectedOption: "new"
+        });
+      case SWITCH_TO_RENEW:
+        return lib_7({ ...state,
+          selectedOption: "renew"
+        });
+      case HANDLE_SUBMIT:
+        return lib_4((state, dispatch) => submit(state));
+      default:
+        return state;
+    }
+  }, initialState);
+  return /*#__PURE__*/React__default['default'].createElement("div", {
+    style: { ...style
+    },
+    className: `pelcro-container pelcro-subscription-options-container ${className}`
+  }, /*#__PURE__*/React__default['default'].createElement(Provider, {
+    value: {
+      state,
+      dispatch
+    }
+  }, children.length ? children.map((child, i) => /*#__PURE__*/React__default['default'].cloneElement(child, {
+    store,
+    key: i
+  })) : /*#__PURE__*/React__default['default'].cloneElement(children, {
+    store
+  })));
+};
+var _path;
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function SvgPlusCircle(props) {
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends({
+    xmlns: "http://www.w3.org/2000/svg",
+    className: "plc-h-6 plc-w-6",
+    fill: "none",
+    viewBox: "0 0 24 24",
+    stroke: "currentColor",
+    strokeWidth: 2
+  }, props), _path || (_path = /*#__PURE__*/React__namespace.createElement("path", {
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    d: "M12 9v3m0 0v3m0-3h3m-3 0H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z"
+  })));
+}
+const SubscriptionOptionsNewButton = ({
+  name,
+  onClick,
+  ...otherProps
+}) => {
+  const {
+    dispatch,
+    state: {
+      selectedOption
+    }
+  } = React.useContext(store);
+  const {
+    t
+  } = useTranslation("subscriptionOptions");
+  const isChecked = selectedOption === "new";
+  return /*#__PURE__*/React__default['default'].createElement(Radio, Object.assign({
+    className: "plc-hidden pelcro-new-sub-option",
+    labelClassName: `plc-flex plc-flex-col plc-items-center plc-justify-center plc-text-lg plc-font-semibold plc-ml-0 plc-w-52 plc-h-52 plc-text-black plc-p-2 hover:plc-bg-gray-200 pelcro-new-sub-option-label plc-border-2 plc-text-center ${isChecked ? "plc-border-black" : "plc-border-gray-300"}`,
+    id: "pelcro-new-sub-option",
+    name: "option",
+    onChange: () => {
+      dispatch({
+        type: SWITCH_TO_NEW
+      });
+      onClick === null || onClick === void 0 ? void 0 : onClick();
+    },
+    checked: isChecked
+  }, otherProps), name !== null && name !== void 0 ? name : t("addNew"), /*#__PURE__*/React__default['default'].createElement(SvgPlusCircle, {
+    className: "plc-w-full plc-h-full plc-mr-0"
+  }));
+};
+const SubscriptionOptionsRenewButton = ({
+  name,
+  onClick,
+  ...otherProps
+}) => {
+  const {
+    dispatch,
+    state: {
+      selectedOption
+    }
+  } = React.useContext(store);
+  const {
+    t
+  } = useTranslation("subscriptionOptions");
+  const isChecked = selectedOption === "renew";
+  return /*#__PURE__*/React__default['default'].createElement(Radio, Object.assign({
+    className: "plc-hidden pelcro-renew-sub-option",
+    labelClassName: `plc-flex plc-flex-col plc-items-center plc-justify-center plc-text-lg plc-font-semibold plc-ml-0 plc-w-52 plc-h-52 plc-text-black plc-p-2 hover:plc-bg-gray-200  pelcro-renew-sub-option-label plc-border-2 plc-text-center ${isChecked ? "plc-border-black" : "plc-border-gray-300"}`,
+    id: "pelcro-renew-sub-option",
+    name: "option",
+    onChange: () => {
+      dispatch({
+        type: SWITCH_TO_RENEW
+      });
+      onClick === null || onClick === void 0 ? void 0 : onClick();
+    },
+    checked: isChecked
+  }, otherProps), name !== null && name !== void 0 ? name : t("renew"), /*#__PURE__*/React__default['default'].createElement(SvgRefresh, {
+    className: "plc-w-full plc-h-full plc-mr-0"
+  }));
+};
+const SubscriptionOptionsSubmit = ({
+  name,
+  onClick,
+  ...otherProps
+}) => {
+  const {
+    dispatch,
+    state: {
+      selectedOption
+    }
+  } = React.useContext(store);
+  const {
+    t
+  } = useTranslation("subscriptionOptions");
+  return /*#__PURE__*/React__default['default'].createElement(Button, Object.assign({
+    onClick: () => {
+      dispatch({
+        type: HANDLE_SUBMIT
+      });
+      onClick === null || onClick === void 0 ? void 0 : onClick();
+    },
+    disabled: !selectedOption
+  }, otherProps), name !== null && name !== void 0 ? name : t("next"));
+};
+const SubscriptionOptionsView = props => {
+  const {
+    t
+  } = useTranslation("subscriptionOptions");
+  return /*#__PURE__*/React__default['default'].createElement("div", {
+    id: "pelcro-subscription-options-view"
+  }, /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "plc-mb-6 plc-text-center plc-text-gray-900 pelcro-title-wrapper"
+  }, /*#__PURE__*/React__default['default'].createElement("h4", {
+    className: "plc-text-2xl plc-font-semibold"
+  }, t("title")), /*#__PURE__*/React__default['default'].createElement("p", null, t("subtitle"))), /*#__PURE__*/React__default['default'].createElement("form", {
+    action: "javascript:void(0);",
+    className: "plc-mt-2 pelcro-form"
+  }, /*#__PURE__*/React__default['default'].createElement(SubscriptionOptionsContainer, props, /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "plc-flex plc-justify-between plc-items-center"
+  }, /*#__PURE__*/React__default['default'].createElement(SubscriptionOptionsRenewButton, null), /*#__PURE__*/React__default['default'].createElement(SubscriptionOptionsNewButton, null)), /*#__PURE__*/React__default['default'].createElement(SubscriptionOptionsSubmit, {
+    role: "submit",
+    className: "plc-mt-4 plc-w-full",
+    name: t("next"),
+    id: "pelcro-submit"
+  }))));
+};
+const SubscriptionOptionsModal = ({
+  onDisplay,
+  onClose,
+  ...otherProps
+}) => {
+  const {
+    switchView,
+    setProductsList
+  } = usePelcro();
+  const onRenewSubSuccess = () => {
+    var _otherProps$onRenewSu;
+    (_otherProps$onRenewSu = otherProps.onRenewSubSuccess) === null || _otherProps$onRenewSu === void 0 ? void 0 : _otherProps$onRenewSu.call(otherProps);
+    setProductsList(getRenewableProducts());
+    switchView("_plan-select-renew");
+  };
+  const onNewSubSuccess = () => {
+    var _otherProps$onNewSubS;
+    (_otherProps$onNewSubS = otherProps.onNewSubSuccess) === null || _otherProps$onNewSubS === void 0 ? void 0 : _otherProps$onNewSubS.call(otherProps);
+    switchView("plan-select");
+  };
+  return /*#__PURE__*/React__default['default'].createElement(Modal, {
+    onDisplay: onDisplay,
+    onClose: onClose,
+    id: "pelcro-subscription-options-modal"
+  }, /*#__PURE__*/React__default['default'].createElement(ModalBody, null, /*#__PURE__*/React__default['default'].createElement(SubscriptionOptionsView, Object.assign({}, otherProps, {
+    onNewSubSuccess: onNewSubSuccess,
+    onRenewSubSuccess: onRenewSubSuccess
+  }))), /*#__PURE__*/React__default['default'].createElement(ModalFooter, null, /*#__PURE__*/React__default['default'].createElement(Authorship, null)));
+};
+SubscriptionOptionsModal.viewId = "subscription-options";
 exports.AddressCreateCity = AddressCreateCity;
 exports.AddressCreateContainer = AddressCreateContainer;
 exports.AddressCreateCountrySelect = AddressCreateCountrySelect;
@@ -25763,6 +26188,12 @@ exports.SubmitPaymentMethod = SubmitPaymentMethod;
 exports.SubscriptionCreateContainer = SubscriptionCreateContainer;
 exports.SubscriptionCreateModal = SubscriptionCreateModal;
 exports.SubscriptionCreateView = SubscriptionCreateView;
+exports.SubscriptionOptionsContainer = SubscriptionOptionsContainer;
+exports.SubscriptionOptionsModal = SubscriptionOptionsModal;
+exports.SubscriptionOptionsNewButton = SubscriptionOptionsNewButton;
+exports.SubscriptionOptionsRenewButton = SubscriptionOptionsRenewButton;
+exports.SubscriptionOptionsSubmit = SubscriptionOptionsSubmit;
+exports.SubscriptionOptionsView = SubscriptionOptionsView;
 exports.SubscriptionRenewContainer = SubscriptionRenewContainer;
 exports.SubscriptionRenewModal = SubscriptionRenewModal;
 exports.SubscriptionRenewView = SubscriptionRenewView;