don't try to use existing positions when updating store

fluidity-money · Aug 27, 2024 · 49b1abb · 49b1abb
1 parent 9ab7e92
commit 49b1abb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/web/src/app/stake/pool/confirm-withdraw/page.tsx b/web/src/app/stake/pool/confirm-withdraw/page.tsx
@@ -38,7 +38,7 @@ export default function ConfirmWithdrawLiquidity() {
     if (!address || chainId !== expectedChainId) router.back();
   }, [address, expectedChainId, chainId]);
 
-  const { token0, token0Amount, token0AmountRaw, token1, token1Amount, delta } =
+  const { token0, token0Amount, token0AmountRaw, token1, token1Amount, delta, tickLower, tickUpper } =
     useStakeStore();
 
   const { positions, updatePositionLocal } = usePositions();
@@ -139,10 +139,15 @@ export default function ConfirmWithdrawLiquidity() {
 
   useEffect(() => {
     if (updatePositionResult.isSuccess) {
-      const position = positions.find(
-        (p) => p.positionId === Number(positionId),
-      );
-      if (position) {
+      if (tickLower && tickUpper) {
+        const position = {
+          positionId: Number(positionId),
+          pool: {
+            token: token0,
+          },
+          lower: tickLower,
+          upper: tickUpper,
+        };
         getUsdTokenAmountsForPosition(
           position,
           token0,
@@ -248,10 +253,10 @@ export default function ConfirmWithdrawLiquidity() {
             {token0.address === fUSDC.address
               ? token0Amount
               : getFormattedPriceFromAmount(
-                  token0Amount,
-                  tokenPrice,
-                  fUSDC.decimals,
-                )}
+                token0Amount,
+                tokenPrice,
+                fUSDC.decimals,
+              )}
           </div>
         </div>
 
@@ -266,10 +271,10 @@ export default function ConfirmWithdrawLiquidity() {
             {token1.address === fUSDC.address
               ? token1Amount
               : getFormattedPriceFromAmount(
-                  token1Amount,
-                  tokenPrice,
-                  fUSDC.decimals,
-                )}
+                token1Amount,
+                tokenPrice,
+                fUSDC.decimals,
+              )}
           </div>
         </div>
 

diff --git a/web/src/components/ConfirmStake.tsx b/web/src/components/ConfirmStake.tsx
@@ -314,7 +314,7 @@ export const ConfirmStake = ({ mode, positionId }: ConfirmStakeProps) => {
     if (updatePositionResult.isSuccess) {
       const id = positionId ?? Number(mintPositionId);
       if (id && tickLower && tickUpper) {
-        const position = positions.find((p) => p.positionId === id) ?? {
+        const position = {
           positionId: id,
           pool: {
             token: token0,