Merge remote-tracking branch 'origin/memoize-timezonedst' into stage-…

…main-10-1d
StateVoicesNational · Apr 9, 2021 · 15436cd · 15436cd
2 parents 1fe295e + ab7e624
commit 15436cd
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/lib/timezones.js b/src/lib/timezones.js
@@ -214,17 +214,21 @@ export function convertOffsetsToStrings(offsetArray) {
 }
 
 export const getOffsets = (config, campaignOffsets) => {
-  const offsets = campaignOffsets || ALL_OFFSETS;
+  // TODO: campaignOffsetes will sometimes have an array of e.g. ['-5_1', ...]
+  // future we should split that out and then only process the dst/offset cases passed in
+  const offsets = /*campaignOffsets || */ ALL_OFFSETS;
   const valid = [];
   const invalid = [];
 
   const dst = [true, false];
   dst.forEach(hasDST =>
     offsets.forEach(offset => {
-      if (isBetweenTextingHours({ offset, hasDST }, config)) {
-        valid.push([offset, hasDST]);
-      } else {
-        invalid.push([offset, hasDST]);
+      if (offset) {
+        if (isBetweenTextingHours({ offset, hasDST }, config)) {
+          valid.push([offset, hasDST]);
+        } else {
+          invalid.push([offset, hasDST]);
+        }
       }
     })
   );