From 45731cc0573315b62c4cf555e5df5ff41f83732e Mon Sep 17 00:00:00 2001 From: aptt Date: Tue, 4 Feb 2025 10:28:31 +0100 Subject: [PATCH] =?UTF-8?q?feat(dev-frontend):=20=F0=9F=8E=B8=20replace=20?= =?UTF-8?q?redemption=20details=20w/=20plain=20info=20text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/RedeemHchf/RedeemHchf.tsx | 83 +------------------ 1 file changed, 1 insertion(+), 82 deletions(-) diff --git a/packages/dev-frontend/src/components/RedeemHchf/RedeemHchf.tsx b/packages/dev-frontend/src/components/RedeemHchf/RedeemHchf.tsx index 10f6d8fac..9e4046337 100644 --- a/packages/dev-frontend/src/components/RedeemHchf/RedeemHchf.tsx +++ b/packages/dev-frontend/src/components/RedeemHchf/RedeemHchf.tsx @@ -15,7 +15,6 @@ import { LoadingButton } from "../LoadingButton"; import { EditableRow } from "../Trove/Editor"; import { ErrorDescription } from "../ErrorDescription"; import { useConstants } from "../../hooks/constants"; -import { InfoIcon } from "../InfoIcon"; const TRANSACTION_ID = "trove-adjustment"; @@ -92,64 +91,6 @@ export const RedeemHchf: React.FC = () => { const editingState = useState(); - const [areRedemptionDetailsLoading, setAreRedemptionDetailsLoading] = useState(false); - const [redemptionDetails, setRedemptionDetails] = useState< - | (ReturnType & { redemptionFeePercent: Percent }) - | null - >(); - useEffect(() => { - let mounted = true; - setRedemptionDetails(null); - setAreRedemptionDetailsLoading(true); - - if (amountOfHchfToRedeem.isZero) { - setRedemptionDetails(null); - setAreRedemptionDetailsLoading(false); - return; - } - - Promise.all([ - liquity.getFees(), - liquity.getTotal(), - liquity.getTroves({ sortedBy: "ascendingCollateralRatio", first: 1000, startingAt: 0 }) - ]) - - .then(([fees, total, troves]) => { - if (!mounted) { - return; - } - - const redeemedFractionOfSupply = amountOfHchfToRedeem.div(total.debt); - const redemptionFee = fees.redemptionRate(redeemedFractionOfSupply); - const redemptionDetails = getRedemptionDetails({ - redeemedHchf: amountOfHchfToRedeem, - redemptionFee, - totalHbar: total.collateral, - totalHchf: total.debt, - sortedTroves: troves - }); - - if (!redemptionDetails) { - setRedemptionDetails(null); - setAreRedemptionDetailsLoading(false); - return; - } - - const redemptionFeePercent = new Percent(redemptionFee); - const extendedRedemptionDetails = { - ...redemptionDetails, - redemptionFeePercent - }; - - setRedemptionDetails(extendedRedemptionDetails); - setAreRedemptionDetailsLoading(false); - }); - - return () => { - mounted = false; - }; - }, [liquity, amountOfHchfToRedeem]); - return ( { )} - } - > - {redemptionDetails ? ( - <> - You will redeem {redemptionDetails.redeemedHchf.prettify(2)} HCHF for{" "} - {redemptionDetails.receivedHbar.prettify(2)} HBAR for a fee of{" "} - {redemptionDetails.redemptionFeeInHbar.prettify(2)} HBAR ( - {redemptionDetails.redemptionFeePercent.prettify()}). - - These numbers are an approximation. -
- {redemptionInformation} - - } - /> - - ) : ( - redemptionInformation - )} -
+ {redemptionInformation} {needsSpenderApproval && !hchfContractHasHchfTokenAllowance ? (