fix conflict

pull/5370/head
bunsenstraat 3 months ago
parent a26280b6be
commit 426455a579
  1. 2
      libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx

@ -5,7 +5,6 @@ import ScamAlertStatus from './components/scamAlertStatus'
import ScamDetails from './components/scamDetails' import ScamDetails from './components/scamDetails'
import { FloatingFocusManager, autoUpdate, flip, offset, shift, size, useClick, useDismiss, useFloating, useInteractions, useRole } from '@floating-ui/react' import { FloatingFocusManager, autoUpdate, flip, offset, shift, size, useClick, useDismiss, useFloating, useInteractions, useRole } from '@floating-ui/react'
import axios from 'axios' import axios from 'axios'
import { appPlatformTypes, platformContext } from '@remix-ui/app'
// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
import { StatusBar } from 'apps/remix-ide/src/app/components/status-bar' import { StatusBar } from 'apps/remix-ide/src/app/components/status-bar'
import { StatusBarContextProvider } from '../contexts/statusbarcontext' import { StatusBarContextProvider } from '../contexts/statusbarcontext'
@ -27,7 +26,6 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
const [scamAlerts, setScamAlerts] = useState<ScamAlert[]>([]) const [scamAlerts, setScamAlerts] = useState<ScamAlert[]>([])
const [gitBranchName, setGitBranchName] = useState('') const [gitBranchName, setGitBranchName] = useState('')
const [isAiActive, setIsAiActive] = useState(false) const [isAiActive, setIsAiActive] = useState(false)
const platform = useContext(platformContext)
const { refs, context, floatingStyles } = useFloating({ const { refs, context, floatingStyles } = useFloating({
open: showScamDetails, open: showScamDetails,
onOpenChange: setShowScamDetails, onOpenChange: setShowScamDetails,

Loading…
Cancel
Save