From 50fccb095b4839001e5f0dc196873409782c166d Mon Sep 17 00:00:00 2001 From: pietro-maximoff Date: Wed, 15 Nov 2023 08:28:36 +0100 Subject: [PATCH 1/2] chore: SOV-3365 --- .../hooks/useGetMaximumFirstRolloverDate.ts | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/apps/frontend/src/app/5_pages/BorrowPage/components/NewLoanForm/hooks/useGetMaximumFirstRolloverDate.ts b/apps/frontend/src/app/5_pages/BorrowPage/components/NewLoanForm/hooks/useGetMaximumFirstRolloverDate.ts index 511172f57..9fb12fc55 100644 --- a/apps/frontend/src/app/5_pages/BorrowPage/components/NewLoanForm/hooks/useGetMaximumFirstRolloverDate.ts +++ b/apps/frontend/src/app/5_pages/BorrowPage/components/NewLoanForm/hooks/useGetMaximumFirstRolloverDate.ts @@ -10,10 +10,9 @@ import { SECONDS_IN_YEAR, } from '../../../../../../constants/general'; import { useGetRBTCPrice } from '../../../../../../hooks/zero/useGetRBTCPrice'; -import { decimalic } from '../../../../../../utils/math'; +import { decimalic, fromWei } from '../../../../../../utils/math'; import { useGetBorrowingAPR } from '../../../hooks/useGetBorrowingAPR'; import { useGetCollateralAssetPrice } from '../../../hooks/useGetCollateralAssetPrice'; -import { DEFAULT_LOAN_DURATION } from '../NewLoanForm.constants'; export const useGetMaximumFirstRolloverDate = ( collateralAmount: Decimal, @@ -49,12 +48,6 @@ export const useGetMaximumFirstRolloverDate = ( !borrowAmount || borrowAmount.isZero() ? Decimal.ZERO : borrowAmount, ); - // const apr = useMemo( - // () => Decimal.fromBigNumberString(borrowApr).div(100), - // [borrowApr], - // ); - - // TODO: Validate with light, this is just the best effort implementation const result = useMemo( () => Decimal.from(-1) @@ -70,18 +63,10 @@ export const useGetMaximumFirstRolloverDate = ( .add(borrowAmount), ) .sub(1) - .div(Decimal.fromBigNumberString(borrowApr.toString())), + .div(Decimal.from(fromWei(borrowApr))), ), [borrowAmount, borrowApr, collateralAmount, collateralPriceInLoanAsset], ); - const daysInFuture = useMemo( - () => - Math.floor(result.toNumber()) < DEFAULT_LOAN_DURATION - ? DEFAULT_LOAN_DURATION - : Math.floor(result.toNumber()), - [result], - ); - - return dayjs().add(daysInFuture, 'day').unix(); + return dayjs().add(result.toNumber(), 'month').unix(); }; From 1f7a66a18536f7a23a0bbbfa73b8398b3989ac73 Mon Sep 17 00:00:00 2001 From: Pietro Maximoff <74987028+pietro-maximoff@users.noreply.github.com> Date: Wed, 15 Nov 2023 08:29:53 +0100 Subject: [PATCH 2/2] Create nervous-onions-arrive.md --- .changeset/nervous-onions-arrive.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nervous-onions-arrive.md diff --git a/.changeset/nervous-onions-arrive.md b/.changeset/nervous-onions-arrive.md new file mode 100644 index 000000000..6e46c9362 --- /dev/null +++ b/.changeset/nervous-onions-arrive.md @@ -0,0 +1,5 @@ +--- +"frontend": patch +--- + +SOV-3365: Fix "Max duration" for new fixed interest loans