dce-reactkit 3.3.3-beta.1 → 3.3.4

package/dist/cjs/index.js

@@ -560,15 +560,14 @@ let storedSendRequest;
  * @returns sendRequest function
  */
 const getSendRequest = () => __awaiter(void 0, void 0, void 0, function* () {
-    // Wait for initialization or timeout
+    // Track timeout
     let timedOut = false;
-    yield Promise.all([
-        (() => __awaiter(void 0, void 0, void 0, function* () {
-            yield waitMs(5000);
-            timedOut = true;
-        }))(),
-        initialized,
-    ]);
+    (() => __awaiter(void 0, void 0, void 0, function* () {
+        yield waitMs(5000);
+        timedOut = true;
+    }))(),
+        // Wait for initialization
+        yield initialized;
     // Error if no send request function
     if (timedOut) {
         showFatalError(new ErrorWithCode('Could not send a request because the request needed to be sent before dce-reactkit was properly initialized. Perhaps dce-reactkit was not initialized with initClient.', ReactKitErrorCode$1.NoCACCLSendRequestFunction));
@@ -1304,9 +1303,10 @@ const getOrdinal = (num) => {
  * Get current time info in US Boston Eastern Time, independent of machine
  *   timezone
  * @author Gabe Abrams
- * @param [date=now] the date to get info on or a ms since epoch timestamp
+ * @param [dateOrTimestamp=now] the date to get info on or a ms since epoch timestamp
  * @returns object with timestamp (ms since epoch) and numbers
- *   corresponding to ET time values for year, month, day, hour, minute
+ *   corresponding to ET time values for year, month, day, hour, hour12, minute, isPM
+ *   where hour is in 24hr time and hour12 is in 12hr time.
  */
 const getTimeInfoInET = (dateOrTimestamp) => {
     // Create a time string
@@ -1336,14 +1336,15 @@ const getTimeInfoInET = (dateOrTimestamp) => {
     const month = Number.parseInt(monthStr, 10);
     const day = Number.parseInt(dayStr, 10);
     const minute = Number.parseInt(minStr, 10);
-    let hour = Number.parseInt(hourStr, 10);
+    let hour12 = Number.parseInt(hourStr, 10);
     // Convert from am/pm to 24hr
     const isAM = ending.toLowerCase().includes('am');
     const isPM = !isAM;
-    if (isPM && hour !== 12) {
+    let hour = hour12;
+    if (isPM && hour12 !== 12) {
         hour += 12;
     }
-    else if (isAM && hour === 12) {
+    else if (isAM && hour12 === 12) {
         hour = 0;
     }
     // Return
@@ -1353,6 +1354,8 @@ const getTimeInfoInET = (dateOrTimestamp) => {
         month,
         day,
         hour,
+        hour12,
+        isPM,
         minute,
     };
 };