Merge pull request #1536 from mars-protocol/develop

v2.10.2

Author: linkielink

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mars-v2-frontend",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "homepage": "./",
   "private": false,
   "license": "SEE LICENSE IN LICENSE FILE",
@@ -22,17 +22,17 @@
   "dependencies": {
     "@cosmjs/cosmwasm-stargate": "^0.33.1",
     "@delphi-labs/shuttle-react": "^4.3.0",
-    "@keplr-wallet/cosmos": "^0.12.238",
+    "@keplr-wallet/cosmos": "^0.12.239",
     "@next/eslint-plugin-next": "^15.3.3",
-    "@skip-go/client": "^1.1.7",
+    "@skip-go/client": "^1.2.3",
     "@solana/web3.js": "^1.98.2",
-    "@tanstack/react-query": "^5.79.2",
+    "@tanstack/react-query": "^5.80.7",
     "@tanstack/react-table": "^8.21.3",
     "@tippyjs/react": "^4.2.6",
     "@vercel/analytics": "^1.5.0",
     "@vercel/og": "^0.6.8",
     "@web3modal/wagmi": "^5.1.11",
-    "axios": "^1.9.0",
+    "axios": "^1.10.0",
     "bignumber.js": "^9.3.0",
     "bitcoinjs-lib": "^6.1.7",
     "classnames": "^2.5.1",
@@ -50,38 +50,38 @@
     "react-dom": "^19.1.0",
     "react-draggable": "^4.4.6",
     "react-helmet-async": "^2.0.5",
-    "react-qr-code": "^2.0.15",
-    "react-router-dom": "^7.6.1",
+    "react-qr-code": "^2.0.16",
+    "react-router-dom": "^7.6.2",
     "react-spring": "^10.0.1",
     "react-toastify": "^11.0.5",
     "react-use-clipboard": "^1.0.9",
     "recharts": "^2.15.3",
     "sharp": "^0.34.2",
     "starknet": "^6.24.1",
     "swr": "^2.3.3",
-    "viem": "^2.30.6",
-    "wagmi": "^2.15.4",
+    "viem": "^2.31.2",
+    "wagmi": "^2.15.6",
     "zustand": "5.0.5"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.27.1",
-    "@eslint/compat": "^1.2.9",
+    "@babel/eslint-parser": "^7.27.5",
+    "@eslint/compat": "^1.3.0",
     "@svgr/webpack": "^8.1.0",
     "@tailwindcss/container-queries": "^0.1.1",
-    "@tailwindcss/postcss": "^4.1.8",
+    "@tailwindcss/postcss": "^4.1.10",
     "@types/debounce-promise": "^3.1.9",
     "@types/lodash.debounce": "^4.0.9",
     "@types/lodash.throttle": "^4.1.9",
-    "@types/node": "^22.15.29",
-    "@types/react": "19.1.6",
-    "@types/react-dom": "19.1.5",
+    "@types/node": "^24.0.2",
+    "@types/react": "19.1.8",
+    "@types/react-dom": "19.1.6",
     "@types/react-helmet": "^6.1.11",
-    "@typescript-eslint/eslint-plugin": "^8.33.1",
-    "@typescript-eslint/parser": "^8.33.1",
+    "@typescript-eslint/eslint-plugin": "^8.34.0",
+    "@typescript-eslint/parser": "^8.34.0",
     "autoprefixer": "^10.4.21",
     "dotenv": "^16.5.0",
     "dotenv-cli": "^8.0.0",
-    "eslint": "^9.28.0",
+    "eslint": "^9.29.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-functional": "^9.0.2",
     "eslint-plugin-import": "^2.31.0",
@@ -90,14 +90,14 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "husky": "^9.1.7",
     "identity-obj-proxy": "^3.0.0",
-    "lint-staged": "^16.1.0",
+    "lint-staged": "^16.1.2",
     "prettier": "^3.5.3",
     "prettier-plugin-tailwindcss": "^0.6.12",
     "shelljs": "^0.10.0",
-    "tailwind-scrollbar-hide": "^2.0.0",
+    "tailwind-scrollbar-hide": "^4.0.0",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.33.1"
+    "typescript-eslint": "^8.34.0"
   },
   "engines": {
     "npm": "please-use-yarn",

src/api/cosmwasm-client.ts

@@ -204,8 +204,8 @@ const getManagedVaultDetails = async (chainConfig: ChainConfig, vaultAddress: st
     })
     return response as unknown as ManagedVaultSCDetailsResponse
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching details for vault ${vaultAddress}:`, error)
+    return null
   }
 }
 

src/chains/neutron/neutron-1.ts

@@ -136,6 +136,8 @@ const Neutron1: ChainConfig = {
     accountNft: 'neutron184kvu96rqtetmunkkmhu5hru8yaqg7qfhd8ldu5avjnamdqu69squrh3f5',
     perps: 'neutron1g3catxyv0fk8zzsra2mjc0v4s69a7xygdjt85t54l7ym3gv0un4q2xhaf6',
     pyth: 'neutron1m2emc93m9gpwgsrsf2vylv9xvgqh654630v7dfrhrkmr5slly53spg85wv',
+    marsStaking: 'neutron1rly5as5fdhhuasfw375hs4wyensvyx6eytzkdxtqfma6veyneggs457lnj',
+    marsVotingPower: 'neutron1pxjszcmmdxwtw9kv533u3hcudl6qahsa42chcs24gervf4ge40usaw3pcr',
   },
   endpoints: {
     routes: 'https://app.astroport.fi/api/routes',

src/components/Modals/FundWithdraw/WithdrawFromAccount.tsx

@@ -16,6 +16,7 @@ import { BNCoin } from 'types/classes/BNCoin'
 import { cloneAccount, removeDepositsAndLends } from 'utils/accounts'
 import { byDenom } from 'utils/array'
 import { mergeBNCoinArrays } from 'utils/helpers'
+import { getCoinValue } from 'utils/formatters'
 
 interface Props {
   account: Account
@@ -24,8 +25,23 @@ interface Props {
 export default function WithdrawFromAccount(props: Props) {
   const { account } = props
   const { data: assets } = useAssets()
-  const balances = mergeBNCoinArrays(account.deposits, account.lends)
-  const defaultAsset = assets.find(byDenom(balances[0]?.denom)) ?? assets[0]
+  const tradeEnabledAssets = useMemo(() => assets.filter((asset) => asset.isTradeEnabled), [assets])
+  const sortedBalances = useMemo(
+    () =>
+      mergeBNCoinArrays(account.deposits, account.lends)
+        .filter((coin) => tradeEnabledAssets.some((asset) => asset.denom === coin.denom))
+        .sort((a, b) => {
+          const valueA = getCoinValue(a, tradeEnabledAssets)?.toNumber?.() ?? 0
+          const valueB = getCoinValue(b, tradeEnabledAssets)?.toNumber?.() ?? 0
+          return valueB - valueA
+        }),
+    [account.deposits, account.lends, tradeEnabledAssets],
+  )
+  const defaultAsset = useMemo(
+    () => tradeEnabledAssets.find(byDenom(sortedBalances[0]?.denom)) ?? tradeEnabledAssets[0],
+    [tradeEnabledAssets, sortedBalances],
+  )
+
   const withdraw = useStore((s) => s.withdraw)
   const [withdrawWithBorrowing, setWithdrawWithBorrowing] = useToggle()
   const [currentAsset, setCurrentAsset] = useState<Asset>(defaultAsset)
@@ -46,7 +62,7 @@ export default function WithdrawFromAccount(props: Props) {
   const isBorrowEnabledAsset = currentAsset.isBorrowEnabled
   const maxWithdrawAmount =
     isDeprecatedAsset || !isBorrowEnabledAsset
-      ? (balances.find(byDenom(currentAsset.denom))?.amount ?? BN_ZERO)
+      ? (sortedBalances.find(byDenom(currentAsset.denom))?.amount ?? BN_ZERO)
       : computeMaxWithdrawAmount(currentAsset.denom)
   const maxWithdrawWithBorrowAmount =
     isDeprecatedAsset || !isBorrowEnabledAsset
@@ -125,7 +141,7 @@ export default function WithdrawFromAccount(props: Props) {
           amount={amount}
           max={max}
           className='w-full'
-          balances={balances}
+          balances={sortedBalances}
           accountId={account.id}
           hasSelect
           maxText='Max'