Skip to content

Commit ac44803

Browse files
fix: reviews
1 parent 67e5017 commit ac44803

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

extension/chrome/elements/compose-modules/compose-recipients-module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ export class ComposeRecipientsModule extends ViewModule<ComposeView> {
313313
}, 0);
314314
})();
315315
}
316-
await Promise.all(recipientEls.map(r => r.evaluating).filter((p): p is Promise<void> => p !== undefined));
316+
await Promise.all(recipientEls.map(r => r.evaluating).filter(p => p !== undefined));
317317
if (triggerCallback) {
318318
for (const callback of this.onRecipientAddedCallbacks) {
319319
callback(recipientEls);
@@ -405,7 +405,7 @@ export class ComposeRecipientsModule extends ViewModule<ComposeView> {
405405
if (this.view.S.cached('input_addresses_container_outer').hasClass('invisible')) {
406406
return;
407407
}
408-
await Promise.all(this.addedRecipients.map(r => r.evaluating).filter((p): p is Promise<void> => p !== undefined)); // Wait until all recipients loaded.
408+
await Promise.all(this.addedRecipients.map(r => r.evaluating).filter(p => p !== undefined)); // Wait until all recipients loaded.
409409
this.showHideCcAndBccInputsIfNeeded();
410410
this.view.S.cached('input_addresses_container_outer').addClass('invisible');
411411
this.view.S.cached('recipients_placeholder').css('display', 'flex');

extension/chrome/elements/compose-modules/compose-render-module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,8 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
478478
private loadRecipientsThenSetTestStateReady = async () => {
479479
const evaluatingPromises = this.view.recipientsModule
480480
.getRecipients()
481-
.filter(r => r.evaluating)
482481
.map(r => r.evaluating)
483-
.filter((p): p is Promise<void> => p !== undefined);
482+
.filter(r => !!r);
484483
await Promise.all(evaluatingPromises);
485484
document.querySelector('body')?.setAttribute('data-test-state', 'ready'); // set as ready so that automated tests can evaluate results
486485
};

test/source/browser/browser-handle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class BrowserHandle {
119119
let html = '';
120120
for (let i = 0; i < this.pages.length; i++) {
121121
const cPage = this.pages[i];
122-
const url = await Promise.race([Promise.resolve(cPage.page.url()), new Promise<string>(resolve => setTimeout(() => resolve('(url get timeout)'), 10 * 1000))]);
122+
const url = cPage.page.url();
123123
const consoleMsgs = await cPage.console(t, alsoLogToConsole);
124124
const alerts = cPage.alerts
125125
.map(a => `${a.active ? `<b class="c-error">ACTIVE ${a.target.type()}</b>` : a.target.type()}: ${a.target.message()}`)

0 commit comments

Comments
 (0)