Merge remote-tracking branch 'origin/main' into issue-#1648

bancorprotocol · Feb 6, 2025 · 556538d · 556538d
2 parents d3ed148 + 8d231e3
commit 556538d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/...screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png b/...screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png
diff --git a/src/components/core/menu/mainMenu/MainMenuCart.tsx b/src/components/core/menu/mainMenu/MainMenuCart.tsx
@@ -25,6 +25,8 @@ export const MainMenuCart = () => {
     return () => window.removeEventListener('storage', handler);
   });
 
+  if (!user) return;
+
   return (
     <Link
       id="menu-cart-link"

diff --git a/src/libs/routing/routes/cart.ts b/src/libs/routing/routes/cart.ts
@@ -1,9 +1,15 @@
-import { createRoute } from '@tanstack/react-router';
+import { createRoute, redirect } from '@tanstack/react-router';
 import { rootRoute } from 'libs/routing/routes/root';
 import { CartPage } from 'pages/cart';
+import config from 'config';
 
 export const cartPage = createRoute({
   getParentRoute: () => rootRoute,
   path: '/cart',
   component: CartPage,
+  loader: () => {
+    if (!config.ui.showCart) {
+      throw redirect({ to: '/' });
+    }
+  },
 });
diff --git a/src/libs/routing/routes/strategy.ts b/src/libs/routing/routes/strategy.ts
@@ -3,13 +3,12 @@ import { rootRoute } from './root';
 import { createRoute, redirect } from '@tanstack/react-router';
 import { InferSearch, searchValidator, validNumber } from '../utils';
 import { activityValidators } from 'components/activity/utils';
-import { defaultEnd, defaultStart } from 'components/strategies/common/utils';
 import * as v from 'valibot';
 
 const schema = {
   ...activityValidators,
-  priceStart: v.optional(validNumber, defaultStart().toString()),
-  priceEnd: v.optional(validNumber, defaultEnd().toString()),
+  priceStart: v.optional(validNumber),
+  priceEnd: v.optional(validNumber),
   hideIndicators: v.optional(v.boolean()),
 };
 

diff --git a/src/pages/cart/index.tsx b/src/pages/cart/index.tsx
@@ -121,8 +121,6 @@ export const CartPage = () => {
     }
   };
 
-  if (!config.ui.showCart) return;
-
   if (!strategies.length) {
     return (
       <section className="px-content pb-30 xl:px-50 mx-auto grid max-w-[1280px] flex-grow content-start gap-16 pt-20">