diff --git a/apps/dapp/src/components/DeployVault/AddNewStrategyButton.tsx b/apps/dapp/src/components/DeployVault/AddNewStrategyButton.tsx
index 86ff3b42..e7da6c9f 100644
--- a/apps/dapp/src/components/DeployVault/AddNewStrategyButton.tsx
+++ b/apps/dapp/src/components/DeployVault/AddNewStrategyButton.tsx
@@ -9,8 +9,8 @@ import {
 } from '@/components/ui/dialog'
 import { getTokenSymbol } from '@/helpers/getTokenInfo'
 import { StrategyMethod, useStrategyCallback } from '@/hooks/useStrategy'
-import { getDefaultStrategies, pushAmount, pushAsset } from '@/store/lib/features/vaultStore'
-import { useAppDispatch } from '@/store/lib/storeHooks'
+import { getDefaultStrategies, pushAmount, pushAsset, setAmountByAddress } from '@/store/lib/features/vaultStore'
+import { useAppDispatch, useAppSelector } from '@/store/lib/storeHooks'
 import { Asset, Strategy } from '@/store/lib/types'
 import {
   Button,
@@ -42,15 +42,36 @@ function AddNewStrategyButton() {
   const { activeChain } = useSorobanReact()
   const strategyCallback = useStrategyCallback();
   const [open, setOpen] = useState<boolean>(false)
-  const [isLoading, setIsLoading] = useState<boolean>(false)
-  const [defaultStrategies, setDefaultStrategies] = useState<Strategy[]>([])
-  const [asset, setAsset] = useState<Asset>({ address: '', strategies: [] })
+  const newVault = useAppSelector((state) => state.newVault)
+  const [defaultStrategies, setDefaultStrategies] = useState<any[]>([])
+  const [selectedAsset, setSelectedAsset] = useState<Asset>({ address: '', strategies: [], symbol: '' })
+  const [assets, setAssets] = useState<Asset[]>([])
   const [amountInput, setAmountInput] = useState<AmountInputProps>({ amount: 0, enabled: false })
 
+  const resetForm = () => {
+    setSelectedAsset({ address: '', strategies: [], symbol: '' })
+    setAmountInput({ amount: 0, enabled: false })
+    setOpen(false)
+  }
+
+  const getSymbol = async (address: string) => {
+    const symbol = await getTokenSymbol(address, sorobanContext)
+    if (!symbol) return '';
+    return symbol === 'native' ? 'XLM' : symbol
+  }
+
   useEffect(() => {
     const fetchStrategies = async () => {
       const tempStrategies = await getDefaultStrategies(activeChain?.name?.toLowerCase() || 'testnet')
-      for (const strategy of tempStrategies) {
+      setDefaultStrategies(tempStrategies)
+    }
+    fetchStrategies();
+  }, [activeChain?.networkPassphrase])
+
+  useEffect(() => {
+    const fetchStrategies = async () => {
+      const rawDefaultStrategies = await getDefaultStrategies(activeChain?.name?.toLowerCase() || 'testnet')
+      const defaultStrategiesWithAssets = await Promise.all(rawDefaultStrategies.map(async (strategy) => {
         const assetAddress = await strategyCallback(
           strategy.address,
           StrategyMethod.ASSET,
@@ -62,76 +83,23 @@ function AddNewStrategyButton() {
           return asset;
         })
         const assetSymbol = await getSymbol(assetAddress)
-        setAsset({ ...asset, address: assetAddress, symbol: assetSymbol! })
+        const asset = { address: assetAddress, strategies: [strategy], symbol: assetSymbol! }
+        return asset
       }
-      setDefaultStrategies(tempStrategies)
+      ))
+      setAssets(defaultStrategiesWithAssets)
     }
     fetchStrategies();
   }, [activeChain?.networkPassphrase])
 
 
-  const resetForm = () => {
-    setAsset({ address: '', strategies: [] })
-    setAmountInput({ amount: 0, enabled: false })
-    setOpen(false)
-  }
-
-  const getSymbol = async (address: string) => {
-    const symbol = await getTokenSymbol(address, sorobanContext)
-    if (!symbol) return '';
-    return symbol === 'native' ? 'XLM' : symbol
-  }
-
   const handleSelectStrategy = (value: boolean, strategy: Strategy) => {
-    setIsLoading(true)
-    switch (value) {
-      case true:
-        const fetchAssets = async () => {
-          try {
-            const asset = await strategyCallback(
-              strategy.address,
-              StrategyMethod.ASSET,
-              undefined,
-              false
-            ).then((result) => {
-              const resultScval = result as xdr.ScVal;
-              const asset = scValToNative(resultScval);
-              return asset;
-            });
-            const symbol = await getSymbol(asset);
-            const newAsset = { address: asset, symbol: symbol!, strategies: [strategy] }
-            console.log(newAsset)
-            setAsset({ address: asset, symbol: symbol!, strategies: [strategy] })
-          } catch (error) {
-            console.error(error);
-          } finally {
-            setIsLoading(false)
-          }
-        };
-        fetchAssets();
-        break
-      case false:
-        setAsset({ ...asset, strategies: asset.strategies.filter(str => str.address !== strategy.address) })
-        setIsLoading(false)
-        break
+    const selectedAsset = assets.find((asset) => asset.strategies.some((str) => str.address === strategy.address))
+    if (selectedAsset) {
+      setSelectedAsset(selectedAsset)
     }
   }
 
-  const addAsset = async () => {
-    const newAsset: Asset = {
-      address: asset.address,
-      strategies: asset.strategies,
-      symbol: asset.symbol
-    }
-    await dispatch(pushAsset(newAsset))
-    if (amountInput.enabled && amountInput.amount! > 0) {
-      await dispatch(pushAmount(amountInput.amount!))
-    }
-    resetForm()
-  }
-
-
-
   const handleAmountInput = async (e: any) => {
     const input = e.target.value
     const decimalRegex = /^(\d+)?(\.\d{0,7})?$/
@@ -142,6 +110,31 @@ function AddNewStrategyButton() {
     }
     setAmountInput({ amount: input, enabled: true });
   }
+  const strategyExists = (strategy: Strategy) => {
+    const exists = newVault.assets.some((asset) => asset.strategies.some((str) => str.address === strategy.address))
+    return exists
+  }
+  const addAsset = async () => {
+    const newAsset: Asset = {
+      address: selectedAsset.address,
+      strategies: selectedAsset.strategies,
+      symbol: selectedAsset.symbol
+    }
+    const exists = strategyExists(selectedAsset.strategies[0]!)
+    if (exists) {
+      if (amountInput.enabled && amountInput.amount! > 0) {
+      await dispatch(setAmountByAddress({ address: selectedAsset.address, amount: amountInput.amount }))
+      } else if (amountInput.enabled == false || amountInput.amount! == 0) {
+        await dispatch(setAmountByAddress({ address: selectedAsset.address, amount: 0 }))
+      }
+    }
+    await dispatch(pushAsset(newAsset))
+    if (!exists && amountInput.enabled && amountInput.amount! > 0) {
+      await dispatch(pushAmount(amountInput.amount!))
+    }
+    resetForm()
+  }
+
   return (
     <DialogRoot open={open} onOpenChange={(e) => { setOpen(e.open) }} placement={'center'}>
       <DialogBackdrop backdropFilter='blur(1px)' />
@@ -159,13 +152,12 @@ function AddNewStrategyButton() {
           <For each={defaultStrategies}>
             {(strategy, index) => (
               <Stack key={index} my={2}>
-                {isLoading && <Skeleton height={12} />}
-                {!isLoading && <CheckboxCard
-                  checked={asset.strategies.some((str) => str.address === strategy.address)}
+                <CheckboxCard
+                  checked={strategyExists(strategy) || selectedAsset.strategies.some((str) => str.address === strategy.address)}
                   onCheckedChange={(e) => handleSelectStrategy(!!e.checked, strategy)}
                   label={strategy.name}
-                />}
-                {asset.strategies.some((str) => str.address === strategy.address) &&
+                />
+                {selectedAsset.strategies.some((str) => str.address === strategy.address) &&
                   <Grid templateColumns={['1fr', null, 'repeat(12, 2fr)']} alignItems={'center'} >
                     <GridItem colSpan={2} colEnd={12}>
                       <Text fontSize={'xs'}>Initial deposit:</Text>
@@ -187,7 +179,7 @@ function AddNewStrategyButton() {
                     </GridItem>
                     <GridItem colStart={8} colEnd={13}>
                       <InputGroup
-                        endElement={`${asset.symbol}`}
+                        endElement={`${selectedAsset.symbol}`}
                       >
                         <Input onChange={handleAmountInput} value={amountInput.amount} />
                       </InputGroup>
@@ -204,7 +196,7 @@ function AddNewStrategyButton() {
             Close
           </Button>
           <IconButton
-            disabled={asset.strategies.length === 0}
+            disabled={selectedAsset.strategies.length === 0}
             aria-label='add_strategy'
             colorScheme='green'
             onClick={addAsset}
diff --git a/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx b/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
index eec5324c..11a76033 100644
--- a/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
+++ b/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
@@ -10,7 +10,7 @@ import { randomBytes } from "crypto";
 
 import { useAppDispatch, useAppSelector } from "@/store/lib/storeHooks"
 import { pushVault } from '@/store/lib/features/walletStore'
-import { Asset, NewVaultState } from "@/store/lib/types";
+import { Asset, NewVaultState, VaultData } from "@/store/lib/types";
 
 import { useFactoryCallback, FactoryMethod } from '@/hooks/useFactory'
 import { ModalContext, TransactionStatusModalStatus } from "@/contexts";
@@ -18,6 +18,8 @@ import { ModalContext, TransactionStatusModalStatus } from "@/contexts";
 import { AccordionItems, FormControlInterface, VaultPreview } from "./VaultPreview";
 import { DialogBody, DialogCloseTrigger, DialogFooter, DialogHeader, DialogTitle } from "../ui/dialog";
 import { Button } from "@chakra-ui/react"
+import { resetNewVault } from "@/store/lib/features/vaultStore";
+import { useVault } from "@/hooks/useVault";
 
 interface Status {
   isSuccess: boolean,
@@ -40,23 +42,15 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
   const { activeChain, address } = sorobanContext;
   const factory = useFactoryCallback();
   const newVault: NewVaultState = useAppSelector(state => state.newVault);
-  //const strategies: Strategy[] = newVault.strategies;
   const indexName = useAppSelector(state => state.newVault.name)
   const indexSymbol = useAppSelector(state => state.newVault.symbol)
   const indexShare = useAppSelector(state => state.newVault.vaultShare)
   const managerString = useAppSelector(state => state.newVault.manager)
   const emergencyManagerString = useAppSelector(state => state.newVault.emergencyManager)
   const feeReceiverString = useAppSelector(state => state.newVault.feeReceiver)
-  const { transactionStatusModal: txModal } = useContext(ModalContext);
+  const { transactionStatusModal: txModal, deployVaultModal: deployModal } = useContext(ModalContext);
   const dispatch = useAppDispatch();
-  const [assets, setAssets] = useState<Asset[]>([]);
-  const [status, setStatus] = useState<Status>({
-    isSuccess: false,
-    hasError: false,
-    network: undefined,
-    message: undefined,
-    txHash: undefined
-  });
+  const { getIdleFunds, getInvestedFunds, getTVL, getUserBalance } = useVault()
 
   const [deployDisabled, setDeployDisabled] = useState(true);
 
@@ -73,35 +67,6 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
     }
   }, [managerString, emergencyManagerString, feeReceiverString])
 
-
-
-
-  /* useEffect(() => {
-    const newChartData: ChartData[] = strategies.map((strategy: Strategy, index: number) => {
-      return {
-        id: index,
-        label: strategy.name,
-        address: strategy.address,
-        value: strategy.share,
-      }
-    });
-    const total = newChartData.reduce((acc: number, curr: ChartData) => acc + curr.value, 0)
-    if (total == 100) {
-      setChartData(newChartData);
-      return;
-    } else {
-      newChartData.push({
-        id: newChartData.length,
-        label: 'Unassigned',
-        value: 100 - newChartData.reduce((acc: number, curr: ChartData) => acc + curr.value, 0),
-        address: undefined,
-        color: '#e0e0e0'
-      })
-      setChartData(newChartData);
-      return;
-    }
-  }, [strategies]); */
-
   const autoCloseModal = async () => {
     await new Promise(resolve => setTimeout(resolve, 30000))
     txModal.resetModal();
@@ -113,7 +78,6 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       autoCloseModal();
     }
   }, [txModal.status])
-  const activeStep: number = 0;
   const [buttonText, setButtonText] = useState<string>('')
   const [accordionValue, setAccordionValue] = useState<AccordionItems[]>([AccordionItems.STRATEGY_DETAILS])
   const [formControl, setFormControl] = useState<FormControlInterface>({
@@ -144,6 +108,7 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
     }
 
   }, [managerString, emergencyManagerString, feeReceiverString, indexShare])
+
   const deployDefindex = async () => {
     if (managerString === '' || emergencyManagerString === '') {
       console.log('please fill manager config')
@@ -155,6 +120,7 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       setAccordionValue([AccordionItems.FEES_CONFIGS])
       return
     }
+    deployModal.setIsOpen(false)
     txModal.initModal();
 
     const vaultName = nativeToScVal(indexName, { type: "string" })
@@ -207,9 +173,16 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       ]);
     });
     const assetParamsScValVec = xdr.ScVal.scvVec(assetParamsScVal);
-    const amountsScVal = newVault.amounts.map((amount) => {
-      return nativeToScVal((amount * Math.pow(10, 7)), { type: "i128" });
+    const amountsScVal = newVault.assets.map((asset, index) => {
+      const parsedAmount = newVault.amounts[index] || 0;
+      const truncatedAmount = Math.floor(parsedAmount * 1e7) / 1e7;
+      const convertedAmount = Number(truncatedAmount) * Math.pow(10, 7)
+      if (newVault.amounts.length === 0) return nativeToScVal(0, { type: "i128" });
+      return nativeToScVal(convertedAmount, { type: "i128" });
     });
+   /*  const amountsScVal = newVault.amounts.map((amount) => {
+      return nativeToScVal((amount * Math.pow(10, 7)), { type: "i128" });
+    }); */
     const amountsScValVec = xdr.ScVal.scvVec(amountsScVal);
      /*  fn create_defindex_vault(
       emergency_manager: address, 
@@ -222,7 +195,9 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       salt: bytesn<32>) -> result<address,FactoryError>
  */
     let result: any;
-    if (amountsScVal.length === 0) {
+
+
+    if (newVault.amounts.length === 0) {
       const createDefindexParams: xdr.ScVal[] = [
         emergencyManager.toScVal(),
         feeReceiver.toScVal(),
@@ -242,6 +217,7 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       }
       catch (e: any) {
         console.error(e)
+        dispatch(resetNewVault());
         txModal.handleError(e.toString());
         return
       }
@@ -269,18 +245,33 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       }
       catch (e: any) {
         console.error(e)
+        dispatch(resetNewVault());
         txModal.handleError(e.toString());
         return
       }
     }
     const parsedResult: string = scValToNative(result.returnValue);
     if (parsedResult.length !== 56) throw new Error('Invalid result')
-    const tempVault: any = {
+    const idleFunds = newVault.assets.map((asset, index) => {
+      return {
+        address: asset.address,
+        amount: newVault.amounts[index] || 0
+      }
+    })
+    const tempVault: VaultData = {
       ...newVault,
-      address: parsedResult
+      address: parsedResult,
+      emergencyManager: emergencyManagerString,
+      feeReceiver: feeReceiverString,
+      manager: managerString,
+      TVL: 0,
+      totalSupply: 0,
+      idleFunds: idleFunds,
+      investedFunds: [{ address: '', amount: 0 }],
     }
-    txModal.handleSuccess(result.txHash);
+    await txModal.handleSuccess(result.txHash);
     dispatch(pushVault(tempVault));
+    dispatch(resetNewVault());
     return result;
   }
 
@@ -305,14 +296,12 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       </DialogBody>
 
       <DialogFooter>
-        {(activeStep == 0 && !status.hasError) && (
           <Button
             aria-label='add_strategy'
             colorScheme='green'
             onClick={deployDefindex}>
             {buttonText}
-          </Button>
-        )}
+        </Button>
       </DialogFooter>
     </>
 
diff --git a/apps/dapp/src/components/DeployVault/DeployVault.tsx b/apps/dapp/src/components/DeployVault/DeployVault.tsx
index 987f13aa..7432b96d 100644
--- a/apps/dapp/src/components/DeployVault/DeployVault.tsx
+++ b/apps/dapp/src/components/DeployVault/DeployVault.tsx
@@ -103,7 +103,7 @@ export const DeployVault = () => {
                                 Strategy Address: {shortenAddress(strategy.address)}
                               </li>
                             </Tooltip>
-                            {amounts[j] && <li>Initial deposit: ${amounts[j]} {asset.symbol}</li>}
+                            {(amounts[j]! > 0) && <li>Initial deposit: ${amounts[j]} {asset.symbol}</li>}
                           </Box>
                         )}
                       </For>
diff --git a/apps/dapp/src/components/InteractWithVault/InteractWithVault.tsx b/apps/dapp/src/components/InteractWithVault/InteractWithVault.tsx
index 427033be..2fb0431d 100644
--- a/apps/dapp/src/components/InteractWithVault/InteractWithVault.tsx
+++ b/apps/dapp/src/components/InteractWithVault/InteractWithVault.tsx
@@ -3,8 +3,8 @@ import { Address, nativeToScVal, xdr } from '@stellar/stellar-sdk'
 import { useSorobanReact } from '@soroban-react/core'
 
 import { useAppDispatch, useAppSelector } from '@/store/lib/storeHooks'
-import { setVaultTVL } from '@/store/lib/features/walletStore'
-import { Strategy } from '@/store/lib/types'
+import { setVaultTVL, setVaultUserBalance, updateVaultData } from '@/store/lib/features/walletStore'
+import { Strategy, VaultData } from '@/store/lib/types'
 
 import { VaultMethod, useVaultCallback, useVault } from '@/hooks/useVault'
 import { ModalContext } from '@/contexts'
@@ -23,6 +23,7 @@ import {
   NativeSelectField,
   HStack,
 } from '@chakra-ui/react'
+import { ClipboardIconButton, ClipboardRoot } from '../ui/clipboard'
 
 export const InteractWithVault = () => {
   const [amount, set_amount] = useState<number>(0)
@@ -36,7 +37,7 @@ export const InteractWithVault = () => {
   const { transactionStatusModal: statusModal, interactWithVaultModal: interactModal, inspectVaultModal: inspectModal } = useContext(ModalContext)
 
   const vaultOperation = async () => {
-    if (!address || !vaultMethod) return;
+    if (!address || !vaultMethod || !selectedVault.address) return;
     if (!amount) throw new Error('Amount is required');
     const parsedAmount = parseFloat(amount.toString())
     const convertedAmount = parsedAmount * Math.pow(10, 7)
@@ -52,38 +53,53 @@ export const InteractWithVault = () => {
     };
     if (vaultMethod === VaultMethod.WITHDRAW) {
       const withdrawAmount = ((amount * selectedVault.totalSupply) / selectedVault.TVL)
-      const convertedWithdrawAmount = withdrawAmount * Math.pow(10, 7)
+      const truncatedWithdrawAmount = Math.floor(withdrawAmount * 1e7) / 1e7;
+      const convertedWithdrawAmount = Number(truncatedWithdrawAmount) * Math.pow(10, 7)
       const withdrawParams: xdr.ScVal[] = [
-        nativeToScVal(convertedWithdrawAmount, { type: "i128" }),
+        nativeToScVal(Math.ceil(convertedWithdrawAmount), { type: "i128" }),
         new Address(address).toScVal(),
       ]
       params = withdrawParams
     };
-    console.log('Vault method:', vaultMethod)
     try {
       const result = await vaultCB(
         vaultMethod!,
         selectedVault?.address!,
         params,
         true,
-      ).then((res) =>
-        statusModal.handleSuccess(res.txHash)
+      ).then(async (res) => {
+        await statusModal.handleSuccess(res.txHash)
+      }
       ).finally(async () => {
+        const newBalance = await vault.getUserBalance(selectedVault.address, address)
+        const newIdleFunds = await vault.getIdleFunds(selectedVault.address!)
+        const newInvestedFunds = await vault.getInvestedFunds(selectedVault.address)
         const newTVL = await vault.getTVL(selectedVault?.address!)
-        const parsedNewTVL = Number(newTVL) / 10 ** 7
-        dispatch(setVaultTVL(parsedNewTVL))
+        const newVaultData: Partial<VaultData> = {
+          address: selectedVault.address,
+          userBalance: newBalance || 0,
+          idleFunds: newIdleFunds,
+          investedFunds: newInvestedFunds,
+          TVL: newTVL
+        }
+        dispatch(updateVaultData(newVaultData))
       });
     }
     catch (error: any) {
       console.error('Error:', error)
-      statusModal.handleError(error.toString())
+      await statusModal.handleError(error.toString())
+    } finally {
+      set_amount(0)
+      await setTimeout(() => {
+        interactModal.setIsOpen(false)
+        inspectModal.setIsOpen(false)
+      }, 3000)
     }
   }
 
   const setAmount = (input: any) => {
     if (input < 0 || !selectedVault) return;
     if (vaultMethod === VaultMethod.WITHDRAW) {
-      console.log(input, selectedVault?.userBalance)
       if (input > selectedVault.userBalance!) return;
     }
     const decimalRegex = /^(\d+)?(\.\d{0,7})?$/;
@@ -106,19 +122,20 @@ export const InteractWithVault = () => {
           <Grid templateColumns="repeat(11, 1fr)" gap={1}>
             <GridItem colSpan={12}>
               <h2>Vault address:</h2>
-              <Textarea
-                defaultValue={selectedVault.address}
-                rows={1}
-                w={'full'}
-                textAlign={'center'}
-                readOnly
-                resize={'none'} />
+              <ClipboardRoot value={selectedVault.address}>
+                <HStack alignItems={'center'} justifyItems={'center'}>
+                  <Text>
+                    {selectedVault.address}
+                  </Text>
+                  <ClipboardIconButton />
+                </HStack>
+              </ClipboardRoot>
             </GridItem>
             <GridItem colSpan={5} colStart={1} textAlign={'start'}>
               <h2>Total value locked: ${selectedVault?.TVL} {selectedVault.assets[0]?.symbol}</h2>
             </GridItem>
             <GridItem colSpan={6} colStart={6} textAlign={'end'}>
-              <h2>User balance in vault: ${selectedVault?.userBalance} {selectedVault.assets[0]?.symbol}</h2>
+              <h2>User balance in vault: ${`${selectedVault.userBalance ?? 0}`} {selectedVault.assets[0]?.symbol}</h2>
             </GridItem>
             {vaultMethod != VaultMethod.EMERGENCY_WITHDRAW &&
               <GridItem colSpan={12} pt={6}>
diff --git a/apps/dapp/src/components/ManageVaults/AllVaults.tsx b/apps/dapp/src/components/ManageVaults/AllVaults.tsx
index 2e63d4b1..68274157 100644
--- a/apps/dapp/src/components/ManageVaults/AllVaults.tsx
+++ b/apps/dapp/src/components/ManageVaults/AllVaults.tsx
@@ -6,7 +6,7 @@ import { shortenAddress } from '@/helpers/address'
 import { useVault } from '@/hooks/useVault'
 import { FactoryMethod, useFactoryCallback } from '@/hooks/useFactory'
 
-import { setIsVaultsLoading, setVaults, setVaultUserBalance } from '@/store/lib/features/walletStore'
+import { setIsVaultsLoading, setVaults, setVaultTVL, setVaultUserBalance } from '@/store/lib/features/walletStore'
 import { useAppDispatch, useAppSelector } from '@/store/lib/storeHooks'
 import { VaultData } from '@/store/lib/types'
 
@@ -85,7 +85,18 @@ export const AllVaults = ({
 
   useEffect(() => {
     getDefindexVaults()
-  }, [activeChain?.networkPassphrase, address])
+  }, [activeChain?.networkPassphrase])
+
+  useEffect(() => {
+    if (address) {
+      createdVaults.forEach(async (v: VaultData) => {
+        const TVL = await vault.getTVL(v.address)
+        if (TVL) {
+          dispatch(setVaultTVL({ value: TVL, address: v.address }))
+        }
+      })
+    }
+  }, [createdVaults])
 
   useEffect(() => {
     if (address) {
@@ -96,7 +107,7 @@ export const AllVaults = ({
         }
       })
     }
-  }, [createdVaults])
+  }, [createdVaults, address])
 
   return (
     <Box mx={'auto'} minW={'100%'} p={4}>
diff --git a/apps/dapp/src/components/ManageVaults/InspectVault.tsx b/apps/dapp/src/components/ManageVaults/InspectVault.tsx
index d61e2f48..946f4a37 100644
--- a/apps/dapp/src/components/ManageVaults/InspectVault.tsx
+++ b/apps/dapp/src/components/ManageVaults/InspectVault.tsx
@@ -2,7 +2,7 @@
 import { useSorobanReact } from "@soroban-react/core"
 
 import { shortenAddress } from "@/helpers/address"
-import { VaultMethod } from "@/hooks/useVault"
+import { useVault, VaultMethod } from "@/hooks/useVault"
 
 import { useAppSelector } from "@/store/lib/storeHooks"
 import { Asset, AssetAmmount, VaultData } from "@/store/lib/types"
@@ -11,6 +11,7 @@ import { Button, Grid, GridItem, HStack, Icon, Stack, Text } from "@chakra-ui/re
 import { DialogBody, DialogContent, DialogFooter, DialogHeader } from "../ui/dialog"
 import { FaRegEdit } from "react-icons/fa"
 import { IoClose } from "react-icons/io5"
+import { ClipboardIconButton, ClipboardRoot } from "../ui/clipboard"
 import { ModalContext } from "@/contexts"
 import { useContext } from "react"
 
@@ -20,15 +21,14 @@ export const InspectVault = ({
   handleOpenInteract,
   onClose
 }: {
-    handleOpenDeployVault: (method: string, value: boolean, args?: any) => any,
-    handleOpenInteract: (method: string, args?: any) => any,
-    onClose: () => void,
+  handleOpenDeployVault: (method: string, value: boolean, args?: any) => any,
+  handleOpenInteract: (method: string, args?: any) => any,
+  onClose: () => void,
 }) => {
   const selectedVault: VaultData | undefined = useAppSelector(state => state.wallet.vaults.selectedVault)
   const { address } = useSorobanReact()
   const { editVaultModal: editModal } = useContext(ModalContext)
   if (!selectedVault) return null
-
   return (
     <DialogContent>
       <DialogHeader>
@@ -54,7 +54,14 @@ export const InspectVault = ({
         <Grid templateColumns="repeat(12, 1fr)" gap={4}>
           <GridItem colSpan={12} justifyItems={'center'}>
             <h3>Vault address</h3>
-            <p>{selectedVault.address}</p>
+            <ClipboardRoot value={selectedVault.address}>
+              <HStack alignItems={'center'}>
+                <Text>
+                  {selectedVault.address}
+                </Text>
+                <ClipboardIconButton />
+              </HStack>
+            </ClipboardRoot>
           </GridItem>
         </Grid>
         <Stack justify={'space-around'} direction={{ sm: 'column', md: 'row' }} mt={6}>
diff --git a/apps/dapp/src/components/ui/clipboard.tsx b/apps/dapp/src/components/ui/clipboard.tsx
index 1955276a..958cb59f 100644
--- a/apps/dapp/src/components/ui/clipboard.tsx
+++ b/apps/dapp/src/components/ui/clipboard.tsx
@@ -5,10 +5,10 @@ import {
   IconButton,
   Input,
 } from "@chakra-ui/react"
-import { forwardRef } from "react"
+import * as React from "react"
 import { LuCheck, LuClipboard, LuLink } from "react-icons/lu"
 
-const ClipboardIcon = forwardRef<
+const ClipboardIcon = React.forwardRef<
   HTMLDivElement,
   ChakraClipboard.IndicatorProps
 >(function ClipboardIcon(props, ref) {
@@ -19,7 +19,7 @@ const ClipboardIcon = forwardRef<
   )
 })
 
-const ClipboardCopyText = forwardRef<
+const ClipboardCopyText = React.forwardRef<
   HTMLDivElement,
   ChakraClipboard.IndicatorProps
 >(function ClipboardCopyText(props, ref) {
@@ -30,7 +30,7 @@ const ClipboardCopyText = forwardRef<
   )
 })
 
-export const ClipboardLabel = forwardRef<
+export const ClipboardLabel = React.forwardRef<
   HTMLLabelElement,
   ChakraClipboard.LabelProps
 >(function ClipboardLabel(props, ref) {
@@ -46,7 +46,7 @@ export const ClipboardLabel = forwardRef<
   )
 })
 
-export const ClipboardButton = forwardRef<HTMLButtonElement, ButtonProps>(
+export const ClipboardButton = React.forwardRef<HTMLButtonElement, ButtonProps>(
   function ClipboardButton(props, ref) {
     return (
       <ChakraClipboard.Trigger asChild>
@@ -59,7 +59,7 @@ export const ClipboardButton = forwardRef<HTMLButtonElement, ButtonProps>(
   },
 )
 
-export const ClipboardLink = forwardRef<HTMLButtonElement, ButtonProps>(
+export const ClipboardLink = React.forwardRef<HTMLButtonElement, ButtonProps>(
   function ClipboardLink(props, ref) {
     return (
       <ChakraClipboard.Trigger asChild>
@@ -81,20 +81,21 @@ export const ClipboardLink = forwardRef<HTMLButtonElement, ButtonProps>(
   },
 )
 
-export const ClipboardIconButton = forwardRef<HTMLButtonElement, ButtonProps>(
-  function ClipboardIconButton(props, ref) {
-    return (
-      <ChakraClipboard.Trigger asChild>
-        <IconButton ref={ref} size="xs" variant="subtle" {...props}>
-          <ClipboardIcon />
-          <ClipboardCopyText srOnly />
-        </IconButton>
-      </ChakraClipboard.Trigger>
-    )
-  },
-)
+export const ClipboardIconButton = React.forwardRef<
+  HTMLButtonElement,
+  ButtonProps
+>(function ClipboardIconButton(props, ref) {
+  return (
+    <ChakraClipboard.Trigger asChild>
+      <IconButton ref={ref} size="xs" variant="subtle" {...props}>
+        <ClipboardIcon />
+        <ClipboardCopyText srOnly />
+      </IconButton>
+    </ChakraClipboard.Trigger>
+  )
+})
 
-export const ClipboardInput = forwardRef<HTMLInputElement, InputProps>(
+export const ClipboardInput = React.forwardRef<HTMLInputElement, InputProps>(
   function ClipboardInputElement(props, ref) {
     return (
       <ChakraClipboard.Input asChild>
diff --git a/apps/dapp/src/hooks/useVault.ts b/apps/dapp/src/hooks/useVault.ts
index d9062f72..4ce916aa 100644
--- a/apps/dapp/src/hooks/useVault.ts
+++ b/apps/dapp/src/hooks/useVault.ts
@@ -81,7 +81,8 @@ export const useVault = (vaultAddress?: string | undefined) => {
         ]);
         for (let asset of assets){
             const symbol = await getTokenSymbol(asset.address, sorobanContext);
-            if(symbol === 'native') asset.symbol = 'XLM';
+            if(symbol === 'native') asset.symbol = 'XLM'
+            else asset.symbol = symbol
         }
         getInvestedFunds(vaultAddress);
         const newData: VaultData = {
@@ -182,7 +183,6 @@ export const useVault = (vaultAddress?: string | undefined) => {
         assets.forEach((asset)=>{
             idleFunds.push({address: asset, amount:  Number(rawIdleFunds[asset]) / 10 ** 7})
         })
-        console.log(idleFunds);
         return idleFunds;
         } catch (error) {
         console.error(error);
@@ -196,7 +196,6 @@ export const useVault = (vaultAddress?: string | undefined) => {
         assets.forEach((asset)=>{
             investedFunds.push({address: asset, amount:  Number(rawInvestedFunds[asset]) / 10 ** 7})
         })
-        console.log(investedFunds);
         return investedFunds;
         } catch (error) {
         console.error(error);
diff --git a/apps/dapp/src/providers/modal-provider.tsx b/apps/dapp/src/providers/modal-provider.tsx
index 669ffa29..132e2139 100644
--- a/apps/dapp/src/providers/modal-provider.tsx
+++ b/apps/dapp/src/providers/modal-provider.tsx
@@ -27,10 +27,6 @@ export const ModalProvider = ({
   const [txHash, setTxHash] = React.useState<string>('')
 
   const handleResetModal = () => {
-    console.log('resetting modal')
-    setIsDeployVaultModalOpen(false)
-    setIsInspectVaultModalOpen(false)
-    setIsInteractWithVaultModalOpen(false)
     setIsTransactionStatusModalOpen(false)
     setTransactionStatusModalStep(0)
     setTransactionStatusModalStatus(TransactionStatusModalStatus.PENDING)
@@ -39,23 +35,23 @@ export const ModalProvider = ({
     setTxHash('')
   }
 
+  const handleFirstStep = setTimeout(() => setTransactionStatusModalStep(1), 3000)
   useEffect(() => {
-    const handleFirstStep = setTimeout(() => setTransactionStatusModalStep(1), 3000)
     if (isTransactionStatusModalOpen && transactionStatusModalStep === 0 && transactionStatusModalStatus === TransactionStatusModalStatus.PENDING) {
-      console.log('modal is open')
       handleFirstStep
-    } else {
+    } else if (transactionStatusModalStatus !== TransactionStatusModalStatus.PENDING) {
       clearTimeout(handleFirstStep)
+      setTransactionStatusModalStep(2)
     }
   }, [isTransactionStatusModalOpen, transactionStatusModalStep, transactionStatusModalStatus])
 
   const handleInitModal = () => {
-    console.log('init modal')
     handleResetModal()
     setIsTransactionStatusModalOpen(true)
   }
 
   const handleError = (error: string) => {
+    clearTimeout(handleFirstStep)
     setTransactionStatusModalError(error)
     setTransactionStatusModalStatus(TransactionStatusModalStatus.ERROR)
     setTransactionStatusModalStep(2)
@@ -63,6 +59,7 @@ export const ModalProvider = ({
   }
 
   const handleSuccess = (txHash: string) => {
+    clearTimeout(handleFirstStep)
     setTxHash(txHash)
     setTransactionStatusModalStatus(TransactionStatusModalStatus.SUCCESS)
     setTransactionStatusModalStep(2)
diff --git a/apps/dapp/src/store/lib/features/vaultStore.ts b/apps/dapp/src/store/lib/features/vaultStore.ts
index c09fb6f8..889aa76c 100644
--- a/apps/dapp/src/store/lib/features/vaultStore.ts
+++ b/apps/dapp/src/store/lib/features/vaultStore.ts
@@ -85,6 +85,12 @@ export const newVaultSlice = createSlice({
     pushAmount: ((state, action: PayloadAction<number>) => {
       state.amounts?.push(action.payload);
     }),
+    setAmountByAddress: ((state, action: PayloadAction<{address:string, amount:number}>) => {
+      const index = state.assets.findIndex(asset => asset.address === action.payload.address);
+      if(index !== -1) {
+        state.amounts[index] = action.payload.amount;
+      }
+    }),
     removeAmountByIndex: ((state, action: PayloadAction<number>) => {
       state.amounts?.splice(action.payload, 1);
     }),
@@ -97,7 +103,16 @@ export const newVaultSlice = createSlice({
       state.TVL = action.payload.TVL;
     }),
     resetNewVault: ((state) => {
-      state = initialState;
+      state.address = "";
+      state.emergencyManager = "";
+      state.feeReceiver = "";
+      state.manager = "";
+      state.name = "";
+      state.symbol = "";
+      state.vaultShare = 0;
+      state.assets = [];
+      state.amounts = [];
+      state.TVL = 0;
     }),
   }
 })
@@ -115,7 +130,8 @@ export const {
   removeAmountByIndex,
   resetAssets,
   openEditVault,
-  resetNewVault
+  resetNewVault,
+  setAmountByAddress
 } = newVaultSlice.actions
 
 // Other code such as selectors can use the imported `RootState` type
diff --git a/apps/dapp/src/store/lib/features/walletStore.ts b/apps/dapp/src/store/lib/features/walletStore.ts
index 7c9be113..cfb0d1d3 100644
--- a/apps/dapp/src/store/lib/features/walletStore.ts
+++ b/apps/dapp/src/store/lib/features/walletStore.ts
@@ -5,6 +5,7 @@ import { ChainMetadata } from '@soroban-react/types'
 import vaults from '@/constants/constants.json'
 import { Networks } from '@stellar/stellar-sdk'
 import { SelectedVault, VaultData, WalletState } from '../types'
+import { VaultMethod } from '@/hooks/useVault'
 
 const getDefaultVaults = async (network: string) => {
   const filteredVaults = vaults.filter(vault => {
@@ -88,10 +89,10 @@ export const walletSlice = createSlice({
     setVaults: (state, action: PayloadAction<VaultData[]>) => {
       state.vaults.createdVaults = action.payload
     },
-    setVaultTVL: (state, action: PayloadAction<number>) => {
+    setVaultTVL: (state, action: PayloadAction<{address:string, value: number}>) => {
       state.vaults.createdVaults.forEach(vault => {
-        if (vault.address === state.vaults.selectedVault?.address) {
-          vault.TVL = action.payload
+        if (vault.address === action.payload.address) {
+          vault.TVL = action.payload.value
         }
       })
     },
@@ -112,6 +113,13 @@ export const walletSlice = createSlice({
         }
       })
     },
+    updateVaultData: (state, action: PayloadAction<Partial<VaultData>>) => {
+      state.vaults.createdVaults.forEach(vault => {
+        if (vault.address === action.payload.address) {
+          Object.assign(vault, action.payload)
+        }
+      })
+    },
   },
   extraReducers(builder) {
     builder.addCase(fetchDefaultAddresses.pending, (state) => {
@@ -138,8 +146,9 @@ export const {
   setVaults,
   setVaultTVL,
   resetSelectedVault,
+  setVaultFeeReceiver,
   setVaultUserBalance,
-  setVaultFeeReceiver
+  updateVaultData
 } = walletSlice.actions
 
 // Other code such as selectors can use the imported `RootState` type