Skip to content

Commit 36f30f6

Browse files
authored
fix: token list management bug (#6544)
* refactor: improve token list management and enhance auto-import functionality * refactor: replace legacy loading component with new Loader and enhance token selection logic * refactor: update loading components and enhance token management logic
1 parent ce4d7e3 commit 36f30f6

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

apps/cowswap-frontend/src/modules/application/containers/App/RoutesApp.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@ function LazyRoute({ route, element, key }: LazyRouteProps): ReactNode {
5959
}
6060

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

10098
{/*Swap*/}
10199
<Route path={RoutesEnum.SWAP} element={<SwapPage />} />
100+
<Route path={RoutesEnum.LIMIT_ORDER} element={<LimitOrderPage />} />
101+
<Route path={RoutesEnum.ADVANCED_ORDERS} element={<AdvancedOrdersPage />} />
102102
<Route path={RoutesEnum.HOOKS} element={<HooksPage />} />
103103
<Route path={RoutesEnum.SEND} element={<RedirectPathToSwapOnly />} />
104104

apps/cowswap-frontend/src/pages/AdvancedOrders/index.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { useAtomValue } from 'jotai'
2-
import { ReactNode } from 'react'
2+
import { ReactNode, Suspense } from 'react'
33

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

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

8+
import { Loading } from 'legacy/components/FlashingLoading'
89
import { OrderStatus } from 'legacy/state/orders/actions'
910

1011
import {
@@ -80,12 +81,14 @@ export default function AdvancedOrdersPage(): ReactNode {
8081

8182
{!hideOrdersTable && (
8283
<styledEl.SecondaryWrapper>
83-
<OrdersTableWidget
84-
isTwapTable
85-
displayOrdersOnlyForSafeApp
86-
orderType={TabOrderTypes.ADVANCED}
87-
orders={allEmulatedOrders}
88-
/>
84+
<Suspense fallback={<Loading />}>
85+
<OrdersTableWidget
86+
isTwapTable
87+
displayOrdersOnlyForSafeApp
88+
orderType={TabOrderTypes.ADVANCED}
89+
orders={allEmulatedOrders}
90+
/>
91+
</Suspense>
8992
</styledEl.SecondaryWrapper>
9093
)}
9194
</styledEl.PageWrapper>

apps/cowswap-frontend/src/pages/LimitOrders/RegularLimitOrders.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { useAtomValue } from 'jotai'
2-
import { ReactNode, useMemo } from 'react'
2+
import { ReactNode, Suspense, useMemo } from 'react'
33

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

7+
import { Loading } from 'legacy/components/FlashingLoading'
78
import { OrderStatus } from 'legacy/state/orders/actions'
89
import { useOrders } from 'legacy/state/orders/hooks'
910

@@ -39,7 +40,9 @@ export function RegularLimitOrders(): ReactNode {
3940
{!hideOrdersTable && (
4041
<styledEl.SecondaryWrapper>
4142
{pendingLimitOrders.length > 0 && <LimitOrdersPermitUpdater orders={pendingLimitOrders} />}
42-
<OrdersTableWidget orderType={TabOrderTypes.LIMIT} orders={allLimitOrders} />
43+
<Suspense fallback={<Loading />}>
44+
<OrdersTableWidget orderType={TabOrderTypes.LIMIT} orders={allLimitOrders} />
45+
</Suspense>
4346
</styledEl.SecondaryWrapper>
4447
)}
4548
</styledEl.PageWrapper>

0 commit comments

Comments
 (0)