diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts index 484645b391..ba6266be54 100644 --- a/apps/remix-ide-e2e/src/helpers/init.ts +++ b/apps/remix-ide-e2e/src/helpers/init.ts @@ -7,6 +7,8 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url .url(url || 'http://127.0.0.1:8080') .pause(5000) .switchBrowserTab(0) + .waitForElementVisible('[id="remixTourSkipbtn"]') + .click('[id="remixTourSkipbtn"]') .fullscreenWindow(() => { if (preloadPlugins) { initModules(browser, () => { diff --git a/apps/remix-ide-e2e/src/tests/pluginManager.spec.ts b/apps/remix-ide-e2e/src/tests/pluginManager.spec.ts index f87bf1269e..8ea40977ca 100644 --- a/apps/remix-ide-e2e/src/tests/pluginManager.spec.ts +++ b/apps/remix-ide-e2e/src/tests/pluginManager.spec.ts @@ -114,7 +114,7 @@ module.exports = { .click('*[data-id="localPluginRadioButtonsidePanel"]') .click('*[data-id="modalDialogModalFooter"]') .modalFooterOKClick() - .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonremixIde"]', 60000) + .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonremixIde"]', 100000) }, 'Should display error message for creating already existing plugin': function (browser: NightwatchBrowser) { diff --git a/apps/remix-ide-e2e/src/tests/verticalIconsPanel.spec.ts b/apps/remix-ide-e2e/src/tests/verticalIconsPanel.spec.ts index 29eaf4a95b..d0593433c9 100644 --- a/apps/remix-ide-e2e/src/tests/verticalIconsPanel.spec.ts +++ b/apps/remix-ide-e2e/src/tests/verticalIconsPanel.spec.ts @@ -22,6 +22,7 @@ module.exports = { 'Checks vertical icons panel contex menu deactivate': function (browser: NightwatchBrowser) { browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 10000) .waitForElementVisible('*[data-id="verticalIconsKinddebugger"]', 7000) + .pause(5000) .rightClick('[data-id="verticalIconsKinddebugger"]') .click('*[id="menuitemdeactivate"]') .click('*[data-id="verticalIconsKindsettings"]') diff --git a/apps/remix-ide/src/walkthroughService.js b/apps/remix-ide/src/walkthroughService.js index 1ec09308b8..2969d1190f 100644 --- a/apps/remix-ide/src/walkthroughService.js +++ b/apps/remix-ide/src/walkthroughService.js @@ -18,7 +18,7 @@ export class WalkthroughService { { element: document.querySelector('#compileIcons'), title: 'Solidity Compiler', - intro: 'Having selected a .sol file in the File Explorers(the icon above), compile it with the Solidity Compiler.', + intro: 'Having selected a .sol file in the File Explorers (the icon above), compile it with the Solidity Compiler.', tooltipClass: 'bg-light text-dark', position: 'right' }, @@ -28,16 +28,22 @@ export class WalkthroughService { intro: 'Choose a chain, deploy a contract and play with your functions.', tooltipClass: 'bg-light text-dark', position: 'right' - }, - { - title: 'The plugins world', - element: document.querySelector('#settingsIcons'), - intro: 'Explore more plugins and manage permissions.', - tooltipClass: 'bg-light text-dark', - position: 'right', - doneLabel: 'Done!' } ] + }).onafterchange((targetElement) => { + const header = document.getElementsByClassName('introjs-tooltip-header')[0] + if (header) { + header.classList.add('d-flex') + header.classList.add('justify-content-between') + header.classList.add('text-nowrap') + header.classList.add('pr-0') + } + const skipbutton = document.getElementsByClassName('introjs-skipbutton')[0] + if (skipbutton) { + skipbutton.classList.add('ml-3') + skipbutton.classList.add('text-decoration-none') + skipbutton.id = 'remixTourSkipbtn' + } }).start() localStorage.setItem('hadTour_initial', true) }