Merge branch 'newFEdesktop' of https://github.com/ethereum/remix-project into newFEdesktop

libs/remix-ui/search/src/lib/components/Search.tsx

@@ -8,8 +8,6 @@ import {FindContainer} from './FindContainer'
 import {Undo} from './Undo'
 import { platformContext } from '@remix-ui/app'
 
-
-
 export const SearchTab = (props) => {
   const plugin = props.plugin
   const platform = useContext(platformContext)

libs/remix-ui/workspace/src/lib/components/flat-tree.tsx

@@ -49,7 +49,6 @@ let mouseTimer: any = {
 
 export const FlatTree = (props: FlatTreeProps) => {
   const { files, flatTree, expandPath, focusEdit, editModeOff, handleTreeClick, moveFile, moveFolder, fileState, focusElement, handleClickFolder } = props
-  //const [flatTree, setFlatTree] = useState<{ [x: string]: FileType }>({})
   const [hover, setHover] = useState<string>('')
   const [mouseOverTarget, setMouseOverTarget] = useState<{
     path: string,
@@ -297,4 +296,4 @@ export const FlatTree = (props: FlatTreeProps) => {
     </div>
   </>)
 
-}
+}