Skip to content

Patch #107

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.

Sign up for GitHub

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

Merged
kingsley-einstein merged 2 commits into from
Jul 19, 2025
Merged

Patch #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b405c4
chore: updates
kingsley-einstein Jul 19, 2025
538cf96
chore: updates
kingsley-einstein Jul 19, 2025
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"@visx/tooltip": "^3.12.0",
"@visx/vendor": "^3.12.0",
"@visx/xychart": "^3.12.0",
"@visx/zoom": "^3.12.0",
"@wagmi/core": "^2.16.4",
"bignumber.js": "^9.1.2",
"class-variance-authority": "^0.7.1",
Expand Down
40 changes: 40 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

149 changes: 108 additions & 41 deletions src/app/liquidity/add-liquidity/__components__/main/addLiquidityV3.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {
tickToPrice,
useGetTokenInfo,
} from "@/utils";
import { Check, Minus, Plus } from "lucide-react";
import { Check, Minus, Plus, RefreshCcw, ZoomIn, ZoomOut } from "lucide-react";
import { useRouter, useSearchParams } from "next/navigation";
import React, { useCallback, useEffect, useMemo, useState } from "react";
import {
Expand Down Expand Up @@ -346,13 +346,12 @@ export default function AddLiquidityV3() {

const tickLower = useMemo(() => {
if (!asset0 || !asset1) return 0;
const sqrtPrice =
slot0Data[0] !== 0n
? Number(slot0Data[0]) / 2 ** 96
: Number(sqrtPriceX96Min) / 2 ** 96;

const sqrtPrice = Number(sqrtPriceX96Min) / 2 ** 96;
const currentTick = slot0Data[1];
if (currentTick)
return nearestUsableTick(tickSpacing, currentTick - tickSpacing);
if (sqrtPrice > 0) {
const nearestTick = nearestUsableTick(
return nearestUsableTick(
tickSpacing,
sqrtPriceToTick(
sqrtPrice,
Expand All @@ -361,20 +360,18 @@ export default function AddLiquidityV3() {
asset1?.decimals
)
);
return nearestUsableTick(tickSpacing, nearestTick - tickSpacing);
}
return 0;
}, [asset0, asset1, slot0Data, sqrtPriceX96Min, tickSpacing]);

const tickUpper = useMemo(() => {
if (!asset0 || !asset1) return 0;
const sqrtPrice =
slot0Data[0] !== 0n
? Number(slot0Data[0]) / 2 ** 96
: Number(sqrtPriceX96Max) / 2 ** 96;

const sqrtPrice = Number(sqrtPriceX96Max) / 2 ** 96;
const currentTick = slot0Data[1];
if (currentTick > 0)
return nearestUsableTick(tickSpacing, currentTick + tickSpacing);
if (sqrtPrice > 0) {
const nearestTick = nearestUsableTick(
return nearestUsableTick(
tickSpacing,
sqrtPriceToTick(
sqrtPrice,
Expand All @@ -383,8 +380,6 @@ export default function AddLiquidityV3() {
asset1?.decimals
)
);

return nearestUsableTick(tickSpacing, nearestTick + tickSpacing);
}
return 0;
}, [asset0, asset1, slot0Data, sqrtPriceX96Max, tickSpacing]);
Expand Down Expand Up @@ -798,6 +793,38 @@ export default function AddLiquidityV3() {
});
}, [priceXData, priceYData]);

// Chart controls
const [xDomain, setXDomain] = useState<[number, number]>([0, 100]);
const zoomX = useCallback(
(factor: number) => {
const [min, max] = xDomain;
const center = (min + max) / 2;
const range = (max - min) / factor;
setXDomain([center - range / 2, center + range / 2]);
},
[xDomain]
);
const resetX = useCallback(
() =>
setXDomain([
Math.min(
...mergedDataXY
.filter(
(d) => (d.priceX > 0 && d.priceY > 0) || d.matchesCurrentTick
)
.map((d) => d.priceX)
),
Math.max(
...mergedDataXY
.filter(
(d) => (d.priceX > 0 && d.priceY > 0) || d.matchesCurrentTick
)
.map((d) => d.priceX)
),
]),
[mergedDataXY]
);

// useEffect(() => {
// if (maxPrice < minPrice) {
// setMaxPrice(minPrice + 1);
Expand Down Expand Up @@ -866,7 +893,29 @@ export default function AddLiquidityV3() {
setMinPrice(tickToPrice(tickLower, BASIS_POINT));
setMaxPrice(tickToPrice(tickUpper, BASIS_POINT));
}
}, [slot0Data, tickLower, tickUpper]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [slot0Data]);

useEffect(
() =>
setXDomain([
Math.min(
...mergedDataXY
.filter(
(d) => (d.priceX > 0 && d.priceY > 0) || d.matchesCurrentTick
)
.map((d) => d.priceX)
),
Math.max(
...mergedDataXY
.filter(
(d) => (d.priceX > 0 && d.priceY > 0) || d.matchesCurrentTick
)
.map((d) => d.priceX)
),
]),
[mergedDataXY]
);

const { width: windowWidth = 0 } = useWindowDimensions();

Expand Down Expand Up @@ -1092,10 +1141,30 @@ export default function AddLiquidityV3() {
className="w-full lg:w-[760px] space-y-6 self-stretch"
>
<Card bg="950" className="py-2">
<div className="flex justify-between">
<div className="flex justify-between items-start">
<div>
<span className="text-[#8062f1]">RANGE</span> VISUALIZER
</div>
<div className="flex justify-center items-center gap-2">
<button
onClick={() => zoomX(2)}
className="text-xl rounded-full flex items-center justify-center"
>
<ZoomIn size={18} />
</button>
<button
onClick={() => zoomX(0.5)}
className="text-xl rounded-full flex items-center justify-center"
>
<ZoomOut size={18} />
</button>
<button
onClick={resetX}
className="text-xl rounded-full flex items-center justify-center"
>
<RefreshCcw size={18} />
</button>
</div>
</div>
</Card>
<div className="flex justify-start w-full items-center gap-3">
Expand All @@ -1122,6 +1191,7 @@ export default function AddLiquidityV3() {
maxPrice={maxPrice}
onMinPriceChange={setMinPrice}
onMaxPriceChange={setMaxPrice}
xDomain={xDomain}
/>
<div>
<Card border="900" bg="950">
Expand Down Expand Up @@ -1233,29 +1303,26 @@ function PriceInput({
<label htmlFor="">{label || "Price"}</label>
</div>
<Card bg="950" border="none" className="py-2">
<div className="flex justify-between items-center">
<div className="flex items-center gap-x-2">
<button
onClick={() => onChange(value + 1)}
disabled={disabled}
className="border-white text-xl border rounded-full flex items-center justify-center h-6 w-6"
>
<Plus />
</button>
<Input
disabled={disabled}
min={min}
max={max}
className="h-8 w-20 outline-none"
placeholder="0"
textSize={"lg"}
variant={"transparent"}
value={value}
type="number"
onChange={(e) => onChange(e.target.valueAsNumber || 0)}
/>
</div>

<div className="flex items-center gap-x-2 justify-center w-full">
<button
onClick={() => onChange(value + 1)}
disabled={disabled}
className="border-white text-xl border rounded-full flex items-center justify-center h-6 w-6"
>
<Plus />
</button>
<Input
disabled={disabled}
min={min}
max={max}
className="h-8 flex-1 outline-none"
placeholder="0"
textSize={"lg"}
variant={"transparent"}
value={value}
type="number"
onChange={(e) => onChange(e.target.valueAsNumber || 0)}
/>
<button
disabled={disabled}
onClick={() => {
Expand Down
32 changes: 10 additions & 22 deletions src/components/ui/charts/RangeVisualizationChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface Props {
maxPrice?: number;
onMinPriceChange?: (minPrice: number) => void;
onMaxPriceChange?: (maxPrice: number) => void;
xDomain?: [number, number];
}

function PercentageChangeIndicator({
Expand Down Expand Up @@ -146,6 +147,7 @@ export default function RangeVisualizationChart({
maxPrice = 0,
onMinPriceChange,
onMaxPriceChange,
xDomain = [0, 100],
}: Props) {
const [refHeight, setRefHeight] = useState(0);
const [refWidth, setRefWidth] = useState(0);
Expand All @@ -158,43 +160,29 @@ export default function RangeVisualizationChart({
}, []);

const brushRef = useRef<BaseBrush | null>(null);

const filteredPriceData = useMemo(
() =>
priceData.filter(
(p) => (p.priceY > 0 && p.priceX > 0) || p.matchesCurrentTick
),
[priceData]
);
const priceScaleX = useMemo(
() =>
scaleLinear({
range: [0, refWidth],
domain: [
Math.min(...filteredPriceData.map((datum) => datum.priceX)),
Math.max(...filteredPriceData.map((datum) => datum.priceX)),
],
domain: xDomain,
nice: true,
}),
[filteredPriceData, refWidth]
[refWidth, xDomain]
);

const priceScaleY = useMemo(
() =>
scaleLinear({
range: [refHeight - allRoundMargin * 3, 0],
domain: [
0,
Math.max(...filteredPriceData.map((datum) => datum.priceY)),
],
domain: [0, Math.max(...priceData.map((datum) => datum.priceY))],
nice: true,
}),
[filteredPriceData, refHeight]
[priceData, refHeight]
);

const currentTickData = useMemo(
() => filteredPriceData.find((p) => p.matchesCurrentTick),
[filteredPriceData]
() => priceData.find((p) => p.matchesCurrentTick),
[priceData]
);

const initialBrushPosition = useMemo(
Expand Down Expand Up @@ -255,7 +243,7 @@ export default function RangeVisualizationChart({

return (
<div className="w-full bg-[#16161d]">
{filteredPriceData.length > 0 ? (
{priceData.length > 0 ? (
<svg width={width} height={height}>
<rect
x={0}
Expand Down Expand Up @@ -300,7 +288,7 @@ export default function RangeVisualizationChart({
</Group> */}
<Group top={allRoundMargin / 2}>
<AreaClosed
data={filteredPriceData}
data={priceData}
x={(d) => priceScaleX(d.priceX)}
y={(d) => priceScaleY(d.priceY)}
yScale={priceScaleY}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const TableBody = forwardRef<
TableBody.displayName = "TableBody";

const tableVariants = cva(
"grid hover:border-[#43444C] border transition-colors border-transparent items-center group text-sm text-right hover:bg-[#303136] gap-x-4 py-[10px] bg-neutral-1000 px-4 rounded-md",
"grid hover:border-[#43444C] border transition-colors border-transparent items-center group text-sm text-right gap-x-4 py-[10px] bg-neutral-1000 px-4 rounded-md",
{
variants: {
cols: {
Expand Down