Skip to content

fix: token list management bug #6544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fairlighteth merged 9 commits into from
Dec 3, 2025
Merged

fix: token list management bug #6544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc7e924
refactor: improve token list management and enhance auto-import funct…
fairlighteth Nov 21, 2025
45e96cf
refactor: replace legacy loading component with new Loader and enhanc…
fairlighteth Nov 24, 2025
e30121d
refactor: update loading components and enhance token management logic
fairlighteth Nov 24, 2025
1dd9e89
Merge branch 'develop' into fix/token-list-toggle
fairlighteth Nov 24, 2025
a36ee31
Merge branch 'develop' into fix/token-list-toggle
fairlighteth Nov 25, 2025
43b515f
Merge branch 'develop' into fix/token-list-toggle
fairlighteth Nov 26, 2025
f380bd4
Merge branch 'develop' into fix/token-list-toggle
fairlighteth Nov 26, 2025
b2f2732
Merge branch 'develop' into fix/token-list-toggle
fairlighteth Nov 28, 2025
4c05b34
Merge branch 'develop' into fix/token-list-toggle
fairlighteth Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/cowswap-frontend/src/modules/application/containers/App/RoutesApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,8 @@ function LazyRoute({ route, element, key }: LazyRouteProps): ReactNode {
}

const lazyRoutes: LazyRouteProps[] = [
{ route: RoutesEnum.LIMIT_ORDER, element: <LimitOrderPage /> },
{ route: RoutesEnum.YIELD, element: <YieldPage /> },
{ route: RoutesEnum.LONG_LIMIT_ORDER, element: <RedirectToPath path={'/limit'} /> },
{ route: RoutesEnum.ADVANCED_ORDERS, element: <AdvancedOrdersPage /> },
{ route: RoutesEnum.LONG_ADVANCED_ORDERS, element: <RedirectToPath path={'/advanced'} /> },
{ route: RoutesEnum.ABOUT, element: <ExternalRedirect url={COWDAO_COWSWAP_ABOUT_LINK} /> },
{ route: RoutesEnum.FAQ, element: <ExternalRedirect url={COWDAO_KNOWLEDGE_BASE_LINK} /> },
Expand Down Expand Up @@ -99,6 +97,8 @@ export function RoutesApp(): ReactNode {

{/*Swap*/}
<Route path={RoutesEnum.SWAP} element={<SwapPage />} />
<Route path={RoutesEnum.LIMIT_ORDER} element={<LimitOrderPage />} />
<Route path={RoutesEnum.ADVANCED_ORDERS} element={<AdvancedOrdersPage />} />
<Route path={RoutesEnum.HOOKS} element={<HooksPage />} />
<Route path={RoutesEnum.SEND} element={<RedirectPathToSwapOnly />} />

Expand Down
17 changes: 10 additions & 7 deletions apps/cowswap-frontend/src/pages/AdvancedOrders/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { useAtomValue } from 'jotai'
import { ReactNode } from 'react'
import { ReactNode, Suspense } from 'react'

import { PAGE_TITLES } from '@cowprotocol/common-const'

import { useLingui } from '@lingui/react/macro'

import { Loading } from 'legacy/components/FlashingLoading'
import { OrderStatus } from 'legacy/state/orders/actions'

import {
Expand Down Expand Up @@ -80,12 +81,14 @@ export default function AdvancedOrdersPage(): ReactNode {

{!hideOrdersTable && (
<styledEl.SecondaryWrapper>
<OrdersTableWidget
isTwapTable
displayOrdersOnlyForSafeApp
orderType={TabOrderTypes.ADVANCED}
orders={allEmulatedOrders}
/>
<Suspense fallback={<Loading />}>
<OrdersTableWidget
isTwapTable
displayOrdersOnlyForSafeApp
orderType={TabOrderTypes.ADVANCED}
orders={allEmulatedOrders}
/>
</Suspense>
</styledEl.SecondaryWrapper>
)}
</styledEl.PageWrapper>
Expand Down
7 changes: 5 additions & 2 deletions apps/cowswap-frontend/src/pages/LimitOrders/RegularLimitOrders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { useAtomValue } from 'jotai'
import { ReactNode, useMemo } from 'react'
import { ReactNode, Suspense, useMemo } from 'react'

import { UiOrderType } from '@cowprotocol/types'
import { useWalletInfo } from '@cowprotocol/wallet'

import { Loading } from 'legacy/components/FlashingLoading'
import { OrderStatus } from 'legacy/state/orders/actions'
import { useOrders } from 'legacy/state/orders/hooks'

Expand Down Expand Up @@ -39,7 +40,9 @@ export function RegularLimitOrders(): ReactNode {
{!hideOrdersTable && (
<styledEl.SecondaryWrapper>
{pendingLimitOrders.length > 0 && <LimitOrdersPermitUpdater orders={pendingLimitOrders} />}
<OrdersTableWidget orderType={TabOrderTypes.LIMIT} orders={allLimitOrders} />
<Suspense fallback={<Loading />}>
<OrdersTableWidget orderType={TabOrderTypes.LIMIT} orders={allLimitOrders} />
</Suspense>
</styledEl.SecondaryWrapper>
)}
</styledEl.PageWrapper>
Expand Down