LaconicNetwork/mars-v2-frontend
4
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: fixed merge issues

Browse Source
This commit is contained in:
Linkie Link 2024-01-24 17:08:53 +01:00
parent 74c9a41a8b
commit 8a61d5413e
No known key found for this signature in database
GPG Key ID: 5318B0F2564D38EA
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/account/AccountDetails/index.tsx
View File

@ -25,7 +25,6 @@ import useAllAssets from 'hooks/assets/useAllAssets'
import useLocalStorage from 'hooks/localStorage/useLocalStorage' import useLocalStorage from 'hooks/localStorage/useLocalStorage'
import useAccountId from 'hooks/useAccountId' import useAccountId from 'hooks/useAccountId'
import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData' import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData'
import useCurrentAccount from 'hooks/useCurrentAccount'
import useHLSStakingAssets from 'hooks/useHLSStakingAssets' import useHLSStakingAssets from 'hooks/useHLSStakingAssets'
import useHealthComputer from 'hooks/useHealthComputer' import useHealthComputer from 'hooks/useHealthComputer'
import useLendingMarketAssetsTableData from 'hooks/useLendingMarketAssetsTableData' import useLendingMarketAssetsTableData from 'hooks/useLendingMarketAssetsTableData'

1
src/components/perps/BalancesTable/Columns/Manage.tsx
View File

@ -3,7 +3,6 @@ import { useSearchParams } from 'react-router-dom'
import DropDownButton from 'components/common/Button/DropDownButton' import DropDownButton from 'components/common/Button/DropDownButton'
import { Cross, Edit } from 'components/common/Icons' import { Cross, Edit } from 'components/common/Icons'
import { PerpPositionRow } from 'components/perps/BalancesTable/usePerpsBalancesData'
import useCurrentAccount from 'hooks/accounts/useCurrentAccount' import useCurrentAccount from 'hooks/accounts/useCurrentAccount'
import useStore from 'store' import useStore from 'store'
import { SearchParams } from 'types/enums/searchParams' import { SearchParams } from 'types/enums/searchParams'