Merge branch 'develop' of https://github.com/mars-protocol/mars-v2-frontend into linkielink-patch-1

# Conflicts:
#	.env
#	.env.production
#	src/components/perps/BalancesTable/index.tsx

public/images/tokens/stdydx.svg

@@ -1,36 +0,0 @@
-<svg viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect width="240" height="240" rx="120" fill="#E50571" />
-  <path d="M149.107 60.9396L63.3276 181.702H89.6637L175.888 60.9396H149.107Z" fill="white" />
-  <path
-    d="M92.4053 60.9396L117.644 96.5239L104.476 115.934L65.5205 60.9396H92.4053Z"
-    fill="url(#paint0_linear_6269_3439)"
-  />
-  <path
-    d="M151.664 181.712L123.682 142.354L136.851 123.483L178 181.712H151.664Z"
-    fill="url(#paint1_linear_6269_3439)"
-  />
-  <defs>
-    <linearGradient
-      id="paint0_linear_6269_3439"
-      x1="86.3698"
-      y1="68.4878"
-      x2="121.753"
-      y2="111.957"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="white" />
-      <stop offset="1" stop-color="white" stop-opacity="0.75" />
-    </linearGradient>
-    <linearGradient
-      id="paint1_linear_6269_3439"
-      x1="157.7"
-      y1="172.547"
-      x2="114.305"
-      y2="113.014"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="white" stop-opacity="0.68" />
-      <stop offset="1" stop-color="white" stop-opacity="0.1" />
-    </linearGradient>
-  </defs>
-</svg>

src/components/borrow/Table/Columns/Manage.tsx

@@ -48,7 +48,7 @@ export default function Manage(props: Props) {
   if (!address) return null
 
   return (
-    <div className='z-10 flex justify-end'>
+    <div className='flex justify-end z-10'>
       <DropDownButton items={ITEMS} text='Manage' color='tertiary' />
     </div>
   )

src/components/common/Table/Row.tsx

@@ -66,7 +66,7 @@ export default function Row<T>(props: Props<T>) {
                 spacingClassName ?? 'px-3 py-4',
                 type && type !== 'strategies' && isSymbolOrName && 'border-l',
                 type && type !== 'strategies' && getBorderColor(type, cell.row.original as any),
-                cell.column.columnDef.meta?.className,
+                cell.column.columnDef.meta?.className ?? 'w-min',
               )}
             >
               {flexRender(cell.column.columnDef.cell, cell.getContext())}

src/components/common/Table/index.tsx

@@ -76,6 +76,7 @@ export default function Table<T>(props: Props<T>) {
                       props.spacingClassName ?? 'px-4 py-3',
                       header.column.getCanSort() && 'hover:cursor-pointer',
                       header.id === 'symbol' || header.id === 'name' ? 'text-left' : 'text-right',
+                      'w-min',
                       header.column.columnDef.meta?.className,
                     )}
                   >

src/components/earn/lend/Table/Columns/DepositCap.tsx

@@ -10,9 +10,6 @@ export const DEPOSIT_CAP_META = {
   accessorKey: 'marketDepositCap',
   header: 'Deposit Cap',
   id: 'marketDepositCap',
-  meta: {
-    className: 'w-50',
-  },
 }
 
 export const marketDepositCapSortingFn = (

src/components/earn/lend/Table/Columns/LendButton.tsx

@@ -13,9 +13,6 @@ export const LEND_BUTTON_META = {
   accessorKey: 'lend',
   enableSorting: false,
   header: '',
-  meta: {
-    className: 'w-40',
-  },
 }
 
 interface Props {

src/components/earn/lend/Table/Columns/Manage.tsx

@@ -13,9 +13,6 @@ export const MANAGE_META = {
   accessorKey: 'manage',
   enableSorting: false,
   header: '',
-  meta: {
-    className: 'w-40',
-  },
 }
 
 interface Props {
@@ -78,7 +75,7 @@ export default function Manage(props: Props) {
   if (!address) return null
 
   return (
-    <div className='z-10 flex justify-end'>
+    <div className='flex justify-end z-10'>
       <DropDownButton items={ITEMS} text='Manage' color='tertiary' />
     </div>
   )

src/configs/assets/stDYDX.ts

@@ -1,15 +0,0 @@
-const stDYDX: AssetMetaData = {
-  symbol: 'stDYDX',
-  id: 'stDYDX',
-  name: 'Stride dYdX',
-  color: '#e50571',
-  logo: '/images/tokens/stdydx.svg',
-  decimals: 18,
-  hasOraclePrice: true,
-  isEnabled: true,
-  isMarket: true,
-  isDisplayCurrency: true,
-  isAutoLendEnabled: false,
-  isStaking: true,
-}
-export default stDYDX

src/configs/chains/osmosis/osmosis-1.ts

@@ -5,24 +5,23 @@ import ATOM from 'configs/assets/ATOM'
 import AXL from 'configs/assets/AXL'
 import DYDX from 'configs/assets/DYDX'
 import INJ from 'configs/assets/INJ'
-import MARS from 'configs/assets/MARS'
-import OSMO from 'configs/assets/OSMO'
-import TIA from 'configs/assets/TIA'
-import USDC from 'configs/assets/USDC'
-import USDCaxl from 'configs/assets/USDC.axl'
-import USDT from 'configs/assets/USDT'
-import USDollar from 'configs/assets/USDollar'
-import WBTCaxl from 'configs/assets/WBTC.axl'
-import WETHaxl from 'configs/assets/WETH.xal'
 import OSMO_ATOM from 'configs/assets/lp/OSMO-ATOM'
 import OSMO_USDC from 'configs/assets/lp/OSMO_USDC'
 import OSMO_WBTC from 'configs/assets/lp/OSMO_WBTC'
 import OSMO_WETH from 'configs/assets/lp/OSMO_WETH'
 import stATOM_ATOM from 'configs/assets/lp/stATOM_ATOM'
+import MARS from 'configs/assets/MARS'
 import milkTIA from 'configs/assets/milkTIA'
+import OSMO from 'configs/assets/OSMO'
 import stATOM from 'configs/assets/stATOM'
-import stDYDX from 'configs/assets/stDYDX'
 import stOSMO from 'configs/assets/stOSMO'
+import TIA from 'configs/assets/TIA'
+import USDC from 'configs/assets/USDC'
+import USDCaxl from 'configs/assets/USDC.axl'
+import USDollar from 'configs/assets/USDollar'
+import USDT from 'configs/assets/USDT'
+import WBTCaxl from 'configs/assets/WBTC.axl'
+import WETHaxl from 'configs/assets/WETH.xal'
 import { VAULTS_META_DATA } from 'constants/vaults'
 import { NETWORK } from 'types/enums/network'
 import { ChainInfoID } from 'types/enums/wallet'
@@ -46,20 +45,15 @@ const ASSETS = [
     poolId: 712,
     denom: 'ibc/D1542AA8762DB13087D8364F3EA6509FD6F009A34F00426AF9E4F9FA85CBBF1F',
   },
-  {
-    ...stATOM,
-    poolId: 803,
-    denom: 'ibc/C140AFD542AE77BD7DCC83F13FDD8C5E5BB8C4929785E6EC2F4C636F98F17901',
-  },
   {
     ...stOSMO,
     poolId: 833,
     denom: 'ibc/D176154B0C63D1F9C6DCFB4F70349EBF2E2B5A87A05902F57A6AE92B863E9AEC',
   },
   {
-    ...stDYDX,
-    poolId: 1423,
-    denom: 'ibc/980E82A9F8E7CA8CD480F4577E73682A6D3855A267D1831485D7EBEF0E7A6C2C',
+    ...stATOM,
+    poolId: 803,
+    denom: 'ibc/C140AFD542AE77BD7DCC83F13FDD8C5E5BB8C4929785E6EC2F4C636F98F17901',
   },
   {
     ...USDCaxl,