Merge pull request #815 from invariant-labs/staging

Update prod env

package.json

@@ -75,6 +75,7 @@
     "@storybook/react": "^8.1.10",
     "@storybook/react-vite": "^8.1.10",
     "@storybook/test": "^8.1.10",
+    "@trunkio/launcher": "^1.3.4",
     "@types/node": "^20.12.7",
     "@types/react": "^18.2.66",
     "@types/react-dom": "^18.2.22",

src/components/Header/Header.tsx

@@ -75,9 +75,9 @@ export const Header: React.FC<IHeader> = ({
   const routes = ['exchange', 'liquidity', 'portfolio', 'statistics']
 
   const otherRoutesToHighlight: Record<string, RegExp[]> = {
-    liquidity: [/^newPosition\/*/, /^position\/*/],
+    liquidity: [/^liquidity\/*/],
     exchange: [/^exchange\/*/],
-    portfolio: [/^portfolio\/*/]
+    portfolio: [/^portfolio\/*/, /^newPosition\/*/, /^position\/*/]
     // creator: [/^creator\/*/]
   }
 

src/components/LiquidityPoolList/LiquidityPoolList.tsx

@@ -110,10 +110,10 @@ const LiquidityPoolList: React.FC<PoolListInterface> = ({
         return data.sort((a, b) => (a.TVL === b.TVL ? a.volume - b.volume : a.TVL - b.TVL))
       case SortTypePoolList.TVL_DESC:
         return data.sort((a, b) => (a.TVL === b.TVL ? b.volume - a.volume : b.TVL - a.TVL))
-      // case SortType.APY_ASC:
-      //   return data.sort((a, b) => a.apy - b.apy)
-      // case SortType.APY_DESC:
-      //   return data.sort((a, b) => b.apy - a.apy)
+      case SortTypePoolList.APY_ASC:
+        return data.sort((a, b) => a.apy - b.apy)
+      case SortTypePoolList.APY_DESC:
+        return data.sort((a, b) => b.apy - a.apy)
       default:
         return data
     }

src/components/NewPosition/NewPosition.tsx

@@ -526,7 +526,7 @@ export const NewPosition: React.FC<INewPosition> = ({
 
   return (
     <Grid container className={classes.wrapper} direction='column'>
-      <Link to='/liquidity' style={{ textDecoration: 'none', maxWidth: 'fit-content' }}>
+      <Link to='/portfolio' style={{ textDecoration: 'none', maxWidth: 'fit-content' }}>
         <Grid className={classes.back} container item alignItems='center'>
           <img className={classes.backIcon} src={backIcon} alt='back' />
           <Typography className={classes.backText}>Positions</Typography>

src/components/PositionDetails/PositionDetails.tsx

@@ -136,7 +136,7 @@ const PositionDetails: React.FC<IProps> = ({
     <Grid container className={classes.wrapperContainer} wrap='nowrap'>
       <Grid className={classes.positionDetails} container item direction='column'>
         <Grid className={classes.backContainer} container>
-          <Link to='/liquidity' style={{ textDecoration: 'none' }}>
+          <Link to='/portfolio' style={{ textDecoration: 'none' }}>
             <Grid className={classes.back} container item alignItems='center'>
               <img className={classes.backIcon} src={backIcon} alt='Back' />
               <Typography className={classes.backText}>Positions</Typography>

src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx

@@ -444,7 +444,7 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
       if (position?.positionIndex === undefined && isClosingPosition) {
         setIsClosingPosition(false)
         dispatch(connectionActions.setTimeoutError(false))
-        navigate('/liquidity')
+        navigate('/portfolio')
       } else {
         dispatch(connectionActions.setTimeoutError(false))
         onRefresh()
@@ -474,7 +474,7 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
             actions.closePosition({
               positionIndex: position.positionIndex,
               onSuccess: () => {
-                navigate('/liquidity')
+                navigate('/portfolio')
               },
               claimFarmRewards
             })
@@ -569,7 +569,7 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
       className={classes.fullHeightContainer}>
       <EmptyPlaceholder
         desc='The position does not exist in your list! '
-        onAction={() => navigate('/liquidity')}
+        onAction={() => navigate('/portfolio')}
         buttonName='Back to positions'
       />
     </Grid>

src/pages/PortfolioPage/styles.ts

@@ -24,7 +24,8 @@ const useStyles = makeStyles()(theme => {
       }
     },
     innerContainer: {
-      maxWidth: 1072,
+      maxWidth: 1210,
+      minHeight: '70vh',
 
       [theme.breakpoints.down('md')]: {
         width: '100%'