diff --git a/chrome-extension/background/jobs/run-sync.tab.job.ts b/chrome-extension/background/jobs/run-sync.tab.job.ts index 02ececc..faee71b 100644 --- a/chrome-extension/background/jobs/run-sync.tab.job.ts +++ b/chrome-extension/background/jobs/run-sync.tab.job.ts @@ -167,8 +167,8 @@ export class RunSyncTabJob implements IJob { this.notify('Sync has been canceled', `${adMobAccount.email} sync has been canceled.`); } else { this.notify( - 'Sync has finished', - `Appodeal's ${currentUser.email} and Admob ${adMobAccount.email} accounts are in sync.` + '

Sync has finished!

', + `

Appodeal's ${currentUser.email} and Admob ${adMobAccount.email} accounts are in sync.

` ); } break; diff --git a/chrome-extension/content-scripts/admob-content-script.ts b/chrome-extension/content-scripts/admob-content-script.ts index d20b3c8..7be112f 100644 --- a/chrome-extension/content-scripts/admob-content-script.ts +++ b/chrome-extension/content-scripts/admob-content-script.ts @@ -46,7 +46,16 @@ $(document).ready(function () { pingIntervalId = setInterval(pingBackgroundScript, 500); // @see legacy/js/modal.js modal = new Modal(); - modal.show(title, 'Start sync inventory'); + modal.show( + title, + `

Start sync inventory

+
+ + + +

Don't close the window otherwise synchronization will be interrupted!

+
` + ); } function onUpdateProgress (syncProgress) { diff --git a/chrome-extension/popup/utils/popupClickHandlers.ts b/chrome-extension/popup/utils/popupClickHandlers.ts index e965924..aafe0b0 100644 --- a/chrome-extension/popup/utils/popupClickHandlers.ts +++ b/chrome-extension/popup/utils/popupClickHandlers.ts @@ -38,8 +38,7 @@ export async function onClickStartAdmobAccountSetup () { setTimeout(() => {window.close();}, 200); } - -export async function startSyncAdmobAccount () { +export async function reloadPageAdMobAccount () { const tabs = await chrome.tabs.query({active: true, currentWindow: true}); const tab = tabs[0]; if (tab.url && tab.url.startsWith(ADMOB_DASHBOARD_ROOT)) { @@ -47,6 +46,12 @@ export async function startSyncAdmobAccount () { } else { await chrome.tabs.update(tab.id, {url: ADMOB_HOME_WITH_RELOGIN}); } + + return tab; +} + +export async function startSyncAdmobAccount () { + let tab = await reloadPageAdMobAccount(); await setCurrentJob(TabJobs.syncAdunits, tab.id); } diff --git a/src/core/sync-apps/sync.ts b/src/core/sync-apps/sync.ts index 0355337..5d44b8f 100644 --- a/src/core/sync-apps/sync.ts +++ b/src/core/sync-apps/sync.ts @@ -32,6 +32,7 @@ import {SyncEventEmitter} from './sync-event.emitter'; import {SyncRunner} from './sync-runner'; import {SyncErrorEvent, SyncEvent, SyncEventsTypes, SyncReportProgressEvent, SyncStopEvent} from './sync.events'; import escapeStringRegexp = require('escape-string-regexp'); +import {reloadPageAdMobAccount} from "../../../chrome-extension/popup/utils/popupClickHandlers"; const isObject = (v) => v !== null && typeof v === 'object'; @@ -161,6 +162,7 @@ export class Sync { throw e; } finally { this.finish(); + setTimeout(async () => await reloadPageAdMobAccount(), 2000); } }