Skip to content
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
27 changes: 4 additions & 23 deletions src/providers/MemberData.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import { useAccount, useContractReads } from "wagmi";
import { createContext, useContext } from "react";

import {
STALE_TIME,
CACHE_TIME,
DUST_THRESHOLD,
ZERO,
ZERO_ADDRESS,
} from "constants";
import { STALE_TIME, CACHE_TIME, ZERO, ZERO_ADDRESS } from "constants";
import { useVersion, Versions } from "./Version";
import useContract from "hooks/useContract";
import { calculateMinPayment } from "utils/numbers";
Expand Down Expand Up @@ -59,10 +53,6 @@ const selectMemberData = (data) => {
rewardsMultiplier,
};

if (creditLimit.lt(DUST_THRESHOLD)) {
result.creditLimit = ZERO;
}

if (owed.gt(ZERO)) {
result.minPayment = calculateMinPayment(interest);
}
Expand Down Expand Up @@ -122,10 +112,7 @@ export function useMemberData(address, chainId) {
},
{
...comptrollerContract,
functionName:
version === Versions.V1
? "calculateRewardsByBlocks"
: "calculateRewards",
functionName: version === Versions.V1 ? "calculateRewardsByBlocks" : "calculateRewards",
args:
version === Versions.V1
? [address, daiContract.address, ZERO]
Expand Down Expand Up @@ -227,11 +214,7 @@ export function useMemberData(address, chainId) {
};
}

export default function MemberData({
chainId,
children,
address: addressProp,
}) {
export default function MemberData({ chainId, children, address: addressProp }) {
const { address: connectedAddress } = useAccount();

const address = addressProp || connectedAddress;
Expand All @@ -241,9 +224,7 @@ export default function MemberData({
const pollResp = usePollMemberData(address, chainId);

return (
<MemberContext.Provider
value={{ ...resp, data: { ...resp.data, ...pollResp.data } }}
>
<MemberContext.Provider value={{ ...resp, data: { ...resp.data, ...pollResp.data } }}>
{children}
</MemberContext.Provider>
);
Expand Down
13 changes: 6 additions & 7 deletions src/utils/format.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import { formatUnits } from "ethers/lib/utils";
import { DUST_THRESHOLD, ZERO } from "constants";
import { BigNumber } from "ethers";

export default function format(
n,
digits = 2,
rounded = true,
stripTrailingZeros = false
stripTrailingZeros = false,
formatDust = true
) {
if (!n) n = "0";
if (formatDust && n instanceof BigNumber && n.lt(DUST_THRESHOLD) && n.gt(ZERO)) return "<0.01";
return commify(Number(formatUnits(n)), digits, rounded, stripTrailingZeros);
}

Expand All @@ -19,12 +23,7 @@ export const compactFormattedNumber = (n) => {
return formatter.format(formatUnits(n));
};

export function commify(
num,
digits,
rounded = true,
stripTrailingZeros = false
) {
export function commify(num, digits, rounded = true, stripTrailingZeros = false) {
num = Number(num);
num = num <= 0 ? 0 : num;

Expand Down
9 changes: 3 additions & 6 deletions src/utils/numbers.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const calculateMaxBorrow = (creditLimit, originationFee) => {
};

export const calculateMinPayment = (interest) => {
const floor = parseEther("0.1");
const floor = parseEther("0.01");
const interestWithMargin = interest.mul(10010).div(10000);
return interestWithMargin.lt(floor) ? floor : interestWithMargin;
};
Expand All @@ -79,10 +79,7 @@ export const calculateExpectedMinimumPayment = (
borrowRatePerBlock,
overdueBlocks
) => {
const floor = parseEther("0.1");
const minimumPayment = borrowAmount
.mul(borrowRatePerBlock)
.mul(overdueBlocks)
.div(WAD);
const floor = parseEther("0.01");
const minimumPayment = borrowAmount.mul(borrowRatePerBlock).mul(overdueBlocks).div(WAD);
return minimumPayment.lt(floor) ? floor : minimumPayment;
};