diff --git a/package.json b/package.json index 2a31b17..bae5f97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "microsoft-rewards-script", - "version": "1.5.2", + "version": "1.5.3", "description": "Automatically do tasks for Microsoft Rewards but in TS!", "main": "index.js", "engines": { diff --git a/src/browser/BrowserUtil.ts b/src/browser/BrowserUtil.ts index 3a4386c..dab4fe5 100644 --- a/src/browser/BrowserUtil.ts +++ b/src/browser/BrowserUtil.ts @@ -11,7 +11,7 @@ export default class BrowserUtil { this.bot = bot } - async tryDismissAllMessages(page: Page): Promise { + async tryDismissAllMessages(page: Page): Promise { const buttons = [ { selector: 'button[type="submit"]', label: 'Submit Button' }, { selector: '#acceptButton', label: 'AcceptButton' }, @@ -29,26 +29,18 @@ export default class BrowserUtil { { selector: '#reward_pivot_earn', label: 'Reward Coupon Accept' } ] - const dismissTasks = buttons.map(async (button) => { + for (const button of buttons) { try { - const element = button.isXPath - ? page.locator(`xpath=${button.selector}`) - : page.locator(button.selector) + const element = button.isXPath ? page.locator(`xpath=${button.selector}`) : page.locator(button.selector) + await element.first().click({ timeout: 500 }) + await page.waitForTimeout(500) - if (await element.first().isVisible({ timeout: 1000 })) { - await element.first().click({ timeout: 1000 }) - await page.waitForTimeout(500) - this.bot.log(this.bot.isMobile, 'DISMISS-ALL-MESSAGES', `Dismissed: ${button.label}`) - return true - } - } catch { + this.bot.log(this.bot.isMobile, 'DISMISS-ALL-MESSAGES', `Dismissed: ${button.label}`) + + } catch (error) { // Silent fail } - return false - }) - - const results = await Promise.allSettled(dismissTasks) - return results.some(result => result.status === 'fulfilled' && result.value === true) + } } async getLatestTab(page: Page): Promise {