Merge pull request #40104 from JKobrynski/addUndefinedCheckToPromiseW…

…hile [No QA] Check for undefined in promiseWhile.ts - follow-up
Expensify · Apr 15, 2024 · 447f0f7 · 447f0f7
2 parents 2815cf2 + 927b522
commit 447f0f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -12738,6 +12738,10 @@ function promiseWhile(condition, action) {
             else {
                 const actionResult = action?.();
                 console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
+                if (!actionResult) {
+                    resolve();
+                    return;
+                }
                 Promise.resolve(actionResult).then(loop).catch(reject);
             }
         };

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