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
33 changes: 28 additions & 5 deletions src/app/swap/__components__/swapCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import wallet from "@/assets/wallet.svg";
import { formatNumber, inputPatternMatch } from "@/lib/utils";
import { TToken } from "@/lib/types";
import { useGetBalance } from "@/lib/hooks/useGetBalance";
import { formatUnits } from "viem";
import { formatUnits, parseUnits, zeroAddress } from "viem";
import DisplayFormattedNumber from "@/components/shared/displayFormattedNumber";
import { useGetMarketQuote } from "@/lib/hooks/useGetMarketQuote";
import { useChainId } from "wagmi";
import { convertETHToWETHIfApplicable } from "@/utils";

interface Props {
value: string;
Expand All @@ -28,7 +32,15 @@ export default function SwapCard({
setValue,
disabled,
}: Props) {
const chainId = useChainId();
const { balance } = useGetBalance(token?.address, 15000);
const { quote } = useGetMarketQuote({
tokenAddress: convertETHToWETHIfApplicable(
token?.address ?? zeroAddress,
chainId
),
value: parseUnits(value, token?.decimals ?? 18),
});
// const { quote } = useGetMarketQuote({
// tokenAddress: convertETHToWETHIfApplicable(token?.address ?? zeroAddress),
// value: balance,
Expand Down Expand Up @@ -80,14 +92,25 @@ export default function SwapCard({
</button>
</div>
<div className="flex justify-between">
<span className="text-sm text-[#CCCCCC]">${formatNumber(4)}</span>
<span className="text-sm text-[#CCCCCC]">
$
<DisplayFormattedNumber
num={formatNumber(formatUnits(quote[0], 18))}
/>
</span>
<div className="flex gap-x-4">
<div className="flex gap-x-1">
<Image src={wallet} alt="Wallet" />
<span>
{token === null
? 0
: formatNumber(formatUnits(balance, token?.decimals ?? 18))}
{token === null ? (
0
) : (
<DisplayFormattedNumber
num={formatNumber(
formatUnits(balance, token?.decimals ?? 18)
)}
/>
)}
</span>
</div>
{token !== null && (
Expand Down
33 changes: 28 additions & 5 deletions src/app/swap/__components__/swapDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { formatNumber } from "@/lib/utils";
import DisplayFormattedNumber from "@/components/shared/displayFormattedNumber";
import { convertETHToWETHIfApplicable, determinePriceImpact } from "@/utils";
import { useGetBalanceOf } from "@/lib/hooks/useGetBalance";
import { useChainId } from "wagmi";

interface Props {
amountIn: bigint;
Expand All @@ -27,10 +28,19 @@ export default function SwapDetails({
token1,
pair = zeroAddress,
}: Props) {
const chainId = useChainId();
const [open, setOpen] = useState(false);
const [slippage] = useAtom(slippageAtom);
const { balance: balance0 } = useGetBalanceOf(pair, token0.address, 30000);
const { balance: balance1 } = useGetBalanceOf(pair, token1.address, 30000);
const { balance: balance0 } = useGetBalanceOf(
pair,
convertETHToWETHIfApplicable(token0.address, chainId),
30000
);
const { balance: balance1 } = useGetBalanceOf(
pair,
convertETHToWETHIfApplicable(token1.address, chainId),
30000
);

const [, setDialogOpen] = useAtom(settingDialogOpenAtom);

Expand All @@ -46,7 +56,7 @@ export default function SwapDetails({
return { min, per: per.toPrecision(4) };
}, [amountIn, amountOut, slippage, token0.decimals, token1.decimals]);
const { quote } = useGetMarketQuote({
tokenAddress: convertETHToWETHIfApplicable(token1.address),
tokenAddress: convertETHToWETHIfApplicable(token1.address, chainId),
value: amountOut,
});

Expand All @@ -70,7 +80,14 @@ export default function SwapDetails({
<div className="text-[13px] border border-neutral-800 rounded-[16px] p-1 md:p-4 space-y-4">
<Row
title="Received Value"
value={`$${formatNumber(formatUnits(quote[0], 18), 4)}`}
value={
<>
$
<DisplayFormattedNumber
num={formatNumber(formatUnits(quote[0], 18), 4)}
/>
</>
}
/>
<Row
title="Exchange Rate"
Expand Down Expand Up @@ -112,7 +129,13 @@ export default function SwapDetails({
>
<Row
title="Minumum Receieved"
value={formatUnits(min, token1.decimals)}
value={
<div>
<DisplayFormattedNumber
num={formatNumber(formatUnits(min, token1.decimals), 4)}
/>
</div>
}
info="Info"
/>
{/* <Row title="Fee" value="$23.44" info="Info" /> */}
Expand Down
2 changes: 1 addition & 1 deletion src/app/voting/__components__/voteRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default function VoteRow({
type="number"
min={0}
max={100}
value={allocations[pool.address.toLowerCase() as Address] || 0}
value={allocations[pool.address.toLowerCase() as Address] || ""}
onChange={(e) => {
const value = !isNaN(e.target.valueAsNumber)
? e.target.valueAsNumber
Expand Down
7 changes: 1 addition & 6 deletions src/lib/hooks/useGetMarketQuote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@ import { zeroAddress } from "viem";

// Quote is in USD
export function useGetMarketQuote({
disabled,
tokenAddress,
value,
staleTime = 0,
refetchInterval = false,
}: {
tokenAddress: `0x${string}`;
value: bigint;
staleTime?: number;
disabled?: boolean;
refetchInterval?: false | number;
}) {
const chainId = useChainId();
Expand All @@ -30,8 +26,7 @@ export function useGetMarketQuote({
functionName: "getAverageValueInUSD",
args: [tokenAddress, value],
query: {
staleTime,
enabled: tokenAddress !== zeroAddress && !disabled,
enabled: tokenAddress !== zeroAddress,
refetchInterval,
},
});
Expand Down
3 changes: 2 additions & 1 deletion src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export function determinePriceImpact(
// Market price => token0 / token1
const currentPrice = _reserve0 / _reserve1;
const pricePaid = _amountIn / _amountOut;
const _ratio = (pricePaid - currentPrice) / currentPrice;
const _ratio =
currentPrice > 0 ? (pricePaid - currentPrice) / currentPrice : 0;
return _ratio * 100;
}