Skip to content

Dev to main #33

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
JamesDev292 merged 2 commits into from
Sep 19, 2025
Merged

Dev to main #33

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
f4127dd
fix bug max button farm
JamesDev292 Sep 19, 2025
53dc5d2
Merge pull request #32 from intuition-box/feat/pool-page
JamesDev292 Sep 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
3 changes: 1 addition & 2 deletions apps/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>TrustSwap</title>
<script
async
defer
Expand Down
56 changes: 39 additions & 17 deletions apps/web/src/features/pool/components/cells/StakeClaimCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { useAccount, usePublicClient } from "wagmi";
import { erc20Abi, formatUnits, parseUnits } from "viem";
import styles from "../../pools.module.css";

const LP_DECIMALS = 18; // Uniswap V2 LP tokens sont en 18 décimales
const LP_DECIMALS = 18; // LP tokens = 18
const UI_DECIMALS = 6; // affichage/saisie UI

export function StakeClaimCellContent({
pool,
Expand All @@ -22,16 +23,15 @@ export function StakeClaimCellContent({
const { stake, withdraw } = useStakeActions(stakingAddr);

const stakedLpBn = pool.stakedBalance ?? 0n;


const walletLpBn = useWalletLpFallback(pool.walletLpBalance, pool.pair);

// ⬇️ format “floor” (pas de Number/toFixed)
const walletLpStr = useMemo(
() => safeFormat(walletLpBn, LP_DECIMALS),
() => formatUnitsFloor(walletLpBn, LP_DECIMALS, UI_DECIMALS),
[walletLpBn]
);
const stakedLpStr = useMemo(
() => safeFormat(stakedLpBn, LP_DECIMALS),
() => formatUnitsFloor(stakedLpBn, LP_DECIMALS, UI_DECIMALS),
[stakedLpBn]
);

Expand All @@ -47,7 +47,8 @@ export function StakeClaimCellContent({
className={styles.lpStake}
onClick={(e) => {
e.stopPropagation();
setStakeAmt(walletLpStr); // MAX
// MAX = string tronquée (≤ balance)
setStakeAmt(walletLpStr);
}}
style={{ cursor: "pointer" }}
title="Click to use full balance"
Expand All @@ -60,17 +61,19 @@ export function StakeClaimCellContent({
<input
className={styles.amountInputStake}
value={stakeAmt}
onChange={(e) => setStakeAmt(e.target.value)}
onChange={(e) => setStakeAmt(clampInputDecimals(e.target.value, UI_DECIMALS))}
onClick={(e) => e.stopPropagation()}
placeholder="Amount to Stake"
placeholder={"0." + "0".repeat(UI_DECIMALS)}
inputMode="decimal"
/>
<button
className={styles.btnAction}
onClick={(e) => {
e.stopPropagation();
const v = parseUnitsSafe(stakeAmt, LP_DECIMALS);
if (v > 0n) stake?.(v);
// ⬇️ sécurité contract: ne jamais dépasser la balance
const send = v > walletLpBn ? walletLpBn : v;
if (send > 0n) stake?.(send);
setStakeAmt("");
}}
disabled={!pool.staking}
Expand Down Expand Up @@ -103,17 +106,18 @@ export function StakeClaimCellContent({
<input
className={styles.amountInputUnstake}
value={unstakeAmt}
onChange={(e) => setUnstakeAmt(e.target.value)}
onChange={(e) => setUnstakeAmt(clampInputDecimals(e.target.value, UI_DECIMALS))}
onClick={(e) => e.stopPropagation()}
placeholder="Amount to Unstake"
placeholder={"0." + "0".repeat(UI_DECIMALS)}
inputMode="decimal"
/>
<button
className={styles.btnAction}
onClick={(e) => {
e.stopPropagation();
const v = parseUnitsSafe(unstakeAmt, LP_DECIMALS);
if (v > 0n) withdraw?.(v);
const send = v > stakedLpBn ? stakedLpBn : v;
if (send > 0n) withdraw?.(send);
setUnstakeAmt("");
}}
disabled={!pool.staking}
Expand All @@ -136,14 +140,33 @@ export function StakeClaimCell(props: { pool: PoolItem; loading?: boolean }) {

/* ---------------- helpers ---------------- */

function safeFormat(v: bigint, decimals: number): string {
// Tronque sans arrondir (floor) à uiDecimals — jamais au-dessus de v
function formatUnitsFloor(v: bigint, decimals: number, uiDecimals: number): string {
try {
return Number(formatUnits(v, decimals)).toFixed(6);
const s = formatUnits(v, decimals); // ex "123.456789..."
const dot = s.indexOf(".");
if (dot === -1) return s;
const int = s.slice(0, dot);
const frac = s.slice(dot + 1);
const fracCut = frac.slice(0, uiDecimals);
return fracCut.length ? `${int}.${fracCut}` : int;
} catch {
return "0.000000";
return "0";
}
}

// Limite le nombre de décimales saisies par l’utilisateur
function clampInputDecimals(v: string, uiDecimals: number): string {
if (!v) return "";
// keep only first dot, digits only, no leading zeros issues
const cleaned = v.replace(/[^\d.]/g, "").replace(/^(\.)+/, "0.");
const parts = cleaned.split(".");
if (parts.length === 1) return parts[0].replace(/^0+(\d)/, "$1"); // no trailing zeros logic
const head = parts[0] || "0";
const tail = parts.slice(1).join(""); // if user typed multiple dots
return `${head}.${tail.slice(0, uiDecimals)}`;
}

function parseUnitsSafe(v: string, decimals: number): bigint {
try {
if (!v || !isFinite(Number(v))) return 0n;
Expand All @@ -153,7 +176,6 @@ function parseUnitsSafe(v: string, decimals: number): bigint {
}
}


function useWalletLpFallback(
preloaded?: bigint,
pairAddr?: `0x${string}`
Expand All @@ -168,7 +190,7 @@ function useWalletLpFallback(

useEffect(() => {
if (!pc || !address || !pairAddr) return;
if (preloaded != null) return;
if (preloaded != null) return;

let cancelled = false;
(async () => {
Expand Down
Loading