Merge pull request #71 from lidofinance/feature/si-1917-routing-changes

Update routing

Author: Jeday

consts/routing.ts

@@ -8,10 +8,10 @@ export const appPaths = {
     vault: (vaultAddress: Address) =>
       ({
         overview: `/vaults/${vaultAddress}`,
-        supply: (mode: 'fund' | 'withdraw') =>
-          `/vaults/${vaultAddress}/supply/${mode}` as const,
-        adjustment: (mode: 'mint' | 'repay') =>
-          `/vaults/${vaultAddress}/adjustment/${mode}` as const,
+        eth: (mode: 'supply' | 'withdraw') =>
+          `/vaults/${vaultAddress}/eth/${mode}` as const,
+        steth: (mode: 'mint' | 'repay') =>
+          `/vaults/${vaultAddress}/steth/${mode}` as const,
         claim: `/vaults/${vaultAddress}/claim`,
         settings: `/vaults/${vaultAddress}/settings`,
         validators: `/vaults/${vaultAddress}/validators`,

features/adjustment/adjustment-tabs.tsx

@@ -16,15 +16,11 @@ export const AdjustmentTabs = () => {
   // TODO: improve creation of the path
   const mintRoutes = [
     {
-      path: appPaths.vaults
-        .vault(vaultAddress ?? zeroAddress)
-        .adjustment('mint'),
+      path: appPaths.vaults.vault(vaultAddress ?? zeroAddress).steth('mint'),
       name: 'Mint',
     },
     {
-      path: appPaths.vaults
-        .vault(vaultAddress ?? zeroAddress)
-        .adjustment('repay'),
+      path: appPaths.vaults.vault(vaultAddress ?? zeroAddress).steth('repay'),
       name: 'Repay',
     },
   ];

features/overview/components/balance/balance.tsx

@@ -7,13 +7,13 @@ const sectionPayloadList: SectionPayload[] = [
     title: 'Available to withdraw',
     key: 'withdrawableEth',
     actionText: 'Withdraw ETH',
-    actionLink: (vault) => appPaths.vaults.vault(vault).supply('withdraw'),
+    actionLink: (vault) => appPaths.vaults.vault(vault).eth('withdraw'),
   },
   {
     title: 'Idle capital',
     key: 'balanceEth',
     actionText: 'Supply ETH',
-    actionLink: (vault) => appPaths.vaults.vault(vault).supply('fund'),
+    actionLink: (vault) => appPaths.vaults.vault(vault).eth('supply'),
   },
   // TODO: add this after the metrics are implemented
   // {

features/supply/supply-tabs.tsx

@@ -8,23 +8,21 @@ import { Withdraw } from './withdraw';
 import { Switch } from 'shared/components/switch';
 import { appPaths } from 'consts/routing';
 import { zeroAddress } from 'viem';
-export interface SupplyTabProps {
-  mode: 'fund' | 'withdraw';
-}
+export type SupplyTabProps = {
+  mode: 'supply' | 'withdraw';
+};
 
 export const SupplyTabs: FC<SupplyTabProps> = ({ mode }) => {
-  const isFundTab = mode === 'fund';
+  const isFundTab = mode === 'supply';
   const { vaultAddress } = useVaultInfo();
 
   const supplyRoutes = [
     {
-      path: appPaths.vaults.vault(vaultAddress ?? zeroAddress).supply('fund'),
+      path: appPaths.vaults.vault(vaultAddress ?? zeroAddress).eth('supply'),
       name: 'Supply',
     },
     {
-      path: appPaths.vaults
-        .vault(vaultAddress ?? zeroAddress)
-        .supply('withdraw'),
+      path: appPaths.vaults.vault(vaultAddress ?? zeroAddress).eth('withdraw'),
       name: 'Withdraw',
     },
   ];

…/vaults/[vaultAddress]/supply/[mode].tsx …ges/vaults/[vaultAddress]/eth/[mode].tsxpages/vaults/[vaultAddress]/supply/[mode].tsx renamed to pages/vaults/[vaultAddress]/eth/[mode].tsx pages/vaults/[vaultAddress]/supply/[mode].tsx renamed to pages/vaults/[vaultAddress]/eth/[mode].tsx

@@ -7,13 +7,13 @@ import { SupplyTabs } from 'features/supply';
 import { useRouter } from 'next/router';
 
 type SupplyModePageParams = {
-  mode: 'fund' | 'withdraw';
+  mode: 'supply' | 'withdraw';
   address: Address;
 };
 
 const Supply: FC = () => {
   const { mode } = useRouter().query as SupplyModePageParams;
-  const title = mode === 'fund' ? 'Supply' : 'Withdraw';
+  const title = mode === 'supply' ? 'Supply' : 'Withdraw';
 
   return (
     <Layout navigationMode="vault" title={title} containerSize="content">

…lts/[vaultAddress]/adjustment/[mode].tsx …s/vaults/[vaultAddress]/steth/[mode].tsxpages/vaults/[vaultAddress]/adjustment/[mode].tsx renamed to pages/vaults/[vaultAddress]/steth/[mode].tsx pages/vaults/[vaultAddress]/adjustment/[mode].tsx renamed to pages/vaults/[vaultAddress]/steth/[mode].tsx

@@ -19,15 +19,13 @@ const vaultRoutes = (vaultAddress: Address, overrideMode?: any) => [
   },
   {
     title: 'Supply/Withdraw',
-    path: appPaths.vaults.vault(vaultAddress).supply(overrideMode ?? 'fund'),
+    path: appPaths.vaults.vault(vaultAddress).eth(overrideMode ?? 'supply'),
     icon: <Stake />,
     exact: true,
   },
   {
     title: 'Mint/Repay stETH',
-    path: appPaths.vaults
-      .vault(vaultAddress)
-      .adjustment(overrideMode ?? 'mint'),
+    path: appPaths.vaults.vault(vaultAddress).steth(overrideMode ?? 'mint'),
     icon: <Withdraw />,
     exact: true,
   },