@ordergroove/offers 2.27.4 → 2.27.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.27.4",
+  "version": "2.27.7",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -43,7 +43,7 @@
     "throttle-debounce": "^2.1.0"
   },
   "devDependencies": {
-    "@ordergroove/offers-templates": "^0.4.12"
+    "@ordergroove/offers-templates": "^0.4.13"
   },
-  "gitHead": "3aa25b94b2ea166d28a20395a43de993c59e65e2"
+  "gitHead": "09226ede168eae0ac25625557615c4c6a6dfc247"
 }

package/src/components/OptinSelect.js

@@ -5,6 +5,7 @@ import { OptinStatus, mapStateToProps as mapStateToPropsOptinStatus } from './Op
 import { mapStateToProps, frequencyText } from './FrequencyStatus';
 import { connect } from '../core/connect';
 import { defaultFrequency } from '../core/props';
+import { configSelector } from '../core/selectors';
 
 export class OptinSelect extends withChildOptions(OptinStatus) {
   static get properties() {
@@ -30,8 +31,14 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
     `;
   }
 
-  get isSelected() {
-    return this.subscribed ? this.frequency : 'optedOut';
+  get currentFrequency() {
+    if (!this.subscribed) {
+      return 'optedOut';
+    }
+    if (this.frequency) {
+      return this.frequency;
+    }
+    return this.defaultFrequency;
   }
 
   onOptinChange(value) {
@@ -43,9 +50,9 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
   }
 
   render() {
-    const { options: childOptions, isSelected } = this.childOptions;
-    let options = childOptions;
-    if (!childOptions.length) {
+    const { options: childOptions } = this.childOptions;
+    let options;
+    if (this.frequencies?.length) {
       options = [
         {
           value: 'optedOut',
@@ -53,17 +60,30 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
             <og-text key="offerOptOutLabel"></og-text>
           `
         },
-        ...(this.frequencies || []).map(value => ({
+        ...this.frequencies.map((value, ix) => ({
           value,
-          text: frequencyText(value, this.defaultFrequency)
+          text:
+            this.frequenciesText && ix in this.frequenciesText
+              ? this.frequenciesText[ix]
+              : frequencyText(value, this.defaultFrequency)
         }))
       ];
+    } else {
+      options = [
+        {
+          value: 'optedOut',
+          text: html`
+            <og-text key="offerOptOutLabel"></og-text>
+          `
+        },
+        ...childOptions
+      ];
     }
 
     return html`
       <og-select
         .options="${options}"
-        .selected="${isSelected}"
+        .selected="${this.currentFrequency}"
         .onChange="${({ target: { value } }) => this.onOptinChange(value)}"
       ></og-select>
     `;
@@ -73,7 +93,8 @@ export class OptinSelect extends withChildOptions(OptinStatus) {
 export const ConnectedOptinSelect = connect(
   (state, ownProps) => ({
     ...mapStateToPropsOptinStatus(state, ownProps),
-    ...mapStateToProps(state, ownProps)
+    ...mapStateToProps(state, ownProps),
+    ...configSelector(state, ownProps, 'frequencies')
   }),
   { productChangeFrequency, optoutProduct }
 )(OptinSelect);