Merge branch 'devel' into 'master'

fix vault check

See merge request ip/app!339

.prettierignore

+# Ignore artifacts:
+.vscode
+dist
+docs
+res
+server
+src/chain/contracts
+**/*.json
+**/*.yaml
+**/*.yml
+.yarn
+*.cjs
+*.md
\ No newline at end of file

.prettierrc

 {
+  "trailingComma": "es5",
+  "tabWidth": 2,
   "semi": false,
+  "printWidth": 120,
   "singleQuote": true,
-  "printWidth": 160
+  "bracketSpacing": true
 }

package.json

@@ -63,6 +63,7 @@
     "csstype": "^3.1.0",
     "esbuild": "^0.14.42",
     "mdast": "^3.0.0",
+    "prettier": "3.2.4",
     "rollup": "^2.75.5",
     "typescript": "^5.0.4",
     "vite": "^2.9.9",

src/App.tsx

@@ -13,7 +13,7 @@ import LandingPage from './pages/landing'
 import NotFound404Page from './pages/404'
 import {
   DepositWithdrawUSDCModal,
-  DepositWithdrawCollateralModal,
+  DepositWithdrawModal,
   BorrowRepayModal,
   WithdrawUSDCConfirmationModal,
   DepositUSDCConfirmationModal,
@@ -82,7 +82,7 @@ const DashboardContext = (props: { children: any }) => {
                         <DelegateModal />
                         <UndelegateModal />
                         <DelegateIPTModal />
-                        <DepositWithdrawCollateralModal />
+                        <DepositWithdrawModal />
                         <DepositCollateralConfirmationModal />
                         <WithdrawCollateralConfirmationModal />
                         <DepositWithdrawPositionConfirmationModal />

src/components/util/modal/DepositWithdrawCollateralModal.tsx → src/components/util/modal/DepositWithdrawModal.tsx

-import { Box, Typography } from '@mui/material'
-import { formatColor, neutral } from '../../../theme'
-import SVGBox from '../../icons/misc/SVGBox'
 import {
   ModalType,
   useModalContext,
 } from '../../libs/modal-content-provider/ModalContentProvider'
 import { BaseSwitch } from '../switch'
 import { BaseModal } from './BaseModal'
-import { useVaultDataContext } from '../../libs/vault-data-provider/VaultDataProvider'
-import { Token, isToken } from '../../../chain/tokens'
-import { DepositWithdrawPositionContent } from './DepositWithdrawPositionModal'
+import { isToken } from '../../../chain/tokens'
+import { DepositWithdrawPositionContent } from './DepositWithdrawPositionContent'
 import { DepositWithdrawCollateralContent } from './ModalContent/DepositWithdrawCollateralContent'
 
-export const DepositWithdrawCollateralModal = () => {
+export const DepositWithdrawModal = () => {
   const {
     type,
     setType,

src/components/util/modal/DepositWithdrawPositionConfirmationModal.tsx

@@ -37,7 +37,7 @@ export const DepositWithdrawPositionConfirmationModal = () => {
 
   const handleDepositConfirmation = async () => {
     try {
-      if (!hasVotingVault || !hasNftVault) {
+      if (!hasNftVault) {
         setLoading(false)
         setType(ModalType.MintSubVault)
         return

src/components/util/modal/index.ts

@@ -3,7 +3,7 @@ export * from "./DepositWithdrawUSDCModal";
 export * from "./DepositUSDCConfirmationModal";
 export * from "./WithdrawUSDCConfirmationModal";
 export * from "./ClaimModal";
-export * from "./DepositWithdrawCollateralModal";
+export * from "./DepositWithdrawModal";
 export * from "./DepositCollateralConfirmationModal";
 export * from "./WithdrawCollateralConfirmationModal";
 export * from "./BorrowRepayModal";
@@ -11,5 +11,4 @@ export * from "./DelegateModal";
 export * from "./UndelegateModal";
 export * from "./TransactionStatusModal";
 export * from "./DelegateIPTModal";
-export * from "./DepositWithdrawPositionModal";
 export * from "./DepositWithdrawPositionConfirmationModal";
\ No newline at end of file

yarn.lock

@@ -5174,6 +5174,7 @@ __metadata:
     ethers: ^5.6.8
     mdast: ^3.0.0
     merkletreejs: ^0.2.31
+    prettier: 3.2.4
     react: ^18.1.0
     react-dom: ^18.1.0
     react-markdown: ^8.0.3
@@ -6854,6 +6855,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:3.2.4":
+  version: 3.2.4
+  resolution: "prettier@npm:3.2.4"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
+  languageName: node
+  linkType: hard
+
 "process-warning@npm:^1.0.0":
   version: 1.0.0
   resolution: "process-warning@npm:1.0.0"