From 00ccbf835d8b92c8c5f8fa7c8370fe738c0df323 Mon Sep 17 00:00:00 2001
From: Polybius93 <adam.daniel.puskas@polybius-studios.com>
Date: Mon, 8 Apr 2024 12:47:18 +0200
Subject: [PATCH] feat: modify getvault and getallvaults function contract,
 update minor visuals

---
 .../transaction-summary.tsx                   |  6 +++---
 .../successful-flow-modal.tsx                 |  2 +-
 .../proof-of-reserve/proof-of-reserve.tsx     |  2 +-
 src/app/hooks/use-ethereum.ts                 | 19 +++++++++++--------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/app/components/mint-unmint/components/transaction-summary/transaction-summary.tsx b/src/app/components/mint-unmint/components/transaction-summary/transaction-summary.tsx
index be460e45..e5380ac9 100644
--- a/src/app/components/mint-unmint/components/transaction-summary/transaction-summary.tsx
+++ b/src/app/components/mint-unmint/components/transaction-summary/transaction-summary.tsx
@@ -19,8 +19,8 @@ interface FlowPropertyMap {
 
 const flowPropertyMap: FlowPropertyMap = {
   mint: {
-    2: { title: 'a) Locking BTC in progress', subtitle: 'Minting dlcBTC' },
-    3: { title: 'Minted dlcBTC' },
+    3: { title: 'a) Locking BTC in progress', subtitle: 'Minting dlcBTC' },
+    4: { title: 'Minted dlcBTC' },
   },
   unmint: {
     1: {
@@ -50,7 +50,7 @@ export function TransactionSummary({
   const currentVault = allVaults.find(vault => vault.uuid === currentStep[1]);
 
   const showProcessing =
-    (flow === 'mint' && currentStep[0] === 2) || (flow === 'unmint' && currentStep[0] === 1);
+    (flow === 'mint' && currentStep[0] === 3) || (flow === 'unmint' && currentStep[0] === 1);
 
   return (
     <VStack alignItems={'start'} w={'300px'} spacing={'15px'}>
diff --git a/src/app/components/modals/successful-flow-modal/successful-flow-modal.tsx b/src/app/components/modals/successful-flow-modal/successful-flow-modal.tsx
index 2de11794..9d3e9a3a 100644
--- a/src/app/components/modals/successful-flow-modal/successful-flow-modal.tsx
+++ b/src/app/components/modals/successful-flow-modal/successful-flow-modal.tsx
@@ -17,7 +17,7 @@ export function SuccessfulFlowModal({
   return (
     <ModalLayout title={'Success!'} isOpen={isOpen} onClose={() => handleClose()}>
       <TransactionSummary
-        currentStep={[flow === 'mint' ? 3 : 2, vaultUUID]}
+        currentStep={[flow === 'mint' ? 4 : 2, vaultUUID]}
         flow={flow}
         blockchain={'ethereum'}
         handleClose={() => handleClose()}
diff --git a/src/app/components/proof-of-reserve/proof-of-reserve.tsx b/src/app/components/proof-of-reserve/proof-of-reserve.tsx
index d3e5395e..5b8d8f87 100644
--- a/src/app/components/proof-of-reserve/proof-of-reserve.tsx
+++ b/src/app/components/proof-of-reserve/proof-of-reserve.tsx
@@ -18,7 +18,7 @@ export function ProofOfReserve(): React.JSX.Element {
   return (
     <ProofOfReserveLayout>
       <Text w={'100%'} px={'35px'} color={'white'} fontSize={'4xl'} fontWeight={600}>
-        My Vaults
+        Proof of Reserve
       </Text>
       <TokenStatsBoardLayout>
         <TokenStatsBoardTVL totalSupply={totalSupply} bitcoinPrice={bitcoinPrice} />
diff --git a/src/app/hooks/use-ethereum.ts b/src/app/hooks/use-ethereum.ts
index d6a956f8..1c3e98c1 100644
--- a/src/app/hooks/use-ethereum.ts
+++ b/src/app/hooks/use-ethereum.ts
@@ -44,7 +44,7 @@ export function throwEthereumError(message: string, error: any): void {
 
 export function useEthereum(): UseEthereumReturnType {
   const { vaults } = useContext(VaultContext);
-  const { protocolContract, dlcBTCContract } = useEthereumContext();
+  const { protocolContract, dlcBTCContract, observerProtocolContract } = useEthereumContext();
 
   const { address, network } = useSelector((state: RootState) => state.account);
 
@@ -127,9 +127,9 @@ export function useEthereum(): UseEthereumReturnType {
 
   async function getAllVaults(): Promise<void> {
     try {
-      if (!protocolContract) throw new Error('Protocol contract not initialized');
-      await protocolContract.callStatic.getAllVaultsForAddress(address);
-      const vaults: RawVault[] = await protocolContract.getAllVaultsForAddress(address);
+      if (!observerProtocolContract) throw new Error('Protocol contract not initialized');
+      await observerProtocolContract.callStatic.getAllVaultsForAddress(address);
+      const vaults: RawVault[] = await observerProtocolContract.getAllVaultsForAddress(address);
       const formattedVaults: Vault[] = vaults.map(formatVault);
       if (!network) return;
       store.dispatch(
@@ -151,8 +151,8 @@ export function useEthereum(): UseEthereumReturnType {
   ): Promise<void> {
     for (let i = 0; i < maxRetries; i++) {
       try {
-        if (!protocolContract) throw new Error('Protocol contract not initialized');
-        const vault: RawVault = await protocolContract.getVault(vaultUUID);
+        if (!observerProtocolContract) throw new Error('Protocol contract not initialized');
+        const vault: RawVault = await observerProtocolContract.getVault(vaultUUID);
         if (!vault) throw new Error('Vault is undefined');
         if (vault.status !== vaultState) throw new Error('Vault is not in the correct state');
         const formattedVault: Vault = formatVault(vault);
@@ -177,8 +177,11 @@ export function useEthereum(): UseEthereumReturnType {
   async function getAllFundedVaults(ethereumNetwork: EthereumNetwork): Promise<RawVault[]> {
     try {
       const dlcManagerContract = await getDefaultProvider(ethereumNetwork, 'DLCManager');
-      const vaults: RawVault[] = await dlcManagerContract.getFundedDLCs(0, 1000000);
-      return vaults;
+      const vaults: RawVault[] = await dlcManagerContract.getFundedDLCs(0, 10000);
+      const filteredVaults = vaults.filter(
+        vault => vault.uuid != '0x0000000000000000000000000000000000000000000000000000000000000000'
+      );
+      return filteredVaults;
     } catch (error) {
       throw new EthereumError(`Could not fetch Funded Vaults: ${error}`);
     }