diff --git a/apps/remix-ide/src/walkthroughService.js b/apps/remix-ide/src/walkthroughService.js index 2e5e9a8305..c531562633 100644 --- a/apps/remix-ide/src/walkthroughService.js +++ b/apps/remix-ide/src/walkthroughService.js @@ -6,8 +6,13 @@ export class WalkthroughService { } start (params) { +<<<<<<< HEAD document.addEventListener('doWalkThrough', (e) => { if (!localStorage.getItem('hadTour_initial')) { +======= + if (!localStorage.getItem('hadTour_initial')) { + document.addEventListener('doWalkThrough', (e) => { +>>>>>>> e0fcb6bcd (changes based on LianaHus comments complete) introJs().setOptions({ steps: [{ title: 'Welcome to Remix IDE', diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx b/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx index 7cbb790cc3..9ea772cfa6 100644 --- a/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx +++ b/libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx @@ -3,6 +3,7 @@ import React, { Fragment, useEffect, + useReducer, useRef } from 'react' @@ -23,6 +24,7 @@ export function RemixUiVerticalIconsPanel ({ }: RemixUiVerticalIconsPanelProps) { const scrollableRef = useRef() const iconPanelRef = useRef() + const udappPanelRef = useRef() function onThemeChanged (themeType: any) { const invert = themeType === 'dark' ? 1 : 0 @@ -107,10 +109,6 @@ export function RemixUiVerticalIconsPanel ({ scrollableRef={scrollableRef} /> - {scrollableRef.current && scrollableRef.current!.scrollHeight > scrollableRef.current!.clientHeight - ? - : null - }
500