From 2e710a2cdc741041572181d42f43585583e4ce03 Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:03:19 -0400 Subject: [PATCH] chore: enable organize imports to remove unused imports (#471) * chore: enable organize imports to remove unused imports * run organize imports on all files (#473) --- .ladle/components.tsx | 19 ++++---- .vscode/settings.json | 19 ++++---- __tests__/e2e/test.e2e.ts | 2 +- src/App.tsx | 4 +- src/components/Accordion.tsx | 2 +- src/components/Checkbox.tsx | 2 +- src/components/Collapsible.stories.tsx | 2 +- src/components/Collapsible.tsx | 2 +- src/components/CollapsibleNavigationMenu.tsx | 5 +- src/components/CollapsibleTabs.tsx | 4 +- src/components/ComboboxMenu.tsx | 6 +-- src/components/Details.tsx | 4 +- src/components/Dialog.tsx | 12 ++--- src/components/DiffOutput.tsx | 4 +- src/components/DropdownHeaderMenu.tsx | 2 +- src/components/DropdownMenu.tsx | 5 +- src/components/DropdownSelectMenu.tsx | 6 +-- src/components/GradientCard.tsx | 2 +- src/components/Icon.tsx | 8 ++-- src/components/Input.stories.tsx | 2 +- src/components/Input.tsx | 2 +- src/components/Loading/LoadingSpinner.tsx | 2 +- src/components/NavigationMenu.tsx | 10 ++-- src/components/Output.tsx | 4 +- .../PageMenu/PageMenuRadioGroup.tsx | 2 +- src/components/Popover.tsx | 4 +- src/components/RadioButtonCards.tsx | 2 +- src/components/SearchInput.tsx | 2 +- src/components/SearchSelectMenu.tsx | 4 +- src/components/SelectMenu.stories.tsx | 2 +- src/components/SelectMenu.tsx | 13 +++-- src/components/Table.tsx | 20 ++++---- src/components/Table/ActionsTableCell.tsx | 1 + src/components/Table/MarketTableCell.tsx | 2 +- src/components/Tabs.tsx | 2 +- src/components/TimeoutButton.tsx | 4 +- src/components/Toast.tsx | 4 +- src/components/ToastArea.tsx | 2 - src/components/ToggleGroup.tsx | 2 +- src/components/Toolbar.tsx | 2 +- src/components/TriangleIndicator.stories.tsx | 4 +- .../WithConfirmationPopover.stories.tsx | 2 +- src/components/WithReceipt.tsx | 2 +- src/components/WithSidebar.tsx | 2 +- src/components/WithTooltip.tsx | 2 +- src/components/visx/TimeSeriesChart.tsx | 8 ++-- .../visx/XYChartTooltipWithBounds.tsx | 2 +- .../visx/XYChartWithPointerEvents.tsx | 2 +- src/constants/analytics.ts | 2 +- src/constants/localization.ts | 4 +- src/constants/tooltips/deposit.ts | 2 +- src/constants/tooltips/general.ts | 2 +- src/constants/tooltips/portfolio.ts | 2 +- src/constants/tooltips/trade.ts | 2 +- src/constants/tooltips/triggers.ts | 2 +- src/constants/tooltips/withdraw.ts | 2 +- src/constants/wallets.ts | 4 +- src/hooks/Orderbook/useOrderbookValues.ts | 2 +- .../Orderbook/useSpreadRowScrollListener.ts | 2 +- src/hooks/index.ts | 12 ++--- src/hooks/tradingView/useChartLines.ts | 4 +- src/hooks/tradingView/useTradingView.ts | 4 +- src/hooks/tradingView/useTradingViewTheme.ts | 4 +- src/hooks/useAccounts.tsx | 10 ++-- src/hooks/useAnalytics.ts | 4 +- src/hooks/useAppThemeAndColorMode.tsx | 4 +- src/hooks/useCurrentMarketId.ts | 4 +- src/hooks/useDialogArea.tsx | 2 +- src/hooks/useDydxClient.tsx | 6 +-- src/hooks/useIsFirstRender.ts | 2 +- src/hooks/useLocalNotifications.tsx | 4 +- src/hooks/useMarketsData.ts | 4 +- src/hooks/useNotificationTypes.tsx | 8 ++-- src/hooks/useNotifications.tsx | 6 +-- src/hooks/useRestrictions.tsx | 2 - src/hooks/useStringGetter.ts | 2 +- src/hooks/useSubaccount.tsx | 8 ++-- src/hooks/useWalletConnection.ts | 16 +++---- src/layout/Footer/FooterDesktop.tsx | 2 +- src/layout/Header/HeaderDesktop.tsx | 4 +- .../NotifcationStack.tsx | 2 +- src/lib/__test__/timeUtils.ts | 4 +- src/lib/abacus/conversions.ts | 4 +- src/lib/abacus/dydxChainTransactions.ts | 25 +++++----- src/lib/abacus/formatter.ts | 2 +- src/lib/abacus/index.ts | 26 +++++----- src/lib/abacus/stateNotification.ts | 6 +-- src/lib/addressUtils.ts | 2 +- src/lib/analytics.ts | 4 +- src/lib/dateTime.ts | 2 +- src/lib/network.ts | 2 +- src/lib/orders.ts | 6 +-- src/lib/positions.ts | 4 +- src/lib/tradeData.ts | 8 ++-- src/lib/tradingView/dydxfeed/index.ts | 2 +- src/lib/tradingView/utils.ts | 2 +- src/lib/wagmi.ts | 36 +++++++------- src/lib/wallet/index.ts | 4 +- src/lib/wallet/providers.ts | 4 +- src/pages/Profile.tsx | 5 +- src/pages/portfolio/Overview.tsx | 6 ++- src/pages/portfolio/PortfolioNavMobile.tsx | 1 - src/pages/portfolio/Positions.tsx | 6 ++- src/pages/settings/Settings.tsx | 4 +- src/pages/settings/SettingsHeader.tsx | 2 +- src/pages/token/rewards/DYDXBalancePanel.tsx | 4 +- src/pages/token/rewards/MigratePanel.tsx | 2 +- src/pages/token/staking/StakingPanel.tsx | 1 - src/pages/trade/TradeDialogTrigger.tsx | 2 +- src/state/account.ts | 10 ++-- src/state/accountCalculators.ts | 3 +- src/state/accountSelectors.ts | 12 ++--- src/state/configsSelectors.ts | 2 +- src/state/inputs.ts | 2 +- src/state/localization.ts | 2 +- src/state/localizationMiddleware.ts | 2 +- src/state/notifications.ts | 2 +- src/state/perpetuals.ts | 2 +- src/state/perpetualsCalculators.ts | 2 +- src/styles/themes.ts | 2 +- .../AccountInfo/AccountInfoConnectedState.tsx | 4 +- src/views/MarketDetails.tsx | 2 +- src/views/MarketFilter.tsx | 48 +++++++++---------- src/views/MarketStatsDetails.tsx | 2 +- src/views/MarketsDropdown.tsx | 2 +- src/views/MidMarketPrice.tsx | 2 +- src/views/NextFundingTimer.tsx | 4 +- src/views/PositionInfo.tsx | 4 +- src/views/TradeBox.tsx | 2 +- src/views/charts/DepthChart/index.tsx | 14 +++--- src/views/charts/FundingChart/index.tsx | 2 +- src/views/charts/PnlChart.tsx | 11 ++--- src/views/charts/TvChart.tsx | 2 +- .../dialogs/AdjustIsolatedMarginDialog.tsx | 3 -- .../DetailsDialog/OrderDetailsDialog.tsx | 6 +-- src/views/dialogs/DisplaySettingsDialog.tsx | 10 ++-- src/views/dialogs/OnboardingDialog.tsx | 2 +- .../dialogs/OnboardingDialog/GenerateKeys.tsx | 2 +- src/views/dialogs/PreferencesDialog.tsx | 3 +- .../AccountManagementForms/DepositForm.tsx | 8 ++-- .../DepositForm/DepositButtonAndReceipt.tsx | 2 +- .../AccountManagementForms/SlippageEditor.tsx | 4 +- .../TestnetDepositForm.tsx | 2 +- .../TokenSelectMenu.tsx | 2 +- .../AccountManagementForms/WithdrawForm.tsx | 2 +- src/views/forms/ClosePositionForm.tsx | 11 +++-- .../NewMarketForm/NewMarketSelectionStep.tsx | 2 +- src/views/forms/NobleDeposit.tsx | 2 +- src/views/forms/TradeForm.tsx | 10 ++-- .../forms/TradeForm/AdvancedTradeOptions.tsx | 2 +- .../TradeForm/PlaceOrderButtonAndReceipt.tsx | 2 +- src/views/forms/TradeForm/TradeSideToggle.tsx | 3 +- src/views/forms/TradeForm/TradeSizeInputs.tsx | 2 +- src/views/forms/TransferForm.tsx | 2 +- .../TransferForm/TransferButtonAndReceipt.tsx | 2 +- .../forms/TriggersForm/TriggerOrderInputs.tsx | 4 +- .../TriggersForm/TriggerOrdersInputs.tsx | 1 - src/views/forms/TriggersForm/TriggersForm.tsx | 12 ++--- src/views/menus/AccountMenu.tsx | 6 +-- src/views/menus/LanguageSelector.tsx | 2 +- src/views/menus/NotificationsMenu.tsx | 2 +- src/views/menus/useGlobalCommands.tsx | 6 +-- src/views/menus/useNetworks.tsx | 2 +- ...ncentiveSeasonDistributionNotification.tsx | 3 -- .../TransferStatusNotification/index.tsx | 2 +- src/views/tables/FillsTable.tsx | 2 +- src/views/tables/LiveTrades.tsx | 2 +- src/views/tables/MarketsTable.tsx | 2 +- src/views/tables/Orderbook.tsx | 4 +- src/views/tables/OrdersTable.tsx | 2 +- .../tables/OrdersTable/OrderActionsCell.tsx | 26 +++++----- src/views/tables/PositionsTable.tsx | 8 ++-- .../PositionsTable/PositionsTriggersCell.tsx | 2 +- .../tables/TradingRewardHistoryTable.tsx | 2 +- src/views/tables/TransferHistoryTable.tsx | 2 +- 175 files changed, 421 insertions(+), 433 deletions(-) diff --git a/.ladle/components.tsx b/.ladle/components.tsx index b8e857461..f8b22dc29 100644 --- a/.ladle/components.tsx +++ b/.ladle/components.tsx @@ -1,17 +1,20 @@ import '@/polyfills'; + import { useEffect, useState } from 'react'; + +import '@/index.css'; +import { GrazProvider } from 'graz'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { Provider } from 'react-redux'; import styled from 'styled-components'; import { WagmiConfig } from 'wagmi'; -import { GrazProvider } from 'graz'; -import { QueryClient, QueryClientProvider } from 'react-query'; import { SupportedLocales } from '@/constants/localization'; import { AccountsProvider } from '@/hooks/useAccounts'; import { AppThemeAndColorModeProvider } from '@/hooks/useAppThemeAndColorMode'; -import { DydxProvider } from '@/hooks/useDydxClient'; import { DialogAreaProvider } from '@/hooks/useDialogArea'; +import { DydxProvider } from '@/hooks/useDydxClient'; import { LocaleProvider } from '@/hooks/useLocaleSeparators'; import { PotentialMarketsProvider } from '@/hooks/usePotentialMarkets'; import { RestrictionProvider } from '@/hooks/useRestrictions'; @@ -19,22 +22,20 @@ import { SubaccountProvider } from '@/hooks/useSubaccount'; import { GlobalStyle } from '@/styles/globalStyle'; -import { SelectMenu, SelectItem } from '@/components/SelectMenu'; +import { SelectItem, SelectMenu } from '@/components/SelectMenu'; +import { store } from '@/state/_store'; import { + AppColorMode, AppTheme, AppThemeSystemSetting, - AppColorMode, - setAppThemeSetting, setAppColorMode, + setAppThemeSetting, } from '@/state/configs'; - import { setLocaleLoaded, setSelectedLocale } from '@/state/localization'; -import { store } from '@/state/_store'; import { config } from '@/lib/wagmi'; -import '@/index.css'; import './ladle.css'; const queryClient = new QueryClient(); diff --git a/.vscode/settings.json b/.vscode/settings.json index 7f56a8822..4a4b1b572 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,10 +1,13 @@ { - "explorer.sortOrder": "mixed", - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "files.watcherExclude": { - "**/.git": true, - "**/node_modules/*": true, - "**/node_modules/@dydxprotocol/v4-abacus": false - } + "explorer.sortOrder": "mixed", + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, + "files.watcherExclude": { + "**/.git": true, + "**/node_modules/*": true, + "**/node_modules/@dydxprotocol/v4-abacus": false + }, + "editor.codeActionsOnSave": { + "source.organizeImports": "explicit" + } } diff --git a/__tests__/e2e/test.e2e.ts b/__tests__/e2e/test.e2e.ts index 655cb1bd5..1ec07ac1f 100644 --- a/__tests__/e2e/test.e2e.ts +++ b/__tests__/e2e/test.e2e.ts @@ -1,4 +1,4 @@ -import { expect, browser, $ } from '@wdio/globals'; +import { $, browser, expect } from '@wdio/globals'; describe('Smoke test', () => { it('should authenticate with vercel and load website', async () => { diff --git a/src/App.tsx b/src/App.tsx index e3d9565e5..4c41f5e7d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -11,11 +11,11 @@ import { WagmiConfig } from 'wagmi'; import { AppRoute, DEFAULT_TRADE_ROUTE, MarketsRoute } from '@/constants/routes'; import { + useAnalytics, useBreakpoints, - useTokenConfigs, useInitializePage, useShouldShowFooter, - useAnalytics, + useTokenConfigs, } from '@/hooks'; import { AccountsProvider } from '@/hooks/useAccounts'; import { AppThemeAndColorModeProvider } from '@/hooks/useAppThemeAndColorMode'; diff --git a/src/components/Accordion.tsx b/src/components/Accordion.tsx index 98d700741..ba5248008 100644 --- a/src/components/Accordion.tsx +++ b/src/components/Accordion.tsx @@ -1,4 +1,4 @@ -import { Root, Item, Header, Trigger, Content } from '@radix-ui/react-accordion'; +import { Content, Header, Item, Root, Trigger } from '@radix-ui/react-accordion'; import styled, { keyframes, type AnyStyledComponent } from 'styled-components'; import { PlusIcon } from '@/icons'; diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx index de03f2ac3..3b9d1f852 100644 --- a/src/components/Checkbox.tsx +++ b/src/components/Checkbox.tsx @@ -1,4 +1,4 @@ -import { Root, Indicator } from '@radix-ui/react-checkbox'; +import { Indicator, Root } from '@radix-ui/react-checkbox'; import { CheckIcon } from '@radix-ui/react-icons'; import styled, { css, type AnyStyledComponent } from 'styled-components'; diff --git a/src/components/Collapsible.stories.tsx b/src/components/Collapsible.stories.tsx index 4818f0157..4d4c75b08 100644 --- a/src/components/Collapsible.stories.tsx +++ b/src/components/Collapsible.stories.tsx @@ -46,7 +46,7 @@ export const CollapsibleStoryWithSlotTrigger: Story = (args) = } + slotTrigger={} open={checked} onOpenChange={setChecked} > diff --git a/src/components/Collapsible.tsx b/src/components/Collapsible.tsx index 77966a57e..978a585fe 100644 --- a/src/components/Collapsible.tsx +++ b/src/components/Collapsible.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { Root, Trigger, Content } from '@radix-ui/react-collapsible'; +import { Content, Root, Trigger } from '@radix-ui/react-collapsible'; import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { popoverMixins } from '@/styles/popoverMixins'; diff --git a/src/components/CollapsibleNavigationMenu.tsx b/src/components/CollapsibleNavigationMenu.tsx index 452e0b9e6..3a31a6953 100644 --- a/src/components/CollapsibleNavigationMenu.tsx +++ b/src/components/CollapsibleNavigationMenu.tsx @@ -1,8 +1,7 @@ import { useEffect, useState } from 'react'; -import { Root, List, Item, Sub, Link } from '@radix-ui/react-navigation-menu'; -import _ from 'lodash'; -import { matchPath, NavLink, useLocation } from 'react-router-dom'; +import { Item, Link, List, Root, Sub } from '@radix-ui/react-navigation-menu'; +import { NavLink, matchPath, useLocation } from 'react-router-dom'; import styled, { css, type AnyStyledComponent } from 'styled-components'; import { type MenuItem } from '@/constants/menus'; diff --git a/src/components/CollapsibleTabs.tsx b/src/components/CollapsibleTabs.tsx index 776c26992..c5eec0273 100644 --- a/src/components/CollapsibleTabs.tsx +++ b/src/components/CollapsibleTabs.tsx @@ -1,4 +1,4 @@ -import { Dispatch, type ReactNode, SetStateAction } from 'react'; +import { Dispatch, SetStateAction, type ReactNode } from 'react'; import { Content as CollapsibleContent, @@ -11,7 +11,7 @@ import { Root as TabsRoot, Trigger as TabsTrigger, } from '@radix-ui/react-tabs'; -import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components'; +import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { layoutMixins } from '@/styles/layoutMixins'; diff --git a/src/components/ComboboxMenu.tsx b/src/components/ComboboxMenu.tsx index 9bb508cf6..0295ff7b7 100644 --- a/src/components/ComboboxMenu.tsx +++ b/src/components/ComboboxMenu.tsx @@ -1,9 +1,9 @@ -import { Fragment, type ReactNode, useState } from 'react'; +import { Fragment, useState, type ReactNode } from 'react'; import { Command } from 'cmdk'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; -import { MenuItem, type MenuConfig } from '@/constants/menus'; +import { type MenuConfig } from '@/constants/menus'; import { layoutMixins } from '@/styles/layoutMixins'; import { popoverMixins } from '@/styles/popoverMixins'; diff --git a/src/components/Details.tsx b/src/components/Details.tsx index ed2b39572..2183fabf4 100644 --- a/src/components/Details.tsx +++ b/src/components/Details.tsx @@ -1,10 +1,10 @@ import { Fragment } from 'react'; import styled, { - type AnyStyledComponent, + ThemeProps, css, + type AnyStyledComponent, type FlattenInterpolation, - ThemeProps, } from 'styled-components'; import { LoadingContext } from '@/contexts/LoadingContext'; diff --git a/src/components/Dialog.tsx b/src/components/Dialog.tsx index 94d8fdd95..29d667767 100644 --- a/src/components/Dialog.tsx +++ b/src/components/Dialog.tsx @@ -1,16 +1,16 @@ import { useRef } from 'react'; import { - Root, - Trigger, - Overlay, + Close, Content, - Title, Description, - Close, + Overlay, Portal, + Root, + Title, + Trigger, } from '@radix-ui/react-dialog'; -import styled, { type AnyStyledComponent, keyframes, css } from 'styled-components'; +import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { useDialogArea } from '@/hooks/useDialogArea'; diff --git a/src/components/DiffOutput.tsx b/src/components/DiffOutput.tsx index 665aacff0..2f990e42f 100644 --- a/src/components/DiffOutput.tsx +++ b/src/components/DiffOutput.tsx @@ -1,9 +1,9 @@ -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { layoutMixins } from '@/styles/layoutMixins'; import { DiffArrow, type DiffArrowProps } from '@/components/DiffArrow'; -import { Output, type OutputProps, OutputType } from '@/components/Output'; +import { Output, OutputType, type OutputProps } from '@/components/Output'; import { BigNumberish } from '@/lib/numbers'; diff --git a/src/components/DropdownHeaderMenu.tsx b/src/components/DropdownHeaderMenu.tsx index 701b40953..11aff61d4 100644 --- a/src/components/DropdownHeaderMenu.tsx +++ b/src/components/DropdownHeaderMenu.tsx @@ -1,4 +1,4 @@ -import { Root, Trigger, Content, Portal, Item } from '@radix-ui/react-dropdown-menu'; +import { Content, Item, Portal, Root, Trigger } from '@radix-ui/react-dropdown-menu'; import styled, { type AnyStyledComponent } from 'styled-components'; import { type MenuItem } from '@/constants/menus'; diff --git a/src/components/DropdownMenu.tsx b/src/components/DropdownMenu.tsx index ac3749b50..a5e618fb6 100644 --- a/src/components/DropdownMenu.tsx +++ b/src/components/DropdownMenu.tsx @@ -1,7 +1,6 @@ -import { type Ref, forwardRef } from 'react'; -import { Fragment } from 'react'; +import { Fragment, forwardRef, type Ref } from 'react'; -import { Root, Trigger, Content, Portal, Item, Separator } from '@radix-ui/react-dropdown-menu'; +import { Content, Item, Portal, Root, Separator, Trigger } from '@radix-ui/react-dropdown-menu'; import styled, { type AnyStyledComponent } from 'styled-components'; import { popoverMixins } from '@/styles/popoverMixins'; diff --git a/src/components/DropdownSelectMenu.tsx b/src/components/DropdownSelectMenu.tsx index 42ae66292..7174c2966 100644 --- a/src/components/DropdownSelectMenu.tsx +++ b/src/components/DropdownSelectMenu.tsx @@ -1,13 +1,13 @@ import { cloneElement } from 'react'; import { - Root, - Trigger, Content, ItemIndicator, + Portal, RadioGroup, RadioItem, - Portal, + Root, + Trigger, } from '@radix-ui/react-dropdown-menu'; import { CheckIcon } from '@radix-ui/react-icons'; import styled, { type AnyStyledComponent } from 'styled-components'; diff --git a/src/components/GradientCard.tsx b/src/components/GradientCard.tsx index 5d0c65ca5..b3465ab4f 100644 --- a/src/components/GradientCard.tsx +++ b/src/components/GradientCard.tsx @@ -1,4 +1,4 @@ -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; type GradientCardProps = React.PropsWithChildren<{ className?: string; diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx index 82dba3f67..a5a157633 100644 --- a/src/components/Icon.tsx +++ b/src/components/Icon.tsx @@ -11,12 +11,12 @@ import { BoxCloseIcon, CalculatorIcon, CaretIcon, - CautionCircleStrokeIcon, CautionCircleIcon, + CautionCircleStrokeIcon, ChaosLabsIcon, ChatIcon, - CheckIcon, CheckCircleIcon, + CheckIcon, ChevronLeftIcon, ChevronRightIcon, ClockIcon, @@ -48,13 +48,13 @@ import { MigrateIcon, MintscanIcon, MoonIcon, - OrderbookIcon, OrderCanceledIcon, OrderFilledIcon, OrderOpenIcon, OrderPartiallyFilledIcon, OrderPendingIcon, OrderUntriggeredIcon, + OrderbookIcon, OverviewIcon, PencilIcon, PlayIcon, @@ -69,10 +69,10 @@ import { SendIcon, ShareIcon, ShowIcon, - TogglesMenuIcon, StarIcon, SunIcon, TerminalIcon, + TogglesMenuIcon, TokenIcon, TradeIcon, TransferIcon, diff --git a/src/components/Input.stories.tsx b/src/components/Input.stories.tsx index f67070784..6794d9b8c 100644 --- a/src/components/Input.stories.tsx +++ b/src/components/Input.stories.tsx @@ -1,6 +1,6 @@ import type { Story } from '@ladle/react'; -import { Input, InputType, InputProps } from '@/components/Input'; +import { Input, InputProps, InputType } from '@/components/Input'; import { StoryWrapper } from '.ladle/components'; diff --git a/src/components/Input.tsx b/src/components/Input.tsx index 4f0b961ab..230fc9979 100644 --- a/src/components/Input.tsx +++ b/src/components/Input.tsx @@ -2,7 +2,7 @@ import { Dispatch, forwardRef, SetStateAction } from 'react'; import { NumericFormat, type NumberFormatValues, type SourceInfo } from 'react-number-format'; import type { SyntheticInputEvent } from 'react-number-format/types/types'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { LEVERAGE_DECIMALS, diff --git a/src/components/Loading/LoadingSpinner.tsx b/src/components/Loading/LoadingSpinner.tsx index d0448565d..08f441de1 100644 --- a/src/components/Loading/LoadingSpinner.tsx +++ b/src/components/Loading/LoadingSpinner.tsx @@ -1,4 +1,4 @@ -import styled, { type AnyStyledComponent, keyframes } from 'styled-components'; +import styled, { keyframes, type AnyStyledComponent } from 'styled-components'; import { layoutMixins } from '@/styles/layoutMixins'; diff --git a/src/components/NavigationMenu.tsx b/src/components/NavigationMenu.tsx index eced1ddc7..08943d680 100644 --- a/src/components/NavigationMenu.tsx +++ b/src/components/NavigationMenu.tsx @@ -1,17 +1,17 @@ import { forwardRef, Ref } from 'react'; import { - Root, - List, - Trigger, Content, Item, Link, + List, + Root, Sub, + Trigger, Viewport, } from '@radix-ui/react-navigation-menu'; -import { NavLink, matchPath, useLocation } from 'react-router-dom'; -import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components'; +import { matchPath, NavLink, useLocation } from 'react-router-dom'; +import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { MenuConfig, MenuItem } from '@/constants/menus'; diff --git a/src/components/Output.tsx b/src/components/Output.tsx index 0d0111fae..291717cd4 100644 --- a/src/components/Output.tsx +++ b/src/components/Output.tsx @@ -3,7 +3,7 @@ import { useContext } from 'react'; import BigNumber from 'bignumber.js'; import { DateTime } from 'luxon'; import { useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { LEVERAGE_DECIMALS, @@ -25,7 +25,7 @@ import { Tag } from '@/components/Tag'; import { getSelectedLocale } from '@/state/localizationSelectors'; -import { type BigNumberish, MustBigNumber, isNumber } from '@/lib/numbers'; +import { MustBigNumber, isNumber, type BigNumberish } from '@/lib/numbers'; import { getStringsForDateTimeDiff, getTimestamp } from '@/lib/timeUtils'; import { LoadingOutput } from './Loading/LoadingOutput'; diff --git a/src/components/PageMenu/PageMenuRadioGroup.tsx b/src/components/PageMenu/PageMenuRadioGroup.tsx index e5c1b4488..06945effe 100644 --- a/src/components/PageMenu/PageMenuRadioGroup.tsx +++ b/src/components/PageMenu/PageMenuRadioGroup.tsx @@ -1,4 +1,4 @@ -import { Root, Item } from '@radix-ui/react-radio-group'; +import { Item, Root } from '@radix-ui/react-radio-group'; import styled, { AnyStyledComponent } from 'styled-components'; import type { MenuItem } from '@/constants/menus'; diff --git a/src/components/Popover.tsx b/src/components/Popover.tsx index 9c9a9581b..8fcb702d9 100644 --- a/src/components/Popover.tsx +++ b/src/components/Popover.tsx @@ -1,8 +1,8 @@ import { useMemo, useState } from 'react'; -import { Root, Trigger, Content, Portal } from '@radix-ui/react-popover'; +import { Content, Portal, Root, Trigger } from '@radix-ui/react-popover'; import { useRect } from '@radix-ui/react-use-rect'; -import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components'; +import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { popoverMixins } from '@/styles/popoverMixins'; diff --git a/src/components/RadioButtonCards.tsx b/src/components/RadioButtonCards.tsx index 24d3a3e90..5c9d67fae 100644 --- a/src/components/RadioButtonCards.tsx +++ b/src/components/RadioButtonCards.tsx @@ -1,4 +1,4 @@ -import { Root, Item } from '@radix-ui/react-radio-group'; +import { Item, Root } from '@radix-ui/react-radio-group'; import styled, { AnyStyledComponent } from 'styled-components'; import { MenuItem } from '@/constants/menus'; diff --git a/src/components/SearchInput.tsx b/src/components/SearchInput.tsx index 9b64ad700..2ce4d34a3 100644 --- a/src/components/SearchInput.tsx +++ b/src/components/SearchInput.tsx @@ -6,7 +6,7 @@ import { layoutMixins } from '@/styles/layoutMixins'; import { Icon, IconName } from '@/components/Icon'; import { IconButton } from '@/components/IconButton'; -import { Input, type InputProps, InputType } from '@/components/Input'; +import { Input, InputType, type InputProps } from '@/components/Input'; type ElementProps = { onTextChange?: (value: string) => void; diff --git a/src/components/SearchSelectMenu.tsx b/src/components/SearchSelectMenu.tsx index 1071bc92f..f782847b5 100644 --- a/src/components/SearchSelectMenu.tsx +++ b/src/components/SearchSelectMenu.tsx @@ -1,6 +1,6 @@ -import { type ReactNode, useState, useRef } from 'react'; +import { useRef, useState, type ReactNode } from 'react'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { type MenuConfig } from '@/constants/menus'; diff --git a/src/components/SelectMenu.stories.tsx b/src/components/SelectMenu.stories.tsx index 178955f0a..3feb6ac91 100644 --- a/src/components/SelectMenu.stories.tsx +++ b/src/components/SelectMenu.stories.tsx @@ -5,7 +5,7 @@ import styled, { AnyStyledComponent } from 'styled-components'; import { layoutMixins } from '@/styles/layoutMixins'; -import { SelectMenu, SelectItem } from '@/components/SelectMenu'; +import { SelectItem, SelectMenu } from '@/components/SelectMenu'; import { StoryWrapper } from '.ladle/components'; diff --git a/src/components/SelectMenu.tsx b/src/components/SelectMenu.tsx index 48031832a..ef377d2d9 100644 --- a/src/components/SelectMenu.tsx +++ b/src/components/SelectMenu.tsx @@ -2,18 +2,17 @@ import React from 'react'; import { CheckIcon } from '@radix-ui/react-icons'; import { - Root, - Value, - Viewport, - Trigger, Content, Item, - ItemText, ItemIndicator, + ItemText, Portal, - Icon as SelectIcon, + Root, + Trigger, + Value, + Viewport, } from '@radix-ui/react-select'; -import styled, { css, type AnyStyledComponent } from 'styled-components'; +import styled, { type AnyStyledComponent } from 'styled-components'; import { formMixins } from '@/styles/formMixins'; import { popoverMixins } from '@/styles/popoverMixins'; diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 14504a87b..dea5942a1 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -1,4 +1,4 @@ -import React, { Fragment, Key, useCallback, useEffect, useMemo, useState } from 'react'; +import React, { Key, useEffect, useState } from 'react'; import { Cell, // CollectionBuilderContext, @@ -6,24 +6,22 @@ import { Row, TableBody, TableHeader, - type TableState, useTableState, + type TableState, } from '@react-stately/table'; import { type GridNode } from '@react-types/grid'; -import type { Node, SortDescriptor, SortDirection, CollectionChildren } from '@react-types/shared'; +import type { CollectionChildren, Node, SortDescriptor, SortDirection } from '@react-types/shared'; import { type ColumnSize, type TableCollection } from '@react-types/table'; import { + mergeProps, + useCollator, + useFocusRing, useTable, useTableCell, useTableColumnHeader, - useTableRow, useTableHeaderRow, + useTableRow, useTableRowGroup, - useTableSelectAllCheckbox, - useTableSelectionCheckbox, - mergeProps, - useFocusRing, - useCollator, } from 'react-aria'; import { useAsyncList } from 'react-stately'; import styled, { css, type AnyStyledComponent } from 'styled-components'; @@ -43,10 +41,10 @@ import { Button } from './Button'; import { Icon, IconName } from './Icon'; import { Tag } from './Tag'; -export { TableCell } from './Table/TableCell'; -export { TableColumnHeader } from './Table/TableColumnHeader'; export { ActionsTableCell } from './Table/ActionsTableCell'; export { MarketTableCell } from './Table/MarketTableCell'; +export { TableCell } from './Table/TableCell'; +export { TableColumnHeader } from './Table/TableColumnHeader'; export type CustomRowConfig = { key: string; diff --git a/src/components/Table/ActionsTableCell.tsx b/src/components/Table/ActionsTableCell.tsx index 5997d44f1..31ca07d1f 100644 --- a/src/components/Table/ActionsTableCell.tsx +++ b/src/components/Table/ActionsTableCell.tsx @@ -1,4 +1,5 @@ import React from 'react'; + import styled, { css, type AnyStyledComponent } from 'styled-components'; import { Toolbar } from '@/components/Toolbar'; diff --git a/src/components/Table/MarketTableCell.tsx b/src/components/Table/MarketTableCell.tsx index bd70bcf5a..7451b2e84 100644 --- a/src/components/Table/MarketTableCell.tsx +++ b/src/components/Table/MarketTableCell.tsx @@ -1,4 +1,4 @@ -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { type AnyStyledComponent } from 'styled-components'; import type { Asset } from '@/constants/abacus'; diff --git a/src/components/Tabs.tsx b/src/components/Tabs.tsx index 55cc67bb5..fe532f43e 100644 --- a/src/components/Tabs.tsx +++ b/src/components/Tabs.tsx @@ -1,7 +1,7 @@ import { type ReactNode } from 'react'; import { Content, List, Root, Trigger } from '@radix-ui/react-tabs'; -import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components'; +import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { type MenuItem } from '@/constants/menus'; diff --git a/src/components/TimeoutButton.tsx b/src/components/TimeoutButton.tsx index aa631b84c..8de712711 100644 --- a/src/components/TimeoutButton.tsx +++ b/src/components/TimeoutButton.tsx @@ -1,11 +1,11 @@ -import { type ReactNode, useState, useEffect } from 'react'; +import { useEffect, useState, type ReactNode } from 'react'; import { ButtonAction, ButtonState } from '@/constants/buttons'; import { STRING_KEYS } from '@/constants/localization'; import { useNow, useStringGetter } from '@/hooks'; -import { Button, type ButtonStateConfig, type ButtonProps } from '@/components/Button'; +import { Button, type ButtonProps, type ButtonStateConfig } from '@/components/Button'; type ElementProps = { timeoutInSeconds: number; diff --git a/src/components/Toast.tsx b/src/components/Toast.tsx index de8f9d66b..b143b76de 100644 --- a/src/components/Toast.tsx +++ b/src/components/Toast.tsx @@ -1,6 +1,6 @@ -import { type MouseEvent, useEffect, useRef, useState } from 'react'; +import { useEffect, useRef, useState, type MouseEvent } from 'react'; -import { Root, Action, Close } from '@radix-ui/react-toast'; +import { Action, Close, Root } from '@radix-ui/react-toast'; import styled, { keyframes } from 'styled-components'; import { ButtonShape, ButtonSize } from '@/constants/buttons'; diff --git a/src/components/ToastArea.tsx b/src/components/ToastArea.tsx index 62617f27a..075d8fbf7 100644 --- a/src/components/ToastArea.tsx +++ b/src/components/ToastArea.tsx @@ -1,8 +1,6 @@ import { Provider, Viewport } from '@radix-ui/react-toast'; import styled from 'styled-components'; -import { layoutMixins } from '@/styles/layoutMixins'; - type ElementProps = { swipeDirection: 'up' | 'down' | 'left' | 'right'; children: React.ReactNode; diff --git a/src/components/ToggleGroup.tsx b/src/components/ToggleGroup.tsx index c5cfb28dc..7dec2d3a0 100644 --- a/src/components/ToggleGroup.tsx +++ b/src/components/ToggleGroup.tsx @@ -1,6 +1,6 @@ import { forwardRef, type Ref } from 'react'; -import { Root, Item } from '@radix-ui/react-toggle-group'; +import { Item, Root } from '@radix-ui/react-toggle-group'; import styled, { type AnyStyledComponent } from 'styled-components'; import { ButtonShape, ButtonSize } from '@/constants/buttons'; diff --git a/src/components/Toolbar.tsx b/src/components/Toolbar.tsx index ce909dad2..3fd6dc0c6 100644 --- a/src/components/Toolbar.tsx +++ b/src/components/Toolbar.tsx @@ -1,4 +1,4 @@ -import { Root, Button, Separator, Link, ToggleGroup, ToggleItem } from '@radix-ui/react-toolbar'; +import { Root } from '@radix-ui/react-toolbar'; import styled, { type AnyStyledComponent } from 'styled-components'; import { layoutMixins } from '@/styles/layoutMixins'; diff --git a/src/components/TriangleIndicator.stories.tsx b/src/components/TriangleIndicator.stories.tsx index b0b2b37fc..bfd270e3b 100644 --- a/src/components/TriangleIndicator.stories.tsx +++ b/src/components/TriangleIndicator.stories.tsx @@ -1,11 +1,11 @@ -import { useEffect, useState } from 'react'; +import { useState } from 'react'; import type { Story } from '@ladle/react'; import styled, { AnyStyledComponent } from 'styled-components'; import { layoutMixins } from '@/styles/layoutMixins'; -import { TriangleIndicator, TriangleIndicatorProps } from '@/components/TriangleIndicator'; +import { TriangleIndicator } from '@/components/TriangleIndicator'; import { MustBigNumber } from '@/lib/numbers'; diff --git a/src/components/WithConfirmationPopover.stories.tsx b/src/components/WithConfirmationPopover.stories.tsx index 0b7f28869..c43814b9c 100644 --- a/src/components/WithConfirmationPopover.stories.tsx +++ b/src/components/WithConfirmationPopover.stories.tsx @@ -1,4 +1,4 @@ -import { type ChangeEvent, useState } from 'react'; +import { useState, type ChangeEvent } from 'react'; import type { Story } from '@ladle/react'; diff --git a/src/components/WithReceipt.tsx b/src/components/WithReceipt.tsx index 0d1f639ab..0fd77ce6f 100644 --- a/src/components/WithReceipt.tsx +++ b/src/components/WithReceipt.tsx @@ -1,6 +1,6 @@ import { type ReactNode } from 'react'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; type ElementProps = { slotReceipt?: ReactNode; diff --git a/src/components/WithSidebar.tsx b/src/components/WithSidebar.tsx index b28fe389f..d86c599ed 100644 --- a/src/components/WithSidebar.tsx +++ b/src/components/WithSidebar.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, keyframes } from 'styled-components'; +import styled, { keyframes, type AnyStyledComponent } from 'styled-components'; import { ButtonShape, ButtonSize } from '@/constants/buttons'; import { STRING_KEYS } from '@/constants/localization'; diff --git a/src/components/WithTooltip.tsx b/src/components/WithTooltip.tsx index 641c533fc..0d3c1cda8 100644 --- a/src/components/WithTooltip.tsx +++ b/src/components/WithTooltip.tsx @@ -1,6 +1,6 @@ import type { ReactNode } from 'react'; -import { Content, Portal, Provider, Root, Trigger, Arrow } from '@radix-ui/react-tooltip'; +import { Arrow, Content, Portal, Provider, Root, Trigger } from '@radix-ui/react-tooltip'; import styled, { AnyStyledComponent } from 'styled-components'; import { STRING_KEYS } from '@/constants/localization'; diff --git a/src/components/visx/TimeSeriesChart.tsx b/src/components/visx/TimeSeriesChart.tsx index 2e255d85e..d271cd17c 100644 --- a/src/components/visx/TimeSeriesChart.tsx +++ b/src/components/visx/TimeSeriesChart.tsx @@ -4,15 +4,15 @@ import { LinearGradient } from '@visx/gradient'; import { ParentSize } from '@visx/responsive'; import type { ScaleConfig } from '@visx/scale'; import { - XYChart, Axis, - Grid, DataProvider, EventEmitterProvider, - LineSeries, GlyphSeries, - type Margin, + Grid, + LineSeries, + XYChart, type AxisScale, + type Margin, type TooltipContextType, } from '@visx/xychart'; import { RenderTooltipParams } from '@visx/xychart/lib/components/Tooltip'; diff --git a/src/components/visx/XYChartTooltipWithBounds.tsx b/src/components/visx/XYChartTooltipWithBounds.tsx index b93435e37..9ec86ad8c 100644 --- a/src/components/visx/XYChartTooltipWithBounds.tsx +++ b/src/components/visx/XYChartTooltipWithBounds.tsx @@ -7,8 +7,8 @@ import { PickD3Scale } from '@visx/scale'; import { TooltipWithBounds } from '@visx/tooltip'; import type { TooltipProps as BaseTooltipProps } from '@visx/tooltip/lib/tooltips/Tooltip'; import { - TooltipContext, DataContext, + TooltipContext, type GlyphProps as RenderGlyphProps, type TooltipContextType, } from '@visx/xychart'; diff --git a/src/components/visx/XYChartWithPointerEvents.tsx b/src/components/visx/XYChartWithPointerEvents.tsx index 8914a42c0..14fcd5a6e 100644 --- a/src/components/visx/XYChartWithPointerEvents.tsx +++ b/src/components/visx/XYChartWithPointerEvents.tsx @@ -2,7 +2,7 @@ import React, { PropsWithChildren, useContext, useState } from 'react'; import { localPoint } from '@visx/event'; import { Point } from '@visx/point'; -import { XYChart, DataContext, type EventHandlerParams } from '@visx/xychart'; +import { DataContext, XYChart, type EventHandlerParams } from '@visx/xychart'; import { getScaleBandwidth } from '@/components/visx/getScaleBandwidth'; diff --git a/src/constants/analytics.ts b/src/constants/analytics.ts index 1aa40847c..5bf5040a0 100644 --- a/src/constants/analytics.ts +++ b/src/constants/analytics.ts @@ -4,7 +4,7 @@ import type { DialogTypes } from './dialogs'; import type { SupportedLocales } from './localization'; import type { DydxNetwork } from './networks'; import type { TradeTypes } from './trade'; -import type { DydxAddress, WalletType, WalletConnectionType, EvmAddress } from './wallets'; +import type { DydxAddress, EvmAddress, WalletConnectionType, WalletType } from './wallets'; // User properties export enum AnalyticsUserProperty { diff --git a/src/constants/localization.ts b/src/constants/localization.ts index daa0ca48d..a8ae8f533 100644 --- a/src/constants/localization.ts +++ b/src/constants/localization.ts @@ -2,10 +2,10 @@ import { APP_STRING_KEYS, ERRORS_STRING_KEYS, LOCALE_DATA, + NOTIFICATIONS, + NOTIFICATIONS_STRING_KEYS, TOOLTIPS, WARNINGS_STRING_KEYS, - NOTIFICATIONS_STRING_KEYS, - NOTIFICATIONS, } from '@dydxprotocol/v4-localization'; import { type LinksConfigs } from '@/hooks/useURLConfigs'; diff --git a/src/constants/tooltips/deposit.ts b/src/constants/tooltips/deposit.ts index de30ab297..4121f251a 100644 --- a/src/constants/tooltips/deposit.ts +++ b/src/constants/tooltips/deposit.ts @@ -1,4 +1,4 @@ -import { type TooltipStrings, TOOLTIP_STRING_KEYS } from '@/constants/localization'; +import { TOOLTIP_STRING_KEYS, type TooltipStrings } from '@/constants/localization'; export const depositTooltips: TooltipStrings = { 'minimum-deposit-amount': ({ stringGetter }) => ({ diff --git a/src/constants/tooltips/general.ts b/src/constants/tooltips/general.ts index 9da6b4558..84068127b 100644 --- a/src/constants/tooltips/general.ts +++ b/src/constants/tooltips/general.ts @@ -1,4 +1,4 @@ -import { type TooltipStrings, TOOLTIP_STRING_KEYS } from '@/constants/localization'; +import { TOOLTIP_STRING_KEYS, type TooltipStrings } from '@/constants/localization'; export const generalTooltips: TooltipStrings = { 'legacy-signing': ({ stringGetter }) => ({ diff --git a/src/constants/tooltips/portfolio.ts b/src/constants/tooltips/portfolio.ts index b995f40ae..827a54285 100644 --- a/src/constants/tooltips/portfolio.ts +++ b/src/constants/tooltips/portfolio.ts @@ -1,4 +1,4 @@ -import { type TooltipStrings, TOOLTIP_STRING_KEYS } from '@/constants/localization'; +import { TOOLTIP_STRING_KEYS, type TooltipStrings } from '@/constants/localization'; export const portfolioTooltips: TooltipStrings = { 'holding-hedgies': ({ stringGetter, stringParams }) => ({ diff --git a/src/constants/tooltips/trade.ts b/src/constants/tooltips/trade.ts index df6d4ec66..4700620b1 100644 --- a/src/constants/tooltips/trade.ts +++ b/src/constants/tooltips/trade.ts @@ -1,4 +1,4 @@ -import { type TooltipStrings, TOOLTIP_STRING_KEYS } from '@/constants/localization'; +import { TOOLTIP_STRING_KEYS, type TooltipStrings } from '@/constants/localization'; export const tradeTooltips: TooltipStrings = { 'account-leverage': ({ stringGetter }) => ({ diff --git a/src/constants/tooltips/triggers.ts b/src/constants/tooltips/triggers.ts index d5d51a1ca..8039bbc4d 100644 --- a/src/constants/tooltips/triggers.ts +++ b/src/constants/tooltips/triggers.ts @@ -1,4 +1,4 @@ -import { type TooltipStrings, TOOLTIP_STRING_KEYS } from '@/constants/localization'; +import { TOOLTIP_STRING_KEYS, type TooltipStrings } from '@/constants/localization'; export const triggersTooltips: TooltipStrings = { 'custom-amount': ({ stringGetter }) => ({ diff --git a/src/constants/tooltips/withdraw.ts b/src/constants/tooltips/withdraw.ts index 83d4d85d9..db077d078 100644 --- a/src/constants/tooltips/withdraw.ts +++ b/src/constants/tooltips/withdraw.ts @@ -1,4 +1,4 @@ -import { type TooltipStrings, TOOLTIP_STRING_KEYS } from '@/constants/localization'; +import { TOOLTIP_STRING_KEYS, type TooltipStrings } from '@/constants/localization'; import { CCTP_MAINNET_CHAIN_NAMES_CAPITALIZED } from '../cctp'; diff --git a/src/constants/wallets.ts b/src/constants/wallets.ts index 966e7a7db..a092057c2 100644 --- a/src/constants/wallets.ts +++ b/src/constants/wallets.ts @@ -8,8 +8,9 @@ import { BitkeepIcon, BitpieIcon, CloverWalletIcon, - CoinbaseIcon, Coin98Icon, + CoinbaseIcon, + EmailIcon, GenericWalletIcon, HuobiIcon, ImTokenIcon, @@ -21,7 +22,6 @@ import { TokenPocketIcon, TrustWalletIcon, WalletConnectIcon, - EmailIcon, } from '@/icons'; import { isMetaMask } from '@/lib/wallet/providers'; diff --git a/src/hooks/Orderbook/useOrderbookValues.ts b/src/hooks/Orderbook/useOrderbookValues.ts index ceecab6af..75c1e22c2 100644 --- a/src/hooks/Orderbook/useOrderbookValues.ts +++ b/src/hooks/Orderbook/useOrderbookValues.ts @@ -4,7 +4,7 @@ import { OrderSide } from '@dydxprotocol/v4-client-js'; import { shallowEqual, useSelector } from 'react-redux'; import { OrderbookLine, type PerpetualMarketOrderbookLevel } from '@/constants/abacus'; -import { DepthChartSeries, DepthChartDatum } from '@/constants/charts'; +import { DepthChartDatum, DepthChartSeries } from '@/constants/charts'; import { getSubaccountOrderSizeBySideAndPrice } from '@/state/accountSelectors'; import { getCurrentMarketOrderbook } from '@/state/perpetualsSelectors'; diff --git a/src/hooks/Orderbook/useSpreadRowScrollListener.ts b/src/hooks/Orderbook/useSpreadRowScrollListener.ts index e82c0b709..cdbfd8aff 100644 --- a/src/hooks/Orderbook/useSpreadRowScrollListener.ts +++ b/src/hooks/Orderbook/useSpreadRowScrollListener.ts @@ -1,4 +1,4 @@ -import { type RefObject, useEffect, useState } from 'react'; +import { useEffect, useState, type RefObject } from 'react'; export const useSpreadRowScrollListener = ({ orderbookRef, diff --git a/src/hooks/index.ts b/src/hooks/index.ts index aaf0d4026..0adde9ff0 100644 --- a/src/hooks/index.ts +++ b/src/hooks/index.ts @@ -32,9 +32,11 @@ import { useURLConfigs } from './useURLConfigs'; import { useWithdrawalInfo } from './useWithdrawalInfo'; export { + useAccountBalance, + useAccounts, + useAnalytics, useApiState, useBreakpoints, - useTokenConfigs, useCommandMenu, useCurrentMarketId, useDebounce, @@ -42,24 +44,22 @@ export { useDydxClient, useEnvFeatures, useGovernanceVariables, - useAccountBalance, - useAccounts, - useAnalytics, useInitializePage, useInterval, useIsFirstRender, - useLocaleSeparators, useLocalStorage, + useLocaleSeparators, useNextClobPairId, useNow, useOnClickOutside, usePageTitlePriceUpdates, usePerpetualMarketSparklines, useRestrictions, - useShouldShowFooter, useSelectedNetwork, + useShouldShowFooter, useStringGetter, useSubaccount, + useTokenConfigs, useTradeFormInputs, useTriggerOrdersFormInputs, useURLConfigs, diff --git a/src/hooks/tradingView/useChartLines.ts b/src/hooks/tradingView/useChartLines.ts index 5d7f3f889..e8ea6ca82 100644 --- a/src/hooks/tradingView/useChartLines.ts +++ b/src/hooks/tradingView/useChartLines.ts @@ -4,7 +4,7 @@ import { shallowEqual, useSelector } from 'react-redux'; import { AbacusOrderStatus, ORDER_SIDES, SubaccountOrder } from '@/constants/abacus'; import { STRING_KEYS } from '@/constants/localization'; -import { type OrderType, ORDER_TYPE_STRINGS } from '@/constants/trade'; +import { ORDER_TYPE_STRINGS, type OrderType } from '@/constants/trade'; import type { ChartLine, PositionLineType, TvWidget } from '@/constants/tvchart'; import { useStringGetter } from '@/hooks'; @@ -14,7 +14,7 @@ import { getCurrentMarketPositionData, getIsAccountConnected, } from '@/state/accountSelectors'; -import { getAppTheme, getAppColorMode } from '@/state/configsSelectors'; +import { getAppColorMode, getAppTheme } from '@/state/configsSelectors'; import { getCurrentMarketId } from '@/state/perpetualsSelectors'; import { MustBigNumber } from '@/lib/numbers'; diff --git a/src/hooks/tradingView/useTradingView.ts b/src/hooks/tradingView/useTradingView.ts index 1a49a88e6..c924d788a 100644 --- a/src/hooks/tradingView/useTradingView.ts +++ b/src/hooks/tradingView/useTradingView.ts @@ -7,14 +7,14 @@ import { shallowEqual, useSelector } from 'react-redux'; import { DEFAULT_RESOLUTION } from '@/constants/candles'; import { LocalStorageKey } from '@/constants/localStorage'; -import { SUPPORTED_LOCALE_BASE_TAGS, STRING_KEYS } from '@/constants/localization'; +import { STRING_KEYS, SUPPORTED_LOCALE_BASE_TAGS } from '@/constants/localization'; import type { TvWidget } from '@/constants/tvchart'; import { useDydxClient, useLocalStorage, useStringGetter } from '@/hooks'; import { store } from '@/state/_store'; import { getSelectedNetwork } from '@/state/appSelectors'; -import { getAppTheme, getAppColorMode } from '@/state/configsSelectors'; +import { getAppColorMode, getAppTheme } from '@/state/configsSelectors'; import { getSelectedLocale } from '@/state/localizationSelectors'; import { getCurrentMarketId, getMarketIds } from '@/state/perpetualsSelectors'; diff --git a/src/hooks/tradingView/useTradingViewTheme.ts b/src/hooks/tradingView/useTradingViewTheme.ts index 8930cbf64..36aea7566 100644 --- a/src/hooks/tradingView/useTradingViewTheme.ts +++ b/src/hooks/tradingView/useTradingViewTheme.ts @@ -6,9 +6,9 @@ import { THEME_NAMES } from '@/constants/styles/colors'; import type { ChartLine, TvWidget } from '@/constants/tvchart'; import { AppColorMode, AppTheme } from '@/state/configs'; -import { getAppTheme, getAppColorMode } from '@/state/configsSelectors'; +import { getAppColorMode, getAppTheme } from '@/state/configsSelectors'; -import { getWidgetOverrides, getChartLineColors } from '@/lib/tradingView/utils'; +import { getChartLineColors, getWidgetOverrides } from '@/lib/tradingView/utils'; /** * @description Method to define a type guard and check that an element is an IFRAME diff --git a/src/hooks/useAccounts.tsx b/src/hooks/useAccounts.tsx index 0e92a7dce..f56442409 100644 --- a/src/hooks/useAccounts.tsx +++ b/src/hooks/useAccounts.tsx @@ -1,24 +1,24 @@ -import { useCallback, useContext, createContext, useEffect, useState, useMemo } from 'react'; +import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'; import { OfflineSigner } from '@cosmjs/proto-signing'; -import { NOBLE_BECH32_PREFIX, LocalWallet, type Subaccount } from '@dydxprotocol/v4-client-js'; +import { LocalWallet, NOBLE_BECH32_PREFIX, type Subaccount } from '@dydxprotocol/v4-client-js'; import { usePrivy } from '@privy-io/react-auth'; import { AES, enc } from 'crypto-js'; import { useDispatch } from 'react-redux'; import { OnboardingGuard, OnboardingState, type EvmDerivedAddresses } from '@/constants/account'; import { DialogTypes } from '@/constants/dialogs'; -import { LocalStorageKey, LOCAL_STORAGE_VERSIONS } from '@/constants/localStorage'; +import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage'; import { DydxAddress, EvmAddress, PrivateInformation, TEST_WALLET_EVM_ADDRESS, - WalletType, WalletConnectionType, + WalletType, } from '@/constants/wallets'; -import { setOnboardingState, setOnboardingGuard } from '@/state/account'; +import { setOnboardingGuard, setOnboardingState } from '@/state/account'; import { forceOpenDialog } from '@/state/dialogs'; import abacusStateManager from '@/lib/abacus'; diff --git a/src/hooks/useAnalytics.ts b/src/hooks/useAnalytics.ts index 200ae31e2..c75c473b6 100644 --- a/src/hooks/useAnalytics.ts +++ b/src/hooks/useAnalytics.ts @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; -import { useSelector, shallowEqual } from 'react-redux'; +import { shallowEqual, useSelector } from 'react-redux'; import { useLocation } from 'react-router-dom'; import { AnalyticsEvent, AnalyticsUserProperty } from '@/constants/analytics'; @@ -12,7 +12,7 @@ import { getActiveDialog } from '@/state/dialogsSelectors'; import { getInputTradeData } from '@/state/inputsSelectors'; import { getSelectedLocale } from '@/state/localizationSelectors'; -import { track, identify } from '@/lib/analytics'; +import { identify, track } from '@/lib/analytics'; import { getSelectedTradeType } from '@/lib/tradeData'; import { useAccounts } from './useAccounts'; diff --git a/src/hooks/useAppThemeAndColorMode.tsx b/src/hooks/useAppThemeAndColorMode.tsx index d3fce7f6b..f48561d76 100644 --- a/src/hooks/useAppThemeAndColorMode.tsx +++ b/src/hooks/useAppThemeAndColorMode.tsx @@ -5,8 +5,8 @@ import { ThemeProvider } from 'styled-components'; import { Themes } from '@/styles/themes'; -import { AppTheme, AppThemeSetting, AppColorMode, AppThemeSystemSetting } from '@/state/configs'; -import { getAppThemeSetting, getAppColorMode } from '@/state/configsSelectors'; +import { AppColorMode, AppTheme, AppThemeSetting, AppThemeSystemSetting } from '@/state/configs'; +import { getAppColorMode, getAppThemeSetting } from '@/state/configsSelectors'; export const AppThemeAndColorModeProvider = ({ ...props }) => { return ; diff --git a/src/hooks/useCurrentMarketId.ts b/src/hooks/useCurrentMarketId.ts index 76d8d9ca1..d4dad9bde 100644 --- a/src/hooks/useCurrentMarketId.ts +++ b/src/hooks/useCurrentMarketId.ts @@ -11,9 +11,9 @@ import { AppRoute } from '@/constants/routes'; import { useLocalStorage } from '@/hooks/useLocalStorage'; -import { getOpenPositions, getPositionDetails } from '@/state/accountSelectors'; +import { getOpenPositions } from '@/state/accountSelectors'; import { getSelectedNetwork } from '@/state/appSelectors'; -import { closeDialogInTradeBox, openDialogInTradeBox } from '@/state/dialogs'; +import { closeDialogInTradeBox } from '@/state/dialogs'; import { getActiveTradeBoxDialog } from '@/state/dialogsSelectors'; import { setCurrentMarketId } from '@/state/perpetuals'; import { getMarketIds } from '@/state/perpetualsSelectors'; diff --git a/src/hooks/useDialogArea.tsx b/src/hooks/useDialogArea.tsx index ef0d0a83d..f9a3a51d3 100644 --- a/src/hooks/useDialogArea.tsx +++ b/src/hooks/useDialogArea.tsx @@ -1,4 +1,4 @@ -import { useContext, createContext, useState } from 'react'; +import { createContext, useContext, useState } from 'react'; const DialogAreaContext = createContext | undefined>( undefined diff --git a/src/hooks/useDydxClient.tsx b/src/hooks/useDydxClient.tsx index 69c31785f..518075912 100644 --- a/src/hooks/useDydxClient.tsx +++ b/src/hooks/useDydxClient.tsx @@ -4,20 +4,20 @@ import { BECH32_PREFIX, CompositeClient, FaucetClient, + IndexerClient, IndexerConfig, LocalWallet, - onboarding, Network, ValidatorConfig, + onboarding, type ProposalStatus, - IndexerClient, } from '@dydxprotocol/v4-client-js'; import type { ResolutionString } from 'public/tradingview/charting_library'; import { useSelector } from 'react-redux'; import type { ConnectNetworkEvent, NetworkConfig } from '@/constants/abacus'; import { DEFAULT_TRANSACTION_MEMO } from '@/constants/analytics'; -import { type Candle, RESOLUTION_MAP } from '@/constants/candles'; +import { RESOLUTION_MAP, type Candle } from '@/constants/candles'; import { getSelectedNetwork } from '@/state/appSelectors'; diff --git a/src/hooks/useIsFirstRender.ts b/src/hooks/useIsFirstRender.ts index 15e7e35fa..1a90cb51b 100644 --- a/src/hooks/useIsFirstRender.ts +++ b/src/hooks/useIsFirstRender.ts @@ -1,4 +1,4 @@ -import { useRef, useEffect } from 'react'; +import { useEffect, useRef } from 'react'; /** * indicate whether the current render is the first render (when the component was mounted) diff --git a/src/hooks/useLocalNotifications.tsx b/src/hooks/useLocalNotifications.tsx index a0b09ce37..176771539 100644 --- a/src/hooks/useLocalNotifications.tsx +++ b/src/hooks/useLocalNotifications.tsx @@ -1,9 +1,9 @@ -import { createContext, useContext, useCallback, useEffect, useMemo } from 'react'; +import { createContext, useCallback, useContext, useEffect } from 'react'; import { useQuery } from 'react-query'; import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage'; -import type { TriggerOrderNotification, TransferNotifcation } from '@/constants/notifications'; +import type { TransferNotifcation, TriggerOrderNotification } from '@/constants/notifications'; import { useAccounts } from '@/hooks/useAccounts'; diff --git a/src/hooks/useMarketsData.ts b/src/hooks/useMarketsData.ts index cfafaa1b8..470f9acda 100644 --- a/src/hooks/useMarketsData.ts +++ b/src/hooks/useMarketsData.ts @@ -1,8 +1,8 @@ import { useMemo } from 'react'; -import { useSelector, shallowEqual } from 'react-redux'; +import { shallowEqual, useSelector } from 'react-redux'; -import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constants/markets'; +import { MARKET_FILTER_LABELS, MarketFilters, type MarketData } from '@/constants/markets'; import { SEVEN_DAY_SPARKLINE_ENTRIES, diff --git a/src/hooks/useNotificationTypes.tsx b/src/hooks/useNotificationTypes.tsx index 3dc929f8d..b3b2c4bab 100644 --- a/src/hooks/useNotificationTypes.tsx +++ b/src/hooks/useNotificationTypes.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react'; -import { isEqual, groupBy } from 'lodash'; +import { groupBy, isEqual } from 'lodash'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; import styled from 'styled-components'; @@ -13,11 +13,11 @@ import { type StringKey, } from '@/constants/localization'; import { - type NotificationTypeConfig, - NotificationType, DEFAULT_TOAST_AUTO_CLOSE_MS, - TransferNotificationTypes, + NotificationType, ReleaseUpdateNotificationIds, + TransferNotificationTypes, + type NotificationTypeConfig, } from '@/constants/notifications'; import { AppRoute, TokenRoute } from '@/constants/routes'; import { DydxChainAsset } from '@/constants/wallets'; diff --git a/src/hooks/useNotifications.tsx b/src/hooks/useNotifications.tsx index d5624d77a..3949ea63b 100644 --- a/src/hooks/useNotifications.tsx +++ b/src/hooks/useNotifications.tsx @@ -11,13 +11,13 @@ import { import { AnalyticsEvent } from '@/constants/analytics'; import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage'; import { + NotificationStatus, + NotificationType, + SingleSessionNotificationTypes, type Notification, type NotificationDisplayData, type NotificationPreferences, type Notifications, - NotificationStatus, - NotificationType, - SingleSessionNotificationTypes, } from '@/constants/notifications'; import { track } from '@/lib/analytics'; diff --git a/src/hooks/useRestrictions.tsx b/src/hooks/useRestrictions.tsx index 149ccec4e..adea95fc6 100644 --- a/src/hooks/useRestrictions.tsx +++ b/src/hooks/useRestrictions.tsx @@ -8,8 +8,6 @@ import { DialogTypes } from '@/constants/dialogs'; import { getRestrictionType } from '@/state/accountSelectors'; import { forceOpenDialog } from '@/state/dialogs'; -import { isTruthy } from '@/lib/isTruthy'; - const useRestrictionContext = () => { const dispatch = useDispatch(); const restrictionType = useSelector(getRestrictionType, shallowEqual); diff --git a/src/hooks/useStringGetter.ts b/src/hooks/useStringGetter.ts index 0e34d3899..de8cbc93d 100644 --- a/src/hooks/useStringGetter.ts +++ b/src/hooks/useStringGetter.ts @@ -1,4 +1,4 @@ -import { useSelector, shallowEqual } from 'react-redux'; +import { shallowEqual, useSelector } from 'react-redux'; import type { StringGetterFunction } from '@/constants/localization'; diff --git a/src/hooks/useSubaccount.tsx b/src/hooks/useSubaccount.tsx index 8b8e6ca03..a817f2d5b 100644 --- a/src/hooks/useSubaccount.tsx +++ b/src/hooks/useSubaccount.tsx @@ -5,13 +5,13 @@ import { type IndexedTx } from '@cosmjs/stargate'; import { Method } from '@cosmjs/tendermint-rpc'; import type { Nullable } from '@dydxprotocol/v4-abacus'; import { - type LocalWallet, SubaccountClient, - type GovAddNewMarketParams, utils, + type GovAddNewMarketParams, + type LocalWallet, } from '@dydxprotocol/v4-client-js'; import Long from 'long'; -import { shallowEqual, useSelector, useDispatch } from 'react-redux'; +import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import type { AccountBalance, @@ -24,7 +24,7 @@ import { AMOUNT_RESERVED_FOR_GAS_USDC } from '@/constants/account'; import { QUANTUM_MULTIPLIER } from '@/constants/numbers'; import { DydxAddress } from '@/constants/wallets'; -import { setSubaccount, setHistoricalPnl, removeUncommittedOrderClientId } from '@/state/account'; +import { removeUncommittedOrderClientId, setHistoricalPnl, setSubaccount } from '@/state/account'; import { getBalances } from '@/state/accountSelectors'; import abacusStateManager from '@/lib/abacus'; diff --git a/src/hooks/useWalletConnection.ts b/src/hooks/useWalletConnection.ts index cbae9430f..a3f506d10 100644 --- a/src/hooks/useWalletConnection.ts +++ b/src/hooks/useWalletConnection.ts @@ -1,17 +1,17 @@ -import { useCallback, useEffect, useState, useMemo } from 'react'; +import { useCallback, useEffect, useMemo, useState } from 'react'; -import { usePrivy, useLogout, useLogin } from '@privy-io/react-auth'; +import { useLogin, useLogout, usePrivy } from '@privy-io/react-auth'; import { - useSuggestChainAndConnect as useConnectGraz, + WalletType as CosmosWalletType, useAccount as useAccountGraz, + useSuggestChainAndConnect as useConnectGraz, useDisconnect as useDisconnectGraz, useOfflineSigners as useOfflineSignersGraz, - WalletType as CosmosWalletType, } from 'graz'; import { useSelector } from 'react-redux'; import { - useConnect as useConnectWagmi, useAccount as useAccountWagmi, + useConnect as useConnectWagmi, useDisconnect as useDisconnectWagmi, usePublicClient as usePublicClientWagmi, useWalletClient as useWalletClientWagmi, @@ -22,12 +22,12 @@ import { LocalStorageKey } from '@/constants/localStorage'; import { STRING_KEYS } from '@/constants/localization'; import { WALLETS_CONFIG_MAP } from '@/constants/networks'; import { - type DydxAddress, - type EvmAddress, + DYDX_CHAIN_INFO, WalletConnectionType, WalletType, wallets, - DYDX_CHAIN_INFO, + type DydxAddress, + type EvmAddress, } from '@/constants/wallets'; import { useLocalStorage } from '@/hooks/useLocalStorage'; diff --git a/src/layout/Footer/FooterDesktop.tsx b/src/layout/Footer/FooterDesktop.tsx index 860215837..3a6f3a26c 100644 --- a/src/layout/Footer/FooterDesktop.tsx +++ b/src/layout/Footer/FooterDesktop.tsx @@ -1,4 +1,4 @@ -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { AbacusApiStatus } from '@/constants/abacus'; import { ButtonSize, ButtonType } from '@/constants/buttons'; diff --git a/src/layout/Header/HeaderDesktop.tsx b/src/layout/Header/HeaderDesktop.tsx index 4ad56d3cb..9b9bd8464 100644 --- a/src/layout/Header/HeaderDesktop.tsx +++ b/src/layout/Header/HeaderDesktop.tsx @@ -7,9 +7,9 @@ import { DialogTypes } from '@/constants/dialogs'; import { STRING_KEYS } from '@/constants/localization'; import { AppRoute } from '@/constants/routes'; -import { useTokenConfigs, useStringGetter, useURLConfigs } from '@/hooks'; +import { useStringGetter, useTokenConfigs, useURLConfigs } from '@/hooks'; -import { LogoShortIcon, BellStrokeIcon } from '@/icons'; +import { BellStrokeIcon, LogoShortIcon } from '@/icons'; import breakpoints from '@/styles/breakpoints'; import { headerMixins } from '@/styles/headerMixins'; import { layoutMixins } from '@/styles/layoutMixins'; diff --git a/src/layout/NotificationsToastArea/NotifcationStack.tsx b/src/layout/NotificationsToastArea/NotifcationStack.tsx index 03f8feb50..f65c71c35 100644 --- a/src/layout/NotificationsToastArea/NotifcationStack.tsx +++ b/src/layout/NotificationsToastArea/NotifcationStack.tsx @@ -4,9 +4,9 @@ import styled, { css } from 'styled-components'; import { ButtonShape, ButtonSize } from '@/constants/buttons'; import { + NotificationStatus, type Notification, type NotificationDisplayData, - NotificationStatus, } from '@/constants/notifications'; import { useBreakpoints } from '@/hooks/useBreakpoints'; diff --git a/src/lib/__test__/timeUtils.ts b/src/lib/__test__/timeUtils.ts index 6fdae753a..a9f0421ab 100644 --- a/src/lib/__test__/timeUtils.ts +++ b/src/lib/__test__/timeUtils.ts @@ -3,11 +3,11 @@ import { describe, expect, it } from 'vitest'; import { MustBigNumber } from '@/lib/numbers'; import { - getTimestamp, getStringsForDateTimeDiff, getStringsForTimeInterval, - getTimeTillNextUnit, getTimeString, + getTimeTillNextUnit, + getTimestamp, } from '@/lib/timeUtils'; describe('getTimestamp', () => { diff --git a/src/lib/abacus/conversions.ts b/src/lib/abacus/conversions.ts index 101c9d81d..9a79f6d86 100644 --- a/src/lib/abacus/conversions.ts +++ b/src/lib/abacus/conversions.ts @@ -2,10 +2,10 @@ import { OrderSide } from '@dydxprotocol/v4-client-js'; import { AbacusOrderSide, - type Nullable, - type AbacusOrderSides, AbacusPositionSide, AbacusPositionSides, + type AbacusOrderSides, + type Nullable, } from '@/constants/abacus'; import { PositionSide } from '@/constants/trade'; diff --git a/src/lib/abacus/dydxChainTransactions.ts b/src/lib/abacus/dydxChainTransactions.ts index 6cb1e8067..8dbb22481 100644 --- a/src/lib/abacus/dydxChainTransactions.ts +++ b/src/lib/abacus/dydxChainTransactions.ts @@ -1,33 +1,34 @@ import { EncodeObject } from '@cosmjs/proto-signing'; import type { IndexedTx } from '@cosmjs/stargate'; import Abacus, { type Nullable } from '@dydxprotocol/v4-abacus'; -import { GAS_MULTIPLIER, encodeJson } from '@dydxprotocol/v4-client-js'; import { CompositeClient, + GAS_MULTIPLIER, IndexerConfig, - type LocalWallet, Network, NetworkOptimizer, NobleClient, - SubaccountClient, - ValidatorConfig, - OrderType, + OrderExecution, OrderSide, OrderTimeInForce, - OrderExecution, + OrderType, + SubaccountClient, + ValidatorConfig, + encodeJson, + type LocalWallet, } from '@dydxprotocol/v4-client-js'; import Long from 'long'; import { - type AbacusDYDXChainTransactionsProtocol, QueryType, - type QueryTypes, TransactionType, - type TransactionTypes, - type HumanReadablePlaceOrderPayload, + type AbacusDYDXChainTransactionsProtocol, type HumanReadableCancelOrderPayload, - type HumanReadableWithdrawPayload, + type HumanReadablePlaceOrderPayload, type HumanReadableTransferPayload, + type HumanReadableWithdrawPayload, + type QueryTypes, + type TransactionTypes, } from '@/constants/abacus'; import { DEFAULT_TRANSACTION_MEMO } from '@/constants/analytics'; import { DydxChainId, isTestnet } from '@/constants/networks'; @@ -40,7 +41,7 @@ import { setInitializationError } from '@/state/app'; import { StatefulOrderError } from '../errors'; import { bytesToBigInt } from '../numbers'; import { log } from '../telemetry'; -import { hashFromTx, getMintscanTxLink } from '../txUtils'; +import { getMintscanTxLink, hashFromTx } from '../txUtils'; (BigInt.prototype as any).toJSON = function () { return this.toString(); diff --git a/src/lib/abacus/formatter.ts b/src/lib/abacus/formatter.ts index bebfe0d24..725c9b208 100644 --- a/src/lib/abacus/formatter.ts +++ b/src/lib/abacus/formatter.ts @@ -1,6 +1,6 @@ import type { AbacusFormatterProtocol } from '@/constants/abacus'; -import { type LocaleSeparators, MustBigNumber, getFractionDigits } from '../numbers'; +import { MustBigNumber, getFractionDigits, type LocaleSeparators } from '../numbers'; class AbacusFormatter implements AbacusFormatterProtocol { localeSeparators: LocaleSeparators; diff --git a/src/lib/abacus/index.ts b/src/lib/abacus/index.ts index 22335069c..d0c386426 100644 --- a/src/lib/abacus/index.ts +++ b/src/lib/abacus/index.ts @@ -2,35 +2,35 @@ import type { LocalWallet } from '@dydxprotocol/v4-client-js'; import type { ClosePositionInputFields, - Nullable, + HistoricalPnlPeriods, HistoricalTradingRewardsPeriod, HistoricalTradingRewardsPeriods, - HumanReadablePlaceOrderPayload, HumanReadableCancelOrderPayload, + HumanReadablePlaceOrderPayload, + HumanReadableTriggerOrdersPayload, + Nullable, + ParsingError, TradeInputFields, TransferInputFields, - HistoricalPnlPeriods, - ParsingError, - HumanReadableTriggerOrdersPayload, } from '@/constants/abacus'; import { - AsyncAbacusStateManager, + AbacusAppConfig, AbacusHelper, + ApiData, + AsyncAbacusStateManager, ClosePositionInputField, + CoroutineTimer, HistoricalPnlPeriod, + IOImplementations, TradeInputField, TransferInputField, - IOImplementations, - UIImplementations, - CoroutineTimer, TransferType, - AbacusAppConfig, - ApiData, - type TriggerOrdersInputFields, TriggerOrdersInputField, + UIImplementations, + type TriggerOrdersInputFields, } from '@/constants/abacus'; import { DEFAULT_MARKETID } from '@/constants/markets'; -import { CURRENT_ABACUS_DEPLOYMENT, type DydxNetwork, isMainnet } from '@/constants/networks'; +import { CURRENT_ABACUS_DEPLOYMENT, type DydxNetwork } from '@/constants/networks'; import { CLEARED_SIZE_INPUTS, CLEARED_TRADE_INPUTS } from '@/constants/trade'; import type { RootStore } from '@/state/_store'; diff --git a/src/lib/abacus/stateNotification.ts b/src/lib/abacus/stateNotification.ts index a7fb5d262..f45d3728b 100644 --- a/src/lib/abacus/stateNotification.ts +++ b/src/lib/abacus/stateNotification.ts @@ -1,10 +1,10 @@ import { kollections } from '@dydxprotocol/v4-abacus'; import type { - AccountBalance, AbacusApiState, AbacusNotification, AbacusStateNotificationProtocol, + AccountBalance, Asset, Nullable, ParsingErrors, @@ -18,16 +18,16 @@ import { Changes } from '@/constants/abacus'; import type { RootStore } from '@/state/_store'; import { setBalances, - setStakingBalances, setFills, setFundingPayments, setHistoricalPnl, setLatestOrder, setRestrictionType, + setStakingBalances, setSubaccount, + setTradingRewards, setTransfers, setWallet, - setTradingRewards, } from '@/state/account'; import { setApiState } from '@/state/app'; import { setAssets } from '@/state/assets'; diff --git a/src/lib/addressUtils.ts b/src/lib/addressUtils.ts index 1e2f954bc..e6c366c0b 100644 --- a/src/lib/addressUtils.ts +++ b/src/lib/addressUtils.ts @@ -1,4 +1,4 @@ -import { fromBech32, toBech32, fromHex, toHex } from '@cosmjs/encoding'; +import { fromBech32, fromHex, toBech32, toHex } from '@cosmjs/encoding'; // ============ Byte Helpers ============ export const stripHexPrefix = (input: string): string => { diff --git a/src/lib/analytics.ts b/src/lib/analytics.ts index 7904c786a..685f034c8 100644 --- a/src/lib/analytics.ts +++ b/src/lib/analytics.ts @@ -1,8 +1,8 @@ import type { - AnalyticsUserProperty, - AnalyticsUserPropertyValue, AnalyticsEvent, AnalyticsEventData, + AnalyticsUserProperty, + AnalyticsUserPropertyValue, } from '@/constants/analytics'; const DEBUG_ANALYTICS = false; diff --git a/src/lib/dateTime.ts b/src/lib/dateTime.ts index ccf7da07a..97401565b 100644 --- a/src/lib/dateTime.ts +++ b/src/lib/dateTime.ts @@ -1,4 +1,4 @@ -import { timeUnits, allTimeUnits } from '@/constants/time'; +import { allTimeUnits, timeUnits } from '@/constants/time'; // Given a literal from Intl.RelativeTimeFormat formatToParts, // strip out words/symbols unrelated to time unit diff --git a/src/lib/network.ts b/src/lib/network.ts index c87436a53..91a10c698 100644 --- a/src/lib/network.ts +++ b/src/lib/network.ts @@ -1,4 +1,4 @@ -import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP, type DydxChainId } from '@/constants/networks'; +import { ENVIRONMENT_CONFIG_MAP, type DydxNetwork } from '@/constants/networks'; export const validateAgainstAvailableEnvironments = (value: DydxNetwork) => Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value); diff --git a/src/lib/orders.ts b/src/lib/orders.ts index 3614edeb9..cda89e14f 100644 --- a/src/lib/orders.ts +++ b/src/lib/orders.ts @@ -5,12 +5,12 @@ import { AbacusOrderType, AbacusOrderTypes, type Asset, - type SubaccountFill, - type SubaccountFundingPayment, - type SubaccountOrder, type Nullable, type OrderStatus, type PerpetualMarket, + type SubaccountFill, + type SubaccountFundingPayment, + type SubaccountOrder, } from '@/constants/abacus'; import { STRING_KEYS } from '@/constants/localization'; diff --git a/src/lib/positions.ts b/src/lib/positions.ts index 42cc38c33..1946a1624 100644 --- a/src/lib/positions.ts +++ b/src/lib/positions.ts @@ -1,4 +1,4 @@ -import { type Asset, type PerpetualMarket, SubaccountPosition, Nullable } from '@/constants/abacus'; +import { Nullable, SubaccountPosition, type Asset, type PerpetualMarket } from '@/constants/abacus'; import { TOKEN_DECIMALS, USD_DECIMALS } from '@/constants/numbers'; type HydratedPositionData = SubaccountPosition & { @@ -6,7 +6,7 @@ type HydratedPositionData = SubaccountPosition & { stepSizeDecimals: number; tickSizeDecimals: number; oraclePrice: Nullable; -} +}; export const getHydratedPositionData = ({ data, diff --git a/src/lib/tradeData.ts b/src/lib/tradeData.ts index 4fcc55680..55a9d5604 100644 --- a/src/lib/tradeData.ts +++ b/src/lib/tradeData.ts @@ -1,13 +1,13 @@ import { OrderSide } from '@dydxprotocol/v4-client-js'; -import { type Location, matchPath } from 'react-router-dom'; +import { matchPath, type Location } from 'react-router-dom'; import { - type Nullable, AbacusOrderSide, - type AbacusOrderSides, AbacusOrderTypes, - ValidationError, ErrorType, + ValidationError, + type AbacusOrderSides, + type Nullable, } from '@/constants/abacus'; import { AlertType } from '@/constants/alerts'; import type { StringGetterFunction } from '@/constants/localization'; diff --git a/src/lib/tradingView/dydxfeed/index.ts b/src/lib/tradingView/dydxfeed/index.ts index 8295d9ba8..35c3838e8 100644 --- a/src/lib/tradingView/dydxfeed/index.ts +++ b/src/lib/tradingView/dydxfeed/index.ts @@ -21,7 +21,7 @@ import { setCandles } from '@/state/perpetuals'; import { getMarketConfig, getPerpetualBarsForPriceChart } from '@/state/perpetualsSelectors'; import { log } from '../../telemetry'; -import { getSymbol, getHistorySlice, mapCandle } from '../utils'; +import { getHistorySlice, getSymbol, mapCandle } from '../utils'; import { lastBarsCache } from './cache'; import { subscribeOnStream, unsubscribeFromStream } from './streaming'; diff --git a/src/lib/tradingView/utils.ts b/src/lib/tradingView/utils.ts index f144ff4e4..90b890b85 100644 --- a/src/lib/tradingView/utils.ts +++ b/src/lib/tradingView/utils.ts @@ -6,7 +6,7 @@ import type { ChartLineType } from '@/constants/tvchart'; import { Themes } from '@/styles/themes'; -import { type AppColorMode, AppTheme } from '@/state/configs'; +import { AppTheme, type AppColorMode } from '@/state/configs'; export const mapCandle = ({ startedAt, diff --git a/src/lib/wagmi.ts b/src/lib/wagmi.ts index 70fddbf04..66d59d80c 100644 --- a/src/lib/wagmi.ts +++ b/src/lib/wagmi.ts @@ -6,31 +6,31 @@ import { arbitrumGoerli, avalanche, avalancheFuji, - bsc, - bscTestnet, - optimism, - optimismGoerli, base, baseGoerli, - polygon, - polygonMumbai, + bsc, + bscTestnet, + celo, + celoAlfajores, + fantom, + fantomTestnet, + filecoin, + filecoinHyperspace, + kava, linea, lineaTestnet, mantle, mantleTestnet, - moonbeam, moonbaseAlpha, - filecoin, - filecoinHyperspace, - fantom, - fantomTestnet, - celo, - celoAlfajores, + moonbeam, + optimism, + optimismGoerli, + polygon, + polygonMumbai, scroll, - kava, sepolia, } from 'viem/chains'; -import { createConfig, configureChains, mainnet, Chain } from 'wagmi'; +import { Chain, configureChains, createConfig, mainnet } from 'wagmi'; import { goerli } from 'wagmi/chains'; import { CoinbaseWalletConnector } from 'wagmi/connectors/coinbaseWallet'; import { InjectedConnector } from 'wagmi/connectors/injected'; @@ -43,12 +43,12 @@ import { publicProvider } from 'wagmi/providers/public'; import { LocalStorageKey } from '@/constants/localStorage'; import { DEFAULT_APP_ENVIRONMENT, ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; import { - type WalletConnection, + WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS, WalletConnectionType, - type WalletType, walletConnectionTypes, wallets, - WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS, + type WalletConnection, + type WalletType, } from '@/constants/wallets'; import { isTruthy } from './isTruthy'; diff --git a/src/lib/wallet/index.ts b/src/lib/wallet/index.ts index 66eb7f5e4..c3b8f45e0 100644 --- a/src/lib/wallet/index.ts +++ b/src/lib/wallet/index.ts @@ -1,10 +1,10 @@ import { STRING_KEYS, StringGetterFunction } from '@/constants/localization'; import { - type WalletConnection, - wallets, WalletConnectionType, WalletErrorType, WalletType, + wallets, + type WalletConnection, } from '@/constants/wallets'; import { detectInjectedEip1193Providers } from './providers'; diff --git a/src/lib/wallet/providers.ts b/src/lib/wallet/providers.ts index df9748f82..d059e3912 100644 --- a/src/lib/wallet/providers.ts +++ b/src/lib/wallet/providers.ts @@ -1,11 +1,11 @@ import type { ExternalProvider } from '@ethersproject/providers'; import { - type InjectedEthereumProvider, type InjectedCoinbaseWalletExtensionProvider, + type InjectedEthereumProvider, type WithInjectedEthereumProvider, - type WithInjectedWeb3Provider, type WithInjectedOkxWalletProvider, + type WithInjectedWeb3Provider, } from '@/constants/wallets'; import { isTruthy } from '../isTruthy'; diff --git a/src/pages/Profile.tsx b/src/pages/Profile.tsx index bcdda4179..d9b86cdc1 100644 --- a/src/pages/Profile.tsx +++ b/src/pages/Profile.tsx @@ -1,6 +1,5 @@ import { useDispatch, useSelector } from 'react-redux'; -import { Link } from 'react-router-dom'; -import { useNavigate } from 'react-router-dom'; +import { Link, useNavigate } from 'react-router-dom'; import styled, { AnyStyledComponent, css } from 'styled-components'; import { useEnsName } from 'wagmi'; @@ -9,7 +8,7 @@ import { OnboardingState } from '@/constants/account'; import { ButtonSize } from '@/constants/buttons'; import { DialogTypes } from '@/constants/dialogs'; import { STRING_KEYS } from '@/constants/localization'; -import { AppRoute, PortfolioRoute, HistoryRoute } from '@/constants/routes'; +import { AppRoute, HistoryRoute, PortfolioRoute } from '@/constants/routes'; import { wallets } from '@/constants/wallets'; import { useAccounts, useStringGetter, useTokenConfigs } from '@/hooks'; diff --git a/src/pages/portfolio/Overview.tsx b/src/pages/portfolio/Overview.tsx index 0e8beccda..76e6178b8 100644 --- a/src/pages/portfolio/Overview.tsx +++ b/src/pages/portfolio/Overview.tsx @@ -12,8 +12,8 @@ import { ContentSectionHeader } from '@/components/ContentSectionHeader'; import { PositionsTable, PositionsTableColumnKey } from '@/views/tables/PositionsTable'; import { - calculateShouldRenderTriggersInPositionsTable, calculateShouldRenderActionsInPositionsTable, + calculateShouldRenderTriggersInPositionsTable, } from '@/state/accountCalculators'; import { isTruthy } from '@/lib/isTruthy'; @@ -28,7 +28,9 @@ export const Overview = () => { const showClosePositionAction = false; const shouldRenderTriggers = useSelector(calculateShouldRenderTriggersInPositionsTable); - const shouldRenderActions = useSelector(calculateShouldRenderActionsInPositionsTable(showClosePositionAction)); + const shouldRenderActions = useSelector( + calculateShouldRenderActionsInPositionsTable(showClosePositionAction) + ); return (
diff --git a/src/pages/portfolio/PortfolioNavMobile.tsx b/src/pages/portfolio/PortfolioNavMobile.tsx index 2909f9a4a..72339e155 100644 --- a/src/pages/portfolio/PortfolioNavMobile.tsx +++ b/src/pages/portfolio/PortfolioNavMobile.tsx @@ -8,7 +8,6 @@ import { useStringGetter } from '@/hooks'; import { layoutMixins } from '@/styles/layoutMixins'; -import { BackButton } from '@/components/BackButton'; import { DropdownHeaderMenu } from '@/components/DropdownHeaderMenu'; export const PortfolioNavMobile = () => { diff --git a/src/pages/portfolio/Positions.tsx b/src/pages/portfolio/Positions.tsx index 60b840ae8..8333a74d3 100644 --- a/src/pages/portfolio/Positions.tsx +++ b/src/pages/portfolio/Positions.tsx @@ -11,8 +11,8 @@ import { ContentSectionHeader } from '@/components/ContentSectionHeader'; import { PositionsTable, PositionsTableColumnKey } from '@/views/tables/PositionsTable'; import { - calculateShouldRenderTriggersInPositionsTable, calculateShouldRenderActionsInPositionsTable, + calculateShouldRenderTriggersInPositionsTable, } from '@/state/accountCalculators'; import { isTruthy } from '@/lib/isTruthy'; @@ -26,7 +26,9 @@ export const Positions = () => { const showClosePositionAction = false; const shouldRenderTriggers = useSelector(calculateShouldRenderTriggersInPositionsTable); - const shouldRenderActions = useSelector(calculateShouldRenderActionsInPositionsTable(showClosePositionAction)); + const shouldRenderActions = useSelector( + calculateShouldRenderActionsInPositionsTable(showClosePositionAction) + ); return ( diff --git a/src/pages/settings/Settings.tsx b/src/pages/settings/Settings.tsx index e343ceb71..5a6bfca50 100644 --- a/src/pages/settings/Settings.tsx +++ b/src/pages/settings/Settings.tsx @@ -3,14 +3,14 @@ import { Navigate, Route, Routes, useLocation } from 'react-router-dom'; import { STRING_KEYS, - SupportedLocales, SUPPORTED_LOCALE_STRING_LABELS, + SupportedLocales, } from '@/constants/localization'; import type { MenuItem } from '@/constants/menus'; import { DydxNetwork } from '@/constants/networks'; import { AppRoute, MobileSettingsRoute } from '@/constants/routes'; -import { useStringGetter, useSelectedNetwork } from '@/hooks'; +import { useSelectedNetwork, useStringGetter } from '@/hooks'; import { ComingSoonSpace } from '@/components/ComingSoon'; import { PageMenu } from '@/components/PageMenu'; diff --git a/src/pages/settings/SettingsHeader.tsx b/src/pages/settings/SettingsHeader.tsx index aacbece59..858b117e2 100644 --- a/src/pages/settings/SettingsHeader.tsx +++ b/src/pages/settings/SettingsHeader.tsx @@ -1,6 +1,6 @@ import styled, { type AnyStyledComponent } from 'styled-components'; -import { type StringGetterFunction, STRING_KEYS } from '@/constants/localization'; +import { STRING_KEYS, type StringGetterFunction } from '@/constants/localization'; import { AppRoute, MobileSettingsRoute } from '@/constants/routes'; import { layoutMixins } from '@/styles/layoutMixins'; diff --git a/src/pages/token/rewards/DYDXBalancePanel.tsx b/src/pages/token/rewards/DYDXBalancePanel.tsx index 12bb2713e..3829a1adc 100644 --- a/src/pages/token/rewards/DYDXBalancePanel.tsx +++ b/src/pages/token/rewards/DYDXBalancePanel.tsx @@ -6,9 +6,9 @@ import styled, { AnyStyledComponent } from 'styled-components'; import { ButtonAction, ButtonSize } from '@/constants/buttons'; import { DialogTypes } from '@/constants/dialogs'; import { STRING_KEYS } from '@/constants/localization'; -import { wallets, WalletType } from '@/constants/wallets'; +import { WalletType, wallets } from '@/constants/wallets'; -import { useAccountBalance, useAccounts, useTokenConfigs, useStringGetter } from '@/hooks'; +import { useAccountBalance, useAccounts, useStringGetter, useTokenConfigs } from '@/hooks'; import { layoutMixins } from '@/styles/layoutMixins'; diff --git a/src/pages/token/rewards/MigratePanel.tsx b/src/pages/token/rewards/MigratePanel.tsx index 25d20e0bb..a29666fca 100644 --- a/src/pages/token/rewards/MigratePanel.tsx +++ b/src/pages/token/rewards/MigratePanel.tsx @@ -11,7 +11,7 @@ import { layoutMixins } from '@/styles/layoutMixins'; import { Button } from '@/components/Button'; import { Details } from '@/components/Details'; -import { IconName, Icon } from '@/components/Icon'; +import { Icon, IconName } from '@/components/Icon'; import { Link } from '@/components/Link'; import { Output, OutputType } from '@/components/Output'; import { Panel } from '@/components/Panel'; diff --git a/src/pages/token/staking/StakingPanel.tsx b/src/pages/token/staking/StakingPanel.tsx index 746faedc1..b15b44c34 100644 --- a/src/pages/token/staking/StakingPanel.tsx +++ b/src/pages/token/staking/StakingPanel.tsx @@ -6,7 +6,6 @@ import { STRING_KEYS } from '@/constants/localization'; import { useStringGetter, useURLConfigs } from '@/hooks'; -import { IconName } from '@/components/Icon'; import { IconButton } from '@/components/IconButton'; import { Link } from '@/components/Link'; import { Panel } from '@/components/Panel'; diff --git a/src/pages/trade/TradeDialogTrigger.tsx b/src/pages/trade/TradeDialogTrigger.tsx index feb2e0c4b..73f61001e 100644 --- a/src/pages/trade/TradeDialogTrigger.tsx +++ b/src/pages/trade/TradeDialogTrigger.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { useSelector, shallowEqual } from 'react-redux'; +import { shallowEqual, useSelector } from 'react-redux'; import styled, { AnyStyledComponent } from 'styled-components'; import { STRING_KEYS } from '@/constants/localization'; diff --git a/src/state/account.ts b/src/state/account.ts index c0ff77563..00dea4ebe 100644 --- a/src/state/account.ts +++ b/src/state/account.ts @@ -2,18 +2,18 @@ import { createSlice, type PayloadAction } from '@reduxjs/toolkit'; import type { AccountBalance, - SubaccountFill, + HistoricalPnlPeriods, Nullable, + SubAccountHistoricalPNLs, Subaccount, + SubaccountFill, SubaccountFills, SubaccountFundingPayments, - Wallet, SubaccountOrder, SubaccountTransfers, - HistoricalPnlPeriods, - SubAccountHistoricalPNLs, - UsageRestriction, TradingRewards, + UsageRestriction, + Wallet, } from '@/constants/abacus'; import { OnboardingGuard, OnboardingState } from '@/constants/account'; import { LocalStorageKey } from '@/constants/localStorage'; diff --git a/src/state/accountCalculators.ts b/src/state/accountCalculators.ts index 0541ef4ce..29bf10c83 100644 --- a/src/state/accountCalculators.ts +++ b/src/state/accountCalculators.ts @@ -1,8 +1,7 @@ import { createSelector } from 'reselect'; import { OnboardingState, OnboardingSteps } from '@/constants/account'; -import { type DydxNetwork } from '@/constants/networks'; -import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; +import { ENVIRONMENT_CONFIG_MAP, type DydxNetwork } from '@/constants/networks'; import { getOnboardingGuards, diff --git a/src/state/accountSelectors.ts b/src/state/accountSelectors.ts index 57a21151f..eefa47edd 100644 --- a/src/state/accountSelectors.ts +++ b/src/state/accountSelectors.ts @@ -3,16 +3,16 @@ import { OrderSide } from '@dydxprotocol/v4-client-js'; import { createSelector } from 'reselect'; import { - type AbacusOrderStatuses, - type SubaccountOrder, - type SubaccountFill, - type SubaccountFundingPayment, + AbacusOrderSide, AbacusOrderStatus, AbacusPositionSide, - ORDER_SIDES, HistoricalTradingReward, HistoricalTradingRewardsPeriod, - AbacusOrderSide, + ORDER_SIDES, + type AbacusOrderStatuses, + type SubaccountFill, + type SubaccountFundingPayment, + type SubaccountOrder, } from '@/constants/abacus'; import { OnboardingState } from '@/constants/account'; diff --git a/src/state/configsSelectors.ts b/src/state/configsSelectors.ts index 51046948d..3ac7b1bdb 100644 --- a/src/state/configsSelectors.ts +++ b/src/state/configsSelectors.ts @@ -1,5 +1,5 @@ import type { RootState } from './_store'; -import { AppTheme, AppThemeSystemSetting, AppThemeSetting } from './configs'; +import { AppTheme, AppThemeSetting, AppThemeSystemSetting } from './configs'; export const getAppThemeSetting = (state: RootState): AppThemeSetting => state.configs.appThemeSetting; diff --git a/src/state/inputs.ts b/src/state/inputs.ts index 0d5ee02a1..03877d22b 100644 --- a/src/state/inputs.ts +++ b/src/state/inputs.ts @@ -2,11 +2,11 @@ import { createSlice, type PayloadAction } from '@reduxjs/toolkit'; import assign from 'lodash/assign'; import type { + ClosePositionInputs, InputError, Inputs, Nullable, TradeInputs, - ClosePositionInputs, TransferInputs, TriggerOrdersInputs, } from '@/constants/abacus'; diff --git a/src/state/localization.ts b/src/state/localization.ts index b7cbefbe4..1a525613d 100644 --- a/src/state/localization.ts +++ b/src/state/localization.ts @@ -1,5 +1,5 @@ -import { createSlice } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; +import { createSlice } from '@reduxjs/toolkit'; import { EN_LOCALE_DATA, LocaleData, SupportedLocales } from '@/constants/localization'; diff --git a/src/state/localizationMiddleware.ts b/src/state/localizationMiddleware.ts index 550a2d20f..09f188000 100644 --- a/src/state/localizationMiddleware.ts +++ b/src/state/localizationMiddleware.ts @@ -8,9 +8,9 @@ import type { PayloadAction } from '@reduxjs/toolkit'; import { LocalStorageKey } from '@/constants/localStorage'; import { - type LocaleData, SUPPORTED_BASE_TAGS_LOCALE_MAPPING, SupportedLocales, + type LocaleData, } from '@/constants/localization'; import { initializeLocalization } from '@/state/app'; diff --git a/src/state/notifications.ts b/src/state/notifications.ts index 3f2ba4c83..86b0b68e3 100644 --- a/src/state/notifications.ts +++ b/src/state/notifications.ts @@ -1,5 +1,5 @@ -import { createSlice } from '@reduxjs/toolkit'; import type { PayloadAction } from '@reduxjs/toolkit'; +import { createSlice } from '@reduxjs/toolkit'; import { AbacusNotification } from '@/constants/abacus'; diff --git a/src/state/perpetuals.ts b/src/state/perpetuals.ts index e838d9a50..0cbdbe6ca 100644 --- a/src/state/perpetuals.ts +++ b/src/state/perpetuals.ts @@ -2,11 +2,11 @@ import { createSlice, type PayloadAction } from '@reduxjs/toolkit'; import merge from 'lodash/merge'; import type { + MarketHistoricalFunding, MarketOrderbook, MarketTrade, Nullable, PerpetualMarket, - MarketHistoricalFunding, } from '@/constants/abacus'; import { Candle, RESOLUTION_MAP } from '@/constants/candles'; import { LocalStorageKey } from '@/constants/localStorage'; diff --git a/src/state/perpetualsCalculators.ts b/src/state/perpetualsCalculators.ts index ea263dbca..be6756725 100644 --- a/src/state/perpetualsCalculators.ts +++ b/src/state/perpetualsCalculators.ts @@ -4,8 +4,8 @@ import type { MarketHistoricalFunding } from '@/constants/abacus'; import { FundingDirection } from '@/constants/markets'; import { - getCurrentMarketNextFundingRate, getCurrentMarketHistoricalFundings, + getCurrentMarketNextFundingRate, } from '@/state/perpetualsSelectors'; export const calculateFundingRateHistory = createSelector( diff --git a/src/styles/themes.ts b/src/styles/themes.ts index 286449243..ba939ad7e 100644 --- a/src/styles/themes.ts +++ b/src/styles/themes.ts @@ -1,7 +1,7 @@ import { BrightnessFilterToken, ColorToken, OpacityToken } from '@/constants/styles/base'; import type { Theme, ThemeColorBase } from '@/constants/styles/colors'; -import { AppTheme, AppColorMode } from '@/state/configs'; +import { AppColorMode, AppTheme } from '@/state/configs'; import { generateFadedColorVariant } from '@/lib/styles'; diff --git a/src/views/AccountInfo/AccountInfoConnectedState.tsx b/src/views/AccountInfo/AccountInfoConnectedState.tsx index 7f43ea54f..d672c6c44 100644 --- a/src/views/AccountInfo/AccountInfoConnectedState.tsx +++ b/src/views/AccountInfo/AccountInfoConnectedState.tsx @@ -1,8 +1,8 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import type { Nullable, TradeState } from '@/constants/abacus'; -import { ButtonAction, ButtonShape, ButtonSize } from '@/constants/buttons'; +import { ButtonShape, ButtonSize } from '@/constants/buttons'; import { DialogTypes } from '@/constants/dialogs'; import { STRING_KEYS } from '@/constants/localization'; import { DydxChainAsset } from '@/constants/wallets'; diff --git a/src/views/MarketDetails.tsx b/src/views/MarketDetails.tsx index 533460252..9d982e686 100644 --- a/src/views/MarketDetails.tsx +++ b/src/views/MarketDetails.tsx @@ -2,7 +2,7 @@ import { shallowEqual, useSelector } from 'react-redux'; import styled, { type AnyStyledComponent } from 'styled-components'; import { ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons'; -import { STRING_KEYS, type StringKey } from '@/constants/localization'; +import { STRING_KEYS } from '@/constants/localization'; import { useBreakpoints, useStringGetter } from '@/hooks'; diff --git a/src/views/MarketFilter.tsx b/src/views/MarketFilter.tsx index 66ff54afe..fe5fef788 100644 --- a/src/views/MarketFilter.tsx +++ b/src/views/MarketFilter.tsx @@ -1,12 +1,12 @@ -import styled, { type AnyStyledComponent } from 'styled-components'; import { useNavigate } from 'react-router-dom'; +import styled, { type AnyStyledComponent } from 'styled-components'; import { ButtonSize } from '@/constants/buttons'; import { STRING_KEYS } from '@/constants/localization'; -import { MarketFilters, MARKET_FILTER_LABELS } from '@/constants/markets'; +import { MARKET_FILTER_LABELS, MarketFilters } from '@/constants/markets'; import { AppRoute, MarketsRoute } from '@/constants/routes'; -import { useBreakpoints, useStringGetter } from '@/hooks'; +import { useStringGetter } from '@/hooks'; import { usePotentialMarkets } from '@/hooks/usePotentialMarkets'; import { layoutMixins } from '@/styles/layoutMixins'; @@ -34,28 +34,28 @@ export const MarketFilter = ({ return ( - + + ({ + label: stringGetter({ key: MARKET_FILTER_LABELS[value] }), + value, + }))} + value={selectedFilter} + onValueChange={onChangeFilter} /> - - ({ - label: stringGetter({ key: MARKET_FILTER_LABELS[value] }), - value, - }))} - value={selectedFilter} - onValueChange={onChangeFilter} - /> - {hasPotentialMarketsData && !hideNewMarketButton && ( - - )} - + {hasPotentialMarketsData && !hideNewMarketButton && ( + + )} + ); }; diff --git a/src/views/MarketStatsDetails.tsx b/src/views/MarketStatsDetails.tsx index 44c08a648..2b74608cc 100644 --- a/src/views/MarketStatsDetails.tsx +++ b/src/views/MarketStatsDetails.tsx @@ -1,7 +1,7 @@ import { useEffect, useRef } from 'react'; import { shallowEqual, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { STRING_KEYS } from '@/constants/localization'; import { LARGE_TOKEN_DECIMALS, TINY_PERCENT_DECIMALS } from '@/constants/numbers'; diff --git a/src/views/MarketsDropdown.tsx b/src/views/MarketsDropdown.tsx index e9c5ab29f..9d3799407 100644 --- a/src/views/MarketsDropdown.tsx +++ b/src/views/MarketsDropdown.tsx @@ -2,7 +2,7 @@ import { memo, useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; -import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components'; +import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { ButtonSize } from '@/constants/buttons'; import { STRING_KEYS } from '@/constants/localization'; diff --git a/src/views/MidMarketPrice.tsx b/src/views/MidMarketPrice.tsx index 83d8991e1..09a4efad0 100644 --- a/src/views/MidMarketPrice.tsx +++ b/src/views/MidMarketPrice.tsx @@ -1,7 +1,7 @@ import { useEffect, useRef } from 'react'; import { shallowEqual, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { Nullable } from '@/constants/abacus'; diff --git a/src/views/NextFundingTimer.tsx b/src/views/NextFundingTimer.tsx index fcc11bace..fd6080725 100644 --- a/src/views/NextFundingTimer.tsx +++ b/src/views/NextFundingTimer.tsx @@ -1,10 +1,10 @@ -import { useState, useCallback } from 'react'; +import { useCallback, useState } from 'react'; import { useInterval } from '@/hooks'; import { Output, OutputType } from '@/components/Output'; -import { getTimeTillNextUnit, formatSeconds } from '@/lib/timeUtils'; +import { formatSeconds, getTimeTillNextUnit } from '@/lib/timeUtils'; export const NextFundingTimer = () => { const [secondsLeft, setSecondsLeft] = useState(); diff --git a/src/views/PositionInfo.tsx b/src/views/PositionInfo.tsx index 76bf9870f..2056af278 100644 --- a/src/views/PositionInfo.tsx +++ b/src/views/PositionInfo.tsx @@ -1,5 +1,5 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { type Nullable } from '@/constants/abacus'; import { DialogTypes, TradeBoxDialogTypes } from '@/constants/dialogs'; @@ -11,7 +11,7 @@ import { useBreakpoints, useStringGetter } from '@/hooks'; import { layoutMixins } from '@/styles/layoutMixins'; import { Button } from '@/components/Button'; -import { DetachedSection, DetachedScrollableSection } from '@/components/ContentSection'; +import { DetachedScrollableSection, DetachedSection } from '@/components/ContentSection'; import { Details } from '@/components/Details'; import { DiffOutput } from '@/components/DiffOutput'; import { Output, OutputType, ShowSign } from '@/components/Output'; diff --git a/src/views/TradeBox.tsx b/src/views/TradeBox.tsx index 9049facfe..724141104 100644 --- a/src/views/TradeBox.tsx +++ b/src/views/TradeBox.tsx @@ -12,7 +12,7 @@ import { Dialog, DialogPlacement } from '@/components/Dialog'; import { ClosePositionForm } from '@/views/forms/ClosePositionForm'; import { SelectMarginModeForm } from '@/views/forms/SelectMarginModeForm'; -import { openDialogInTradeBox, closeDialogInTradeBox } from '@/state/dialogs'; +import { closeDialogInTradeBox, openDialogInTradeBox } from '@/state/dialogs'; import { getActiveTradeBoxDialog } from '@/state/dialogsSelectors'; import abacusStateManager from '@/lib/abacus'; diff --git a/src/views/charts/DepthChart/index.tsx b/src/views/charts/DepthChart/index.tsx index 0f1236630..6229a5a77 100644 --- a/src/views/charts/DepthChart/index.tsx +++ b/src/views/charts/DepthChart/index.tsx @@ -5,18 +5,18 @@ import { curveStepAfter } from '@visx/curve'; import { LinearGradient } from '@visx/gradient'; import { Point } from '@visx/point'; import { - Axis, // AnimatedAxis, + AreaSeries, + Axis, + DataProvider, + EventEmitterProvider, // AnimatedAxis, Grid, // AnimatedGrid, - LineSeries, - AreaSeries, // AnimatedAreaSeries, + LineSeries, // AnimatedAreaSeries, buildChartTheme, darkTheme, - DataProvider, - EventEmitterProvider, type EventHandlerParams, } from '@visx/xychart'; -import { useSelector, shallowEqual } from 'react-redux'; -import styled, { AnyStyledComponent, css, keyframes } from 'styled-components'; +import { shallowEqual, useSelector } from 'react-redux'; +import styled, { AnyStyledComponent, keyframes } from 'styled-components'; import { DepthChartDatum, diff --git a/src/views/charts/FundingChart/index.tsx b/src/views/charts/FundingChart/index.tsx index 86d5fdc6f..c53cf3124 100644 --- a/src/views/charts/FundingChart/index.tsx +++ b/src/views/charts/FundingChart/index.tsx @@ -3,7 +3,7 @@ import { useState } from 'react'; import { curveMonotoneX, curveStepAfter } from '@visx/curve'; import type { TooltipContextType } from '@visx/xychart'; import { shallowEqual, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { ButtonSize } from '@/constants/buttons'; import { FundingRateResolution, type FundingChartDatum } from '@/constants/charts'; diff --git a/src/views/charts/PnlChart.tsx b/src/views/charts/PnlChart.tsx index 618d59b53..9bdd5728d 100644 --- a/src/views/charts/PnlChart.tsx +++ b/src/views/charts/PnlChart.tsx @@ -1,18 +1,15 @@ -import { type ReactNode, useCallback, useEffect, useMemo, useState } from 'react'; +import { useCallback, useEffect, useMemo, useState, type ReactNode } from 'react'; -import { - curveLinear, - /*, curveMonotoneX*/ -} from '@visx/curve'; +import { curveLinear } from '@visx/curve'; import type { TooltipContextType } from '@visx/xychart'; import debounce from 'lodash/debounce'; -import { useSelector, shallowEqual } from 'react-redux'; +import { shallowEqual, useSelector } from 'react-redux'; import styled, { AnyStyledComponent, css } from 'styled-components'; import { + HISTORICAL_PNL_PERIODS, HistoricalPnlPeriod, HistoricalPnlPeriods, - HISTORICAL_PNL_PERIODS, } from '@/constants/abacus'; import { timeUnits } from '@/constants/time'; diff --git a/src/views/charts/TvChart.tsx b/src/views/charts/TvChart.tsx index 75ce951ce..263dfb519 100644 --- a/src/views/charts/TvChart.tsx +++ b/src/views/charts/TvChart.tsx @@ -1,7 +1,7 @@ import { useRef, useState } from 'react'; import type { ResolutionString } from 'public/tradingview/charting_library'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import type { TvWidget } from '@/constants/tvchart'; diff --git a/src/views/dialogs/AdjustIsolatedMarginDialog.tsx b/src/views/dialogs/AdjustIsolatedMarginDialog.tsx index 1708a11a0..61f313cfa 100644 --- a/src/views/dialogs/AdjustIsolatedMarginDialog.tsx +++ b/src/views/dialogs/AdjustIsolatedMarginDialog.tsx @@ -6,13 +6,10 @@ import { STRING_KEYS } from '@/constants/localization'; import { useStringGetter } from '@/hooks'; -import { formMixins } from '@/styles/formMixins'; import { layoutMixins } from '@/styles/layoutMixins'; import { AssetIcon } from '@/components/AssetIcon'; import { Dialog } from '@/components/Dialog'; -import { GradientCard } from '@/components/GradientCard'; -import { ToggleGroup } from '@/components/ToggleGroup'; import { getOpenPositionFromId } from '@/state/accountSelectors'; diff --git a/src/views/dialogs/DetailsDialog/OrderDetailsDialog.tsx b/src/views/dialogs/DetailsDialog/OrderDetailsDialog.tsx index 11e927abf..451fbdc63 100644 --- a/src/views/dialogs/DetailsDialog/OrderDetailsDialog.tsx +++ b/src/views/dialogs/DetailsDialog/OrderDetailsDialog.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import styled, { AnyStyledComponent, css } from 'styled-components'; +import styled, { AnyStyledComponent } from 'styled-components'; import { AbacusOrderStatus, AbacusOrderTypes, type Nullable } from '@/constants/abacus'; import { ButtonAction } from '@/constants/buttons'; @@ -27,10 +27,10 @@ import { getSelectedLocale } from '@/state/localizationSelectors'; import { MustBigNumber } from '@/lib/numbers'; import { - isOrderStatusClearable, + getStatusIconInfo, isMarketOrderType, + isOrderStatusClearable, relativeTimeString, - getStatusIconInfo, } from '@/lib/orders'; type ElementProps = { diff --git a/src/views/dialogs/DisplaySettingsDialog.tsx b/src/views/dialogs/DisplaySettingsDialog.tsx index 5defc74b8..24b0958a9 100644 --- a/src/views/dialogs/DisplaySettingsDialog.tsx +++ b/src/views/dialogs/DisplaySettingsDialog.tsx @@ -1,4 +1,4 @@ -import { Root, Item, Indicator } from '@radix-ui/react-radio-group'; +import { Indicator, Item, Root } from '@radix-ui/react-radio-group'; import { useDispatch, useSelector } from 'react-redux'; import styled, { AnyStyledComponent, css } from 'styled-components'; @@ -14,14 +14,14 @@ import { Icon, IconName } from '@/components/Icon'; import { HorizontalSeparatorFiller } from '@/components/Separator'; import { + AppColorMode, AppTheme, - type AppThemeSetting, AppThemeSystemSetting, - AppColorMode, - setAppThemeSetting, setAppColorMode, + setAppThemeSetting, + type AppThemeSetting, } from '@/state/configs'; -import { getAppTheme, getAppThemeSetting, getAppColorMode } from '@/state/configsSelectors'; +import { getAppColorMode, getAppThemeSetting } from '@/state/configsSelectors'; type ElementProps = { setIsOpen: (open: boolean) => void; diff --git a/src/views/dialogs/OnboardingDialog.tsx b/src/views/dialogs/OnboardingDialog.tsx index 734b56028..b0121f727 100644 --- a/src/views/dialogs/OnboardingDialog.tsx +++ b/src/views/dialogs/OnboardingDialog.tsx @@ -1,4 +1,4 @@ -import { type ElementType, useState, useEffect } from 'react'; +import { useEffect, useState, type ElementType } from 'react'; import { useSelector } from 'react-redux'; import styled, { AnyStyledComponent, css } from 'styled-components'; diff --git a/src/views/dialogs/OnboardingDialog/GenerateKeys.tsx b/src/views/dialogs/OnboardingDialog/GenerateKeys.tsx index 0ac1b0048..67e8be289 100644 --- a/src/views/dialogs/OnboardingDialog/GenerateKeys.tsx +++ b/src/views/dialogs/OnboardingDialog/GenerateKeys.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { AES } from 'crypto-js'; import { useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { EvmDerivedAccountStatus } from '@/constants/account'; import { AlertType } from '@/constants/alerts'; diff --git a/src/views/dialogs/PreferencesDialog.tsx b/src/views/dialogs/PreferencesDialog.tsx index 4a716e171..6325c7fe1 100644 --- a/src/views/dialogs/PreferencesDialog.tsx +++ b/src/views/dialogs/PreferencesDialog.tsx @@ -6,8 +6,7 @@ import styled, { AnyStyledComponent } from 'styled-components'; import { STRING_KEYS } from '@/constants/localization'; import { NotificationType } from '@/constants/notifications'; -import { useStringGetter } from '@/hooks'; -import { useEnvFeatures } from '@/hooks'; +import { useEnvFeatures, useStringGetter } from '@/hooks'; import { useNotifications } from '@/hooks/useNotifications'; import { ComboboxDialogMenu } from '@/components/ComboboxDialogMenu'; diff --git a/src/views/forms/AccountManagementForms/DepositForm.tsx b/src/views/forms/AccountManagementForms/DepositForm.tsx index 0be54b289..a60b906fb 100644 --- a/src/views/forms/AccountManagementForms/DepositForm.tsx +++ b/src/views/forms/AccountManagementForms/DepositForm.tsx @@ -1,4 +1,4 @@ -import { type FormEvent, useCallback, useEffect, useMemo, useState } from 'react'; +import { useCallback, useEffect, useMemo, useState, type FormEvent } from 'react'; import { type NumberFormatValues } from 'react-number-format'; import { shallowEqual, useSelector } from 'react-redux'; @@ -16,8 +16,8 @@ import { isMainnet } from '@/constants/networks'; import { MAX_CCTP_TRANSFER_AMOUNT, MAX_PRICE_IMPACT, NumberSign } from '@/constants/numbers'; import { WalletType, type EvmAddress } from '@/constants/wallets'; -import { useAccounts, useDebounce, useStringGetter, useSelectedNetwork } from '@/hooks'; -import { useAccountBalance, CHAIN_DEFAULT_TOKEN_ADDRESS } from '@/hooks/useAccountBalance'; +import { useAccounts, useDebounce, useStringGetter } from '@/hooks'; +import { CHAIN_DEFAULT_TOKEN_ADDRESS, useAccountBalance } from '@/hooks/useAccountBalance'; import { useLocalNotifications } from '@/hooks/useLocalNotifications'; import { formMixins } from '@/styles/formMixins'; @@ -41,7 +41,7 @@ import abacusStateManager from '@/lib/abacus'; import { MustBigNumber } from '@/lib/numbers'; import { getNobleChainId, NATIVE_TOKEN_ADDRESS } from '@/lib/squid'; import { log } from '@/lib/telemetry'; -import { getWalletConnection, parseWalletError } from '@/lib/wallet'; +import { parseWalletError } from '@/lib/wallet'; import { NobleDeposit } from '../NobleDeposit'; import { DepositButtonAndReceipt } from './DepositForm/DepositButtonAndReceipt'; diff --git a/src/views/forms/AccountManagementForms/DepositForm/DepositButtonAndReceipt.tsx b/src/views/forms/AccountManagementForms/DepositForm/DepositButtonAndReceipt.tsx index 225dbd565..150b43512 100644 --- a/src/views/forms/AccountManagementForms/DepositForm/DepositButtonAndReceipt.tsx +++ b/src/views/forms/AccountManagementForms/DepositForm/DepositButtonAndReceipt.tsx @@ -1,4 +1,4 @@ -import { type Dispatch, type SetStateAction, useState, type ReactNode, useEffect } from 'react'; +import { useState, type Dispatch, type ReactNode, type SetStateAction } from 'react'; import type { RouteData } from '@0xsquid/sdk'; import { shallowEqual, useSelector } from 'react-redux'; diff --git a/src/views/forms/AccountManagementForms/SlippageEditor.tsx b/src/views/forms/AccountManagementForms/SlippageEditor.tsx index de3b1358c..1f7051718 100644 --- a/src/views/forms/AccountManagementForms/SlippageEditor.tsx +++ b/src/views/forms/AccountManagementForms/SlippageEditor.tsx @@ -1,4 +1,4 @@ -import { type Dispatch, type SetStateAction, useEffect, useState, useRef } from 'react'; +import { useEffect, useRef, useState, type Dispatch, type SetStateAction } from 'react'; import type { NumberFormatValues } from 'react-number-format'; import styled, { type AnyStyledComponent } from 'styled-components'; @@ -12,7 +12,7 @@ import { layoutMixins } from '@/styles/layoutMixins'; import { FormInput } from '@/components/FormInput'; import { Icon, IconName } from '@/components/Icon'; -import { Input, InputType } from '@/components/Input'; +import { InputType } from '@/components/Input'; import { Output, OutputType } from '@/components/Output'; import { ToggleGroup } from '@/components/ToggleGroup'; import { WithConfirmationPopover } from '@/components/WithConfirmationPopover'; diff --git a/src/views/forms/AccountManagementForms/TestnetDepositForm.tsx b/src/views/forms/AccountManagementForms/TestnetDepositForm.tsx index 80a314eca..becab59f0 100644 --- a/src/views/forms/AccountManagementForms/TestnetDepositForm.tsx +++ b/src/views/forms/AccountManagementForms/TestnetDepositForm.tsx @@ -1,4 +1,4 @@ -import { useState, type FormEvent, useEffect } from 'react'; +import { useEffect, useState, type FormEvent } from 'react'; import { shallowEqual, useSelector } from 'react-redux'; import styled, { type AnyStyledComponent } from 'styled-components'; diff --git a/src/views/forms/AccountManagementForms/TokenSelectMenu.tsx b/src/views/forms/AccountManagementForms/TokenSelectMenu.tsx index be81145cd..f2dbe4945 100644 --- a/src/views/forms/AccountManagementForms/TokenSelectMenu.tsx +++ b/src/views/forms/AccountManagementForms/TokenSelectMenu.tsx @@ -9,7 +9,7 @@ import { useEnvFeatures, useStringGetter } from '@/hooks'; import { layoutMixins } from '@/styles/layoutMixins'; import { DiffArrow } from '@/components/DiffArrow'; -import { Icon, IconName } from '@/components/Icon'; +import { Icon } from '@/components/Icon'; import { SearchSelectMenu } from '@/components/SearchSelectMenu'; import { Tag } from '@/components/Tag'; diff --git a/src/views/forms/AccountManagementForms/WithdrawForm.tsx b/src/views/forms/AccountManagementForms/WithdrawForm.tsx index 1a3148675..31a985486 100644 --- a/src/views/forms/AccountManagementForms/WithdrawForm.tsx +++ b/src/views/forms/AccountManagementForms/WithdrawForm.tsx @@ -1,5 +1,5 @@ -import { useCallback, useEffect, useMemo, useState } from 'react'; import type { ChangeEvent, FormEvent } from 'react'; +import { useCallback, useEffect, useMemo, useState } from 'react'; import type { NumberFormatValues } from 'react-number-format'; import { shallowEqual, useSelector } from 'react-redux'; diff --git a/src/views/forms/ClosePositionForm.tsx b/src/views/forms/ClosePositionForm.tsx index ca6f54d44..ae00f91ed 100644 --- a/src/views/forms/ClosePositionForm.tsx +++ b/src/views/forms/ClosePositionForm.tsx @@ -1,14 +1,14 @@ -import { type FormEvent, useCallback, useEffect, useState } from 'react'; +import { useCallback, useEffect, useState, type FormEvent } from 'react'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import styled, { type AnyStyledComponent } from 'styled-components'; import { ClosePositionInputField, + ErrorType, ValidationError, type HumanReadablePlaceOrderPayload, type Nullable, - ErrorType, } from '@/constants/abacus'; import { AlertType } from '@/constants/alerts'; import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons'; @@ -35,8 +35,11 @@ import { Orderbook, orderbookMixins, type OrderbookScrollBehavior } from '@/view import { getCurrentMarketPositionData } from '@/state/accountSelectors'; import { getCurrentMarketAssetData } from '@/state/assetsSelectors'; import { closeDialog } from '@/state/dialogs'; -import { getClosePositionInputErrors, getInputClosePositionData } from '@/state/inputsSelectors'; -import { getCurrentInput } from '@/state/inputsSelectors'; +import { + getClosePositionInputErrors, + getCurrentInput, + getInputClosePositionData, +} from '@/state/inputsSelectors'; import { getCurrentMarketConfig, getCurrentMarketId } from '@/state/perpetualsSelectors'; import abacusStateManager from '@/lib/abacus'; diff --git a/src/views/forms/NewMarketForm/NewMarketSelectionStep.tsx b/src/views/forms/NewMarketForm/NewMarketSelectionStep.tsx index 5c867c391..5b2ef1466 100644 --- a/src/views/forms/NewMarketForm/NewMarketSelectionStep.tsx +++ b/src/views/forms/NewMarketForm/NewMarketSelectionStep.tsx @@ -1,6 +1,6 @@ import { FormEvent, useEffect, useMemo, useState } from 'react'; -import { Root, Item } from '@radix-ui/react-radio-group'; +import { Item, Root } from '@radix-ui/react-radio-group'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import styled, { AnyStyledComponent } from 'styled-components'; diff --git a/src/views/forms/NobleDeposit.tsx b/src/views/forms/NobleDeposit.tsx index e69b08373..2e389301a 100644 --- a/src/views/forms/NobleDeposit.tsx +++ b/src/views/forms/NobleDeposit.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { STRING_KEYS } from '@/constants/localization'; import { OpacityToken } from '@/constants/styles/base'; diff --git a/src/views/forms/TradeForm.tsx b/src/views/forms/TradeForm.tsx index f006f69cb..797a15e1a 100644 --- a/src/views/forms/TradeForm.tsx +++ b/src/views/forms/TradeForm.tsx @@ -1,4 +1,4 @@ -import { type FormEvent, useState, Ref, useCallback } from 'react'; +import { Ref, useCallback, useState, type FormEvent } from 'react'; import { OrderSide } from '@dydxprotocol/v4-client-js'; import type { NumberFormatValues, SourceInfo } from 'react-number-format'; @@ -7,11 +7,11 @@ import styled, { AnyStyledComponent, css } from 'styled-components'; import { ErrorType, - type HumanReadablePlaceOrderPayload, - type Nullable, TradeInputErrorAction, - ValidationError, TradeInputField, + ValidationError, + type HumanReadablePlaceOrderPayload, + type Nullable, } from '@/constants/abacus'; import { AlertType } from '@/constants/alerts'; import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons'; @@ -20,9 +20,9 @@ import { STRING_KEYS, StringKey } from '@/constants/localization'; import { USD_DECIMALS } from '@/constants/numbers'; import { InputErrorData, - TradeBoxKeys, MobilePlaceOrderSteps, ORDER_TYPE_STRINGS, + TradeBoxKeys, TradeTypes, } from '@/constants/trade'; diff --git a/src/views/forms/TradeForm/AdvancedTradeOptions.tsx b/src/views/forms/TradeForm/AdvancedTradeOptions.tsx index f11a98adb..803bf1386 100644 --- a/src/views/forms/TradeForm/AdvancedTradeOptions.tsx +++ b/src/views/forms/TradeForm/AdvancedTradeOptions.tsx @@ -17,7 +17,7 @@ import { Checkbox } from '@/components/Checkbox'; import { Collapsible } from '@/components/Collapsible'; import { FormInput } from '@/components/FormInput'; import { InputType } from '@/components/Input'; -import { SelectMenu, SelectItem } from '@/components/SelectMenu'; +import { SelectItem, SelectMenu } from '@/components/SelectMenu'; import { WithTooltip } from '@/components/WithTooltip'; import { getInputTradeData, getInputTradeOptions } from '@/state/inputsSelectors'; diff --git a/src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx b/src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx index beee97290..4149c3264 100644 --- a/src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx +++ b/src/views/forms/TradeForm/PlaceOrderButtonAndReceipt.tsx @@ -1,5 +1,5 @@ import { useDispatch, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { type AnyStyledComponent } from 'styled-components'; import type { TradeInputSummary } from '@/constants/abacus'; import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons'; diff --git a/src/views/forms/TradeForm/TradeSideToggle.tsx b/src/views/forms/TradeForm/TradeSideToggle.tsx index 72bbc8064..887e9886a 100644 --- a/src/views/forms/TradeForm/TradeSideToggle.tsx +++ b/src/views/forms/TradeForm/TradeSideToggle.tsx @@ -4,8 +4,7 @@ import { OrderSide } from '@dydxprotocol/v4-client-js'; import { shallowEqual, useSelector } from 'react-redux'; import styled, { css } from 'styled-components'; -import { AbacusOrderSide } from '@/constants/abacus'; -import { TradeInputField } from '@/constants/abacus'; +import { AbacusOrderSide, TradeInputField } from '@/constants/abacus'; import { ButtonShape, ButtonSize } from '@/constants/buttons'; import { STRING_KEYS } from '@/constants/localization'; diff --git a/src/views/forms/TradeForm/TradeSizeInputs.tsx b/src/views/forms/TradeForm/TradeSizeInputs.tsx index 83c30323e..3227e2775 100644 --- a/src/views/forms/TradeForm/TradeSizeInputs.tsx +++ b/src/views/forms/TradeForm/TradeSizeInputs.tsx @@ -24,8 +24,8 @@ import { WithTooltip } from '@/components/WithTooltip'; import { getCurrentMarketAssetData } from '@/state/assetsSelectors'; import { setTradeFormInputs } from '@/state/inputs'; import { - getInputTradeSizeData, getInputTradeOptions, + getInputTradeSizeData, getTradeFormInputs, } from '@/state/inputsSelectors'; import { getCurrentMarketConfig } from '@/state/perpetualsSelectors'; diff --git a/src/views/forms/TransferForm.tsx b/src/views/forms/TransferForm.tsx index 1302996d1..fcbc8c085 100644 --- a/src/views/forms/TransferForm.tsx +++ b/src/views/forms/TransferForm.tsx @@ -1,4 +1,4 @@ -import { type FormEvent, useEffect, useMemo, useState } from 'react'; +import { useEffect, useMemo, useState, type FormEvent } from 'react'; import { validation } from '@dydxprotocol/v4-client-js'; import { type NumberFormatValues } from 'react-number-format'; diff --git a/src/views/forms/TransferForm/TransferButtonAndReceipt.tsx b/src/views/forms/TransferForm/TransferButtonAndReceipt.tsx index ecf524d0c..c36799943 100644 --- a/src/views/forms/TransferForm/TransferButtonAndReceipt.tsx +++ b/src/views/forms/TransferForm/TransferButtonAndReceipt.tsx @@ -6,7 +6,7 @@ import { STRING_KEYS } from '@/constants/localization'; import { NumberSign } from '@/constants/numbers'; import { DydxChainAsset } from '@/constants/wallets'; -import { useAccountBalance, useTokenConfigs, useStringGetter } from '@/hooks'; +import { useAccountBalance, useStringGetter, useTokenConfigs } from '@/hooks'; import { Button } from '@/components/Button'; import { DiffOutput } from '@/components/DiffOutput'; diff --git a/src/views/forms/TriggersForm/TriggerOrderInputs.tsx b/src/views/forms/TriggersForm/TriggerOrderInputs.tsx index 3856e1769..27b081c96 100644 --- a/src/views/forms/TriggersForm/TriggerOrderInputs.tsx +++ b/src/views/forms/TriggersForm/TriggerOrderInputs.tsx @@ -3,11 +3,11 @@ import { useState } from 'react'; import styled, { AnyStyledComponent } from 'styled-components'; import { + Nullable, TriggerOrdersInputPrice, type TriggerOrdersInputFields, - Nullable, } from '@/constants/abacus'; -import { ButtonAction, ButtonType, ButtonSize } from '@/constants/buttons'; +import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons'; import { STRING_KEYS } from '@/constants/localization'; import { NumberSign, PERCENT_DECIMALS, USD_DECIMALS } from '@/constants/numbers'; diff --git a/src/views/forms/TriggersForm/TriggerOrdersInputs.tsx b/src/views/forms/TriggersForm/TriggerOrdersInputs.tsx index 749218135..fa8012c5c 100644 --- a/src/views/forms/TriggersForm/TriggerOrdersInputs.tsx +++ b/src/views/forms/TriggersForm/TriggerOrdersInputs.tsx @@ -2,7 +2,6 @@ import { shallowEqual, useSelector } from 'react-redux'; import { TriggerOrdersInputField } from '@/constants/abacus'; import { STRING_KEYS } from '@/constants/localization'; -import { NumberSign } from '@/constants/numbers'; import { getTriggerOrdersInputs } from '@/state/inputsSelectors'; diff --git a/src/views/forms/TriggersForm/TriggersForm.tsx b/src/views/forms/TriggersForm/TriggersForm.tsx index 48c2390a1..dbace59ac 100644 --- a/src/views/forms/TriggersForm/TriggersForm.tsx +++ b/src/views/forms/TriggersForm/TriggersForm.tsx @@ -4,16 +4,16 @@ import { useDispatch, useSelector } from 'react-redux'; import styled, { type AnyStyledComponent } from 'styled-components'; import { - ValidationError, - type SubaccountOrder, + AbacusOrderType, ErrorType, - HumanReadableTriggerOrdersPayload, - Nullable, HumanReadableCancelOrderPayload, HumanReadablePlaceOrderPayload, - TRADE_TYPES, + HumanReadableTriggerOrdersPayload, KotlinIrEnumValues, - AbacusOrderType, + Nullable, + TRADE_TYPES, + ValidationError, + type SubaccountOrder, } from '@/constants/abacus'; import { ButtonAction, ButtonType } from '@/constants/buttons'; import { STRING_KEYS } from '@/constants/localization'; diff --git a/src/views/menus/AccountMenu.tsx b/src/views/menus/AccountMenu.tsx index fd42a80c3..3179ad256 100644 --- a/src/views/menus/AccountMenu.tsx +++ b/src/views/menus/AccountMenu.tsx @@ -10,17 +10,17 @@ import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/b import { DialogTypes } from '@/constants/dialogs'; import { STRING_KEYS, - type StringGetterFunction, TOOLTIP_STRING_KEYS, + type StringGetterFunction, } from '@/constants/localization'; import { DydxChainAsset, WalletType, wallets } from '@/constants/wallets'; import { + useAccountBalance, useAccounts, useBreakpoints, - useTokenConfigs, useStringGetter, - useAccountBalance, + useTokenConfigs, useURLConfigs, } from '@/hooks'; diff --git a/src/views/menus/LanguageSelector.tsx b/src/views/menus/LanguageSelector.tsx index 1774297b1..5e45583fd 100644 --- a/src/views/menus/LanguageSelector.tsx +++ b/src/views/menus/LanguageSelector.tsx @@ -1,7 +1,7 @@ import { useDispatch, useSelector } from 'react-redux'; import styled, { type AnyStyledComponent } from 'styled-components'; -import { SupportedLocales, SUPPORTED_LOCALE_STRING_LABELS } from '@/constants/localization'; +import { SUPPORTED_LOCALE_STRING_LABELS, SupportedLocales } from '@/constants/localization'; import { headerMixins } from '@/styles/headerMixins'; diff --git a/src/views/menus/NotificationsMenu.tsx b/src/views/menus/NotificationsMenu.tsx index d8e66ed4a..e68f951ca 100644 --- a/src/views/menus/NotificationsMenu.tsx +++ b/src/views/menus/NotificationsMenu.tsx @@ -5,7 +5,7 @@ import styled from 'styled-components'; import { ButtonAction, ButtonSize } from '@/constants/buttons'; import { STRING_KEYS } from '@/constants/localization'; -import { type Notification, NotificationStatus } from '@/constants/notifications'; +import { NotificationStatus, type Notification } from '@/constants/notifications'; import { useBreakpoints, useStringGetter } from '@/hooks'; import { useNotifications } from '@/hooks/useNotifications'; diff --git a/src/views/menus/useGlobalCommands.tsx b/src/views/menus/useGlobalCommands.tsx index bfd9de008..c070597ae 100644 --- a/src/views/menus/useGlobalCommands.tsx +++ b/src/views/menus/useGlobalCommands.tsx @@ -1,4 +1,4 @@ -import { useDispatch, useSelector, shallowEqual } from 'react-redux'; +import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; import { Asset, PerpetualMarket } from '@/constants/abacus'; @@ -10,11 +10,11 @@ import { AssetIcon } from '@/components/AssetIcon'; import { getAssets } from '@/state/assetsSelectors'; import { + AppColorMode, AppTheme, AppThemeSystemSetting, - AppColorMode, - setAppThemeSetting, setAppColorMode, + setAppThemeSetting, } from '@/state/configs'; import { setSelectedTradeLayout } from '@/state/layout'; import { getPerpetualMarkets } from '@/state/perpetualsSelectors'; diff --git a/src/views/menus/useNetworks.tsx b/src/views/menus/useNetworks.tsx index a15a2497d..d52483921 100644 --- a/src/views/menus/useNetworks.tsx +++ b/src/views/menus/useNetworks.tsx @@ -1,8 +1,8 @@ import { type MenuItem } from '@/constants/menus'; import { AVAILABLE_ENVIRONMENTS, - type DydxNetwork, ENVIRONMENT_CONFIG_MAP, + type DydxNetwork, } from '@/constants/networks'; export const useNetworks = (): MenuItem[] => diff --git a/src/views/notifications/IncentiveSeasonDistributionNotification.tsx b/src/views/notifications/IncentiveSeasonDistributionNotification.tsx index be8826ba5..9ed30e244 100644 --- a/src/views/notifications/IncentiveSeasonDistributionNotification.tsx +++ b/src/views/notifications/IncentiveSeasonDistributionNotification.tsx @@ -1,8 +1,5 @@ import styled, { type AnyStyledComponent } from 'styled-components'; -import { ButtonSize } from '@/constants/buttons'; - -import { Button } from '@/components/Button'; import { Details } from '@/components/Details'; import { Icon, IconName } from '@/components/Icon'; import { Notification, NotificationProps } from '@/components/Notification'; diff --git a/src/views/notifications/TransferStatusNotification/index.tsx b/src/views/notifications/TransferStatusNotification/index.tsx index 5f53b6d5e..c81acf8d6 100644 --- a/src/views/notifications/TransferStatusNotification/index.tsx +++ b/src/views/notifications/TransferStatusNotification/index.tsx @@ -1,4 +1,4 @@ -import { useCallback, useState, useMemo, MouseEvent } from 'react'; +import { MouseEvent, useCallback, useState } from 'react'; import styled, { css, type AnyStyledComponent } from 'styled-components'; diff --git a/src/views/tables/FillsTable.tsx b/src/views/tables/FillsTable.tsx index 52360b581..22c15a6c5 100644 --- a/src/views/tables/FillsTable.tsx +++ b/src/views/tables/FillsTable.tsx @@ -4,7 +4,7 @@ import { Nullable } from '@dydxprotocol/v4-abacus'; import { OrderSide } from '@dydxprotocol/v4-client-js'; import type { ColumnSize } from '@react-types/table'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { type Asset, type SubaccountFill } from '@/constants/abacus'; import { DialogTypes } from '@/constants/dialogs'; diff --git a/src/views/tables/LiveTrades.tsx b/src/views/tables/LiveTrades.tsx index 88d525385..4be29d69a 100644 --- a/src/views/tables/LiveTrades.tsx +++ b/src/views/tables/LiveTrades.tsx @@ -2,7 +2,7 @@ import { useMemo } from 'react'; import { OrderSide } from '@dydxprotocol/v4-client-js'; import { shallowEqual, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components'; +import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { MarketTrade } from '@/constants/abacus'; import { STRING_KEYS } from '@/constants/localization'; diff --git a/src/views/tables/MarketsTable.tsx b/src/views/tables/MarketsTable.tsx index bfdf6d91f..b0824adb8 100644 --- a/src/views/tables/MarketsTable.tsx +++ b/src/views/tables/MarketsTable.tsx @@ -19,7 +19,7 @@ import { tradeViewMixins } from '@/styles/tradeViewMixins'; import { Button } from '@/components/Button'; import { Output, OutputType } from '@/components/Output'; -import { type ColumnDef, MarketTableCell, Table, TableCell } from '@/components/Table'; +import { MarketTableCell, Table, TableCell, type ColumnDef } from '@/components/Table'; import { Toolbar } from '@/components/Toolbar'; import { TriangleIndicator } from '@/components/TriangleIndicator'; import { MarketFilter } from '@/views/MarketFilter'; diff --git a/src/views/tables/Orderbook.tsx b/src/views/tables/Orderbook.tsx index 2d50718ce..57f03f787 100644 --- a/src/views/tables/Orderbook.tsx +++ b/src/views/tables/Orderbook.tsx @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react'; import { OrderSide } from '@dydxprotocol/v4-client-js'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css, keyframes } from 'styled-components'; +import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components'; import { type OrderbookLine } from '@/constants/abacus'; import { STRING_KEYS } from '@/constants/localization'; @@ -16,7 +16,7 @@ import { layoutMixins } from '@/styles/layoutMixins'; import { Details } from '@/components/Details'; import { LoadingSpace } from '@/components/Loading/LoadingSpinner'; import { Output, OutputType } from '@/components/Output'; -import { type CustomRowConfig, TableRow } from '@/components/Table'; +import { TableRow, type CustomRowConfig } from '@/components/Table'; import { WithTooltip } from '@/components/WithTooltip'; import { calculateCanViewAccount } from '@/state/accountCalculators'; diff --git a/src/views/tables/OrdersTable.tsx b/src/views/tables/OrdersTable.tsx index 1f90bd285..5a4b1ee40 100644 --- a/src/views/tables/OrdersTable.tsx +++ b/src/views/tables/OrdersTable.tsx @@ -23,10 +23,10 @@ import { Icon, IconName } from '@/components/Icon'; import { OrderSideTag } from '@/components/OrderSideTag'; import { Output, OutputType } from '@/components/Output'; import { + MarketTableCell, Table, TableCell, TableColumnHeader, - MarketTableCell, type ColumnDef, } from '@/components/Table'; import { TagSize } from '@/components/Tag'; diff --git a/src/views/tables/OrdersTable/OrderActionsCell.tsx b/src/views/tables/OrdersTable/OrderActionsCell.tsx index f47be31a9..2ef80cec1 100644 --- a/src/views/tables/OrdersTable/OrderActionsCell.tsx +++ b/src/views/tables/OrdersTable/OrderActionsCell.tsx @@ -36,19 +36,19 @@ export const OrderActionsCell = ({ orderId, status, isDisabled }: ElementProps) return ( dispatch(clearOrder(orderId)) } - : { - onClick: onCancel, - state: { - isLoading: isCanceling || status === AbacusOrderStatus.canceling, - isDisabled: isCanceling || isDisabled || status === AbacusOrderStatus.canceling, - }, - })} - /> + key="cancelorder" + iconName={IconName.Close} + shape={ButtonShape.Square} + {...(isOrderStatusClearable(status) + ? { onClick: () => dispatch(clearOrder(orderId)) } + : { + onClick: onCancel, + state: { + isLoading: isCanceling || status === AbacusOrderStatus.canceling, + isDisabled: isCanceling || isDisabled || status === AbacusOrderStatus.canceling, + }, + })} + /> ); }; diff --git a/src/views/tables/PositionsTable.tsx b/src/views/tables/PositionsTable.tsx index 25f441dbd..a317cdcb4 100644 --- a/src/views/tables/PositionsTable.tsx +++ b/src/views/tables/PositionsTable.tsx @@ -1,18 +1,18 @@ import { useMemo } from 'react'; import type { ColumnSize } from '@react-types/table'; -import { useSelector, shallowEqual } from 'react-redux'; +import { shallowEqual, useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; import styled, { type AnyStyledComponent } from 'styled-components'; import { + POSITION_SIDES, type Asset, type Nullable, type SubaccountOrder, type SubaccountPosition, - POSITION_SIDES, } from '@/constants/abacus'; -import { StringGetterFunction, STRING_KEYS } from '@/constants/localization'; +import { STRING_KEYS, StringGetterFunction } from '@/constants/localization'; import { NumberSign, TOKEN_DECIMALS, USD_DECIMALS } from '@/constants/numbers'; import { AppRoute } from '@/constants/routes'; import { PositionSide } from '@/constants/trade'; @@ -27,7 +27,7 @@ import { AssetIcon } from '@/components/AssetIcon'; import { Icon, IconName } from '@/components/Icon'; import { Output, OutputType, ShowSign } from '@/components/Output'; import { PositionSideTag } from '@/components/PositionSideTag'; -import { type ColumnDef, Table, TableColumnHeader } from '@/components/Table'; +import { Table, TableColumnHeader, type ColumnDef } from '@/components/Table'; import { MarketTableCell } from '@/components/Table/MarketTableCell'; import { TableCell } from '@/components/Table/TableCell'; import { TagSize } from '@/components/Tag'; diff --git a/src/views/tables/PositionsTable/PositionsTriggersCell.tsx b/src/views/tables/PositionsTable/PositionsTriggersCell.tsx index acbd73e18..6182e5c81 100644 --- a/src/views/tables/PositionsTable/PositionsTriggersCell.tsx +++ b/src/views/tables/PositionsTable/PositionsTriggersCell.tsx @@ -1,5 +1,5 @@ import { useDispatch } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { css, type AnyStyledComponent } from 'styled-components'; import { AbacusPositionSide, diff --git a/src/views/tables/TradingRewardHistoryTable.tsx b/src/views/tables/TradingRewardHistoryTable.tsx index fd64b6f6b..2d9e1bfa2 100644 --- a/src/views/tables/TradingRewardHistoryTable.tsx +++ b/src/views/tables/TradingRewardHistoryTable.tsx @@ -3,7 +3,7 @@ import { useMemo } from 'react'; import { shallowEqual, useSelector } from 'react-redux'; import styled, { type AnyStyledComponent } from 'styled-components'; -import { HistoricalTradingRewardsPeriods, HistoricalTradingReward } from '@/constants/abacus'; +import { HistoricalTradingReward, HistoricalTradingRewardsPeriods } from '@/constants/abacus'; import { STRING_KEYS, type StringGetterFunction } from '@/constants/localization'; import { useStringGetter, useTokenConfigs } from '@/hooks'; diff --git a/src/views/tables/TransferHistoryTable.tsx b/src/views/tables/TransferHistoryTable.tsx index 59a6a3552..379b4d1d0 100644 --- a/src/views/tables/TransferHistoryTable.tsx +++ b/src/views/tables/TransferHistoryTable.tsx @@ -1,6 +1,6 @@ import type { ColumnSize } from '@react-types/table'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; -import styled, { type AnyStyledComponent, css } from 'styled-components'; +import styled, { type AnyStyledComponent } from 'styled-components'; import { type SubaccountTransfer } from '@/constants/abacus'; import { ButtonAction } from '@/constants/buttons';