Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed balance and vault rendering, updated confirmation checker #10

Merged
merged 1 commit into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix: fixed balance and vault rendering, updated confirmation checker
  • Loading branch information
Polybius93 committed Nov 24, 2023
commit db07032bd978cb2cb854aac9f91a0c393bf035df
Original file line number Diff line number Diff line change
@@ -1,25 +1,36 @@
import { useContext, useState } from "react";

import { Button, VStack } from "@chakra-ui/react";
import { VaultCard } from "@components/vault/vault-card";
import { useVaults } from "@hooks/use-vaults";

import { LockScreenProtocolFee } from "./components/protocol-fee";
import { useContext } from "react";
import { BlockchainContext } from "../../../../providers/blockchain-context-provider";
import { LockScreenProtocolFee } from "./components/protocol-fee";

export function LockScreen(): React.JSX.Element {
const { readyVaults } = useVaults();
const blockchainContext = useContext(BlockchainContext);
const bitcoin = blockchainContext?.bitcoin;
const [isSubmitting, setIsSubmitting] = useState(false);

return (
<VStack w={"300px"} spacing={"15px"}>
<VaultCard vault={readyVaults[0]} isSelected />
<LockScreenProtocolFee assetAmount={readyVaults[0].collateral} />
<Button
isLoading={isSubmitting}
variant={"account"}
onClick={() =>
bitcoin?.fetchBitcoinContractOfferAndSendToUserWallet(readyVaults[0])
}
onClick={async () => {
try {
setIsSubmitting(true);
await bitcoin?.fetchBitcoinContractOfferAndSendToUserWallet(
readyVaults[0],
);
} catch (error) {
setIsSubmitting(false);
throw new Error("Error locking vault");
}
}}
>
Lock BTC
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,17 @@

function getVault(flow: "mint" | "unmint", currentStep: number) {
if (flow === "mint") {
console.log("fundedVaults", fundedVaults[0]);

Check warning on line 54 in src/app/components/mint-unmint/components/transaction-summary/transaction-summary.tsx

View workflow job for this annotation

GitHub Actions / lint-eslint

Unexpected console statement
return currentStep === 2 ? fundingVaults[0] : fundedVaults[0];
} else {
console.log("closedVaults", closedVaults[0]);

Check warning on line 57 in src/app/components/mint-unmint/components/transaction-summary/transaction-summary.tsx

View workflow job for this annotation

GitHub Actions / lint-eslint

Unexpected console statement
return currentStep === 1 ? closingVaults[0] : closedVaults[0];
}
}

useEffect(() => {
setCurrentVault(getVault(flow, currentStep));
}, [flow, currentStep]);

Check warning on line 64 in src/app/components/mint-unmint/components/transaction-summary/transaction-summary.tsx

View workflow job for this annotation

GitHub Actions / lint-eslint

React Hook useEffect has a missing dependency: 'getVault'. Either include it or remove the dependency array

return (
<VStack alignItems={"start"} w={"300px"} spacing={"15px"}>
Expand Down
11 changes: 10 additions & 1 deletion src/app/components/vault/components/vault-information.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ interface VaultInformationProps {
isExpanded: boolean;
isSelectable?: boolean;
isSelected?: boolean;
isSubmitting: boolean;
handleClick: () => void;
handleLock: () => void;
}

export function VaultInformation({
Expand All @@ -29,7 +31,9 @@ export function VaultInformation({
isExpanded,
isSelectable,
isSelected,
isSubmitting,
handleClick,
handleLock,
}: VaultInformationProps): React.JSX.Element {
const date = new Date(timestamp * 1000).toLocaleDateString("en-US");

Expand Down Expand Up @@ -60,7 +64,12 @@ export function VaultInformation({
)}
</VStack>
) : state === VaultState.READY ? (
<Button variant={"vault"} w={"85px"}>
<Button
isLoading={isSubmitting}
onClick={() => handleLock()}
variant={"vault"}
w={"85px"}
>
Lock BTC
</Button>
) : (
Expand Down
25 changes: 22 additions & 3 deletions src/app/components/vault/vault-card.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React, { useState } from "react";
import React, { useContext, useState } from "react";

import { CustomSkeleton } from "@components/custom-skeleton/custom-skeleton";
import { useConfirmationChecker } from "@hooks/use-confirmation-checker";
import { Vault, VaultState } from "@models/vault";

import { BlockchainContext } from "../../providers/blockchain-context-provider";
import { VaultCardLayout } from "./components/vault-card.layout";
import { VaultExpandedInformation } from "./components/vault-expanded-information/vault-expanded-information";
import { VaultInformation } from "./components/vault-information";
Expand All @@ -22,13 +23,29 @@
isSelectable = false,
handleSelect,
}: VaultBoxProps): React.JSX.Element {
const blockchainContext = useContext(BlockchainContext);
const bitcoin = blockchainContext?.bitcoin;

const [isSubmitting, setIsSubmitting] = useState(false);
const [isExpanded, setIsExpanded] = useState(isSelected ? true : false);

async function handleLock(): Promise<void> {
if (!vault) return;
setIsSubmitting(true);
console.log("vault", vault);

Check warning on line 35 in src/app/components/vault/vault-card.tsx

View workflow job for this annotation

GitHub Actions / lint-eslint

Unexpected console statement
try {
await bitcoin?.fetchBitcoinContractOfferAndSendToUserWallet(vault);
} catch (error) {
setIsSubmitting(false);
throw new Error("Error locking vault");
}
}

const confirmations = useConfirmationChecker(
vault?.state === VaultState.FUNDING ? vault?.fundingTX : vault?.closingTX,
vault?.state,
);

const [isExpanded, setIsExpanded] = useState(isSelected ? true : false);

if (!vault) return <CustomSkeleton height={"65px"} />;

return (
Expand All @@ -43,7 +60,9 @@
isExpanded={isExpanded}
isSelected={isSelected}
isSelectable={isSelectable}
isSubmitting={isSubmitting}
handleClick={() => setIsExpanded(!isExpanded)}
handleLock={handleLock}
/>
{isExpanded && (
<VaultExpandedInformation
Expand Down
2 changes: 1 addition & 1 deletion src/app/hooks/use-confirmation-checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
});
bitcoinCurrentBlockHeight = await response.json();
} catch (error) {
console.error(error);

Check warning on line 37 in src/app/hooks/use-confirmation-checker.ts

View workflow job for this annotation

GitHub Actions / lint-eslint

Unexpected console statement
}

let bitcoinTransactionBlockHeight;
Expand Down Expand Up @@ -68,7 +68,7 @@
10000,
) as unknown as number; // Cleanup the interval when the component unmounts
return () => clearInterval(fetchInterval.current);
}, []);
}, [vaultState, txID]);

return memoizedTransactionProgress;
}
17 changes: 14 additions & 3 deletions src/app/hooks/use-ethereum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,13 @@ export function useEthereum(): UseEthereumReturn {
};

fetchBalance();
}, [address, fundedVaults]);
}, [
address,
fundedVaults,
protocolContract,
dlcManagerContract,
dlcBTCContract,
]);

function formatVault(vault: any): Vault {
return {
Expand Down Expand Up @@ -230,7 +236,7 @@ export function useEthereum(): UseEthereumReturn {
(sum: number, vault: Vault) => sum + vault.collateral,
0,
);
setLockedBTCBalance(totalCollateral);
setLockedBTCBalance(Number(totalCollateral.toFixed(4)));
} catch (error) {
throw new Error(`Could not fetch BTC balance: ${error}`);
}
Expand All @@ -239,7 +245,12 @@ export function useEthereum(): UseEthereumReturn {
async function getDLCBTCBalance(): Promise<void> {
try {
if (!dlcBTCContract) throw new Error("Protocol contract not initialized");
setDLCBTCBalance(parseInt(await dlcBTCContract.balanceOf(address)));
const dlcBTCBalance = customShiftValue(
parseInt(await dlcBTCContract.balanceOf(address)),
8,
true,
);
setDLCBTCBalance(dlcBTCBalance);
} catch (error) {
throw new Error(`Could not fetch BTC balance: ${error}`);
}
Expand Down
9 changes: 2 additions & 7 deletions src/app/hooks/use-observer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,18 @@ export function useObserver(
});

protocolContract.on("CloseVault", async (...args) => {
console.log("CloseVault", args);
const vaultOwner: string = args[2];

if (vaultOwner.toLowerCase() !== address) return;

const vaultUUID = args[0];

console.log(`Vault ${vaultUUID} is closing`);

await getVault(vaultUUID).then(() => {
dispatch(mintUnmintActions.setUnmintStep(1));
});
await getVault(vaultUUID);
dispatch(mintUnmintActions.setUnmintStep(1));
});

protocolContract.on("SetStatusFunded", async (...args) => {
console.log("SetStatusFunded", args);
const vaultOwner = args[2];

if (vaultOwner.toLowerCase() !== address) return;
Expand All @@ -67,7 +63,6 @@ export function useObserver(
});

protocolContract.on("PostCloseDLCHandler", async (...args) => {
console.log("PostCloseDLCHandler", args);
const vaultOwner = args[2];

if (vaultOwner.toLowerCase() !== address) return;
Expand Down
8 changes: 4 additions & 4 deletions src/app/hooks/use-vaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,28 @@ export function useVaults(): {
() =>
vaults
.filter((vault) => vault.state === VaultState.FUNDED)
.sort((a, b) => a.timestamp - b.timestamp),
.sort((a, b) => b.timestamp - a.timestamp),
[vaults],
);
const fundingVaults = useMemo(
() =>
vaults
.filter((vault) => vault.state === VaultState.FUNDING)
.sort((a, b) => a.timestamp - b.timestamp),
.sort((a, b) => b.timestamp - a.timestamp),
[vaults],
);
const closingVaults = useMemo(
() =>
vaults
.filter((vault) => vault.state === VaultState.CLOSING)
.sort((a, b) => a.timestamp - b.timestamp),
.sort((a, b) => b.timestamp - a.timestamp),
[vaults],
);
const closedVaults = useMemo(
() =>
vaults
.filter((vault) => vault.state === VaultState.CLOSED)
.sort((a, b) => a.timestamp - b.timestamp),
.sort((a, b) => b.timestamp - a.timestamp),
[vaults],
);

Expand Down
Loading