Merge pull request #39830 from JKobrynski/checkForUndefinedInPromiseW…

…hile [No QA] Check for undefined in promiseWhile.ts
Expensify · Apr 9, 2024 · eda5932 · eda5932
2 parents 8a64b29 + 632926f
commit eda5932
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -12754,9 +12754,13 @@ function promiseDoWhile(condition, action) {
         console.info('[promiseWhile] promiseDoWhile() condition', condition);
         const actionResult = action?.();
         console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
+        if (!actionResult) {
+            resolve();
+            return;
+        }
         actionResult
-            ?.then(() => promiseWhile(condition, action))
-            .then(() => resolve())
+            .then(() => promiseWhile(condition, action))
+            .then(resolve)
             .catch(reject);
     });
 }

diff --git a/.github/libs/promiseWhile.ts b/.github/libs/promiseWhile.ts
@@ -30,9 +30,14 @@ function promiseDoWhile(condition: () => boolean, action: (() => Promise<void>)
         console.info('[promiseWhile] promiseDoWhile() condition', condition);
         const actionResult = action?.();
         console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
+        if (!actionResult) {
+            resolve();
+            return;
+        }
+
         actionResult
-            ?.then(() => promiseWhile(condition, action))
-            .then(() => resolve())
+            .then(() => promiseWhile(condition, action))
+            .then(resolve)
             .catch(reject);
     });
 }