merge conflicts resolved

Author: STetsing

libs/remix-ui/helper/src/index.ts

@@ -7,4 +7,5 @@ export * from './lib/components/custom-tooltip'
 export * from './lib/components/feedback'
 export * from './lib/components/solScanTable'
 export type { CompilerReport } from './types/compilerTypes'
-export * from './types/solidity-scan'
+export * from './types/solidity-scan'
+export * from './lib/solidity-scan'

libs/remix-ui/tabs/src/lib/components/CompileDropdown.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useContext } from 'react'
 import DropdownMenu, { MenuItem } from './DropdownMenu'
 import { AppModal } from '@remix-ui/app'
 import { FormattedMessage } from 'react-intl'
-import { handleSolidityScan } from '@remix-project/core-plugin'
+import { handleSolidityScan } from '@remix-ui/helper'
 import { TrackingContext } from '@remix-ide/tracking'
 
 import { ArrowRightBig, IpfsLogo, SwarmLogo, SettingsLogo, SolidityScanLogo, AnalysisLogo, TsLogo } from '@remix-ui/tabs'