chore(runway): cherry-pick fix(perps): cp-7.59.0 exclude P&L from total margin calculation in close all positions (#22451)

- fix(perps): exclude P&L from total margin calculation in close all
positions (#22391)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

This PR fixes a calculation error in the "Close All Positions" feature
for Perps. Previously, the total margin calculation incorrectly included
unrealized P&L (profit and loss), which led to incorrect amount
calculations when closing all positions.

**What is the reason for the change?**
The total margin should represent only the actual margin used in
positions, not the combined value of margin + P&L. Including P&L in the
margin calculation resulted in incorrect receive amounts being displayed
to users.


## **Changelog**

CHANGELOG entry: Fixed margin calculation in Close All Positions to
exclude P&L

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/TAT-2030

## **Manual testing steps**

```gherkin
Feature: Close All Positions margin calculation

  Scenario: user closes all positions with positive P&L
    Given user has multiple open positions with positive unrealized P&L
    And user navigates to Close All Positions view
    
    When user views the close summary
    Then the total margin displayed should only include marginUsed (excluding P&L)
    And the receive amount should equal total margin minus fees
    And P&L should be displayed separately
```

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<img width="1170" height="2532" alt="Simulator Screenshot - iPhone 16e -
2025-11-10 at 12 16 24"

src="https://github.com/user-attachments/assets/0f566135-2acc-46fa-89ec-06db62139f31"
/>

### **After**

<img width="1170" height="2532" alt="Simulator Screenshot - iPhone 16e -
2025-11-10 at 12 11 04"

src="https://github.com/user-attachments/assets/0f1762ac-0da3-45b7-80a8-d0d18b0c450b"
/>


## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling

guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Exclude P&L from total margin in close-all calculations, compute
receive amount as margin minus fees, and update tests accordingly.
> 
> - **Perps close-all calculations (`usePerpsCloseAllCalculations`)**:
> - `totalMargin` now excludes `unrealizedPnl`; `totalPnl` calculated
separately.
>   - `receiveAmount` = `totalMargin` − `totalFees` (no P&L mixing).
> - JSDoc updated to reflect margin definition; use `Number.parseFloat`
for parsing.
> - **Tests (`usePerpsCloseAllCalculations.test.ts`)**:
> - Update expectations to exclude P&L from `totalMargin` and verify
`totalPnl` separately.
> - Add/adjust cases for positive/negative/zero P&L, multiple positions,
and fee scenarios (e.g., fees equal margin → receive amount 0).
> - Verify fee aggregation, discounts, averages, and points remain
consistent with new margin logic.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
1504819. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

---------

Co-authored-by: Nicholas Smith <nick.smith@consensys.net>
[ecf1712](ecf1712)

Co-authored-by: Michal Szorad <michal.szorad@consensys.net>
Co-authored-by: Nicholas Smith <nick.smith@consensys.net>
Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com>

Author: 4 people

app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.test.ts

@@ -145,7 +145,7 @@ describe('usePerpsCloseAllCalculations', () => {
   });
 
   describe('Total Margin Calculation', () => {
-    it('calculates total margin including P&L for single position', () => {
+    it('calculates total margin excluding P&L for single position', () => {
       // Arrange
       const positions = [
         createMockPosition({
@@ -161,7 +161,7 @@ describe('usePerpsCloseAllCalculations', () => {
       );
 
       // Assert
-      expect(result.current.totalMargin).toBe(1100); // 1000 + 100
+      expect(result.current.totalMargin).toBe(1000); // Only marginUsed, PnL excluded
     });
 
     it('calculates total margin for multiple positions', () => {
@@ -189,10 +189,10 @@ describe('usePerpsCloseAllCalculations', () => {
       );
 
       // Assert
-      expect(result.current.totalMargin).toBe(1550); // (1000+100) + (500-50)
+      expect(result.current.totalMargin).toBe(1500); // 1000 + 500, PnL excluded
     });
 
-    it('handles negative P&L correctly', () => {
+    it('excludes negative P&L from margin calculation', () => {
       // Arrange
       const positions = [
         createMockPosition({
@@ -208,7 +208,47 @@ describe('usePerpsCloseAllCalculations', () => {
       );
 
       // Assert
-      expect(result.current.totalMargin).toBe(800); // 1000 - 200
+      expect(result.current.totalMargin).toBe(1000); // Only marginUsed, negative PnL excluded
+    });
+
+    it('excludes positive P&L from margin calculation', () => {
+      // Arrange
+      const positions = [
+        createMockPosition({
+          marginUsed: '500',
+          unrealizedPnl: '250',
+        }),
+      ];
+      const priceData = { BTC: { price: '52000' } };
+
+      // Act
+      const { result } = renderHook(() =>
+        usePerpsCloseAllCalculations({ positions, priceData }),
+      );
+
+      // Assert
+      expect(result.current.totalMargin).toBe(500); // Only marginUsed, positive PnL excluded
+      expect(result.current.totalPnl).toBe(250); // PnL is tracked separately
+    });
+
+    it('calculates total margin with zero P&L', () => {
+      // Arrange
+      const positions = [
+        createMockPosition({
+          marginUsed: '800',
+          unrealizedPnl: '0',
+        }),
+      ];
+      const priceData = { BTC: { price: '50000' } };
+
+      // Act
+      const { result } = renderHook(() =>
+        usePerpsCloseAllCalculations({ positions, priceData }),
+      );
+
+      // Assert
+      expect(result.current.totalMargin).toBe(800); // Only marginUsed
+      expect(result.current.totalPnl).toBe(0);
     });
   });
 
@@ -778,10 +818,12 @@ describe('usePerpsCloseAllCalculations', () => {
         expect(result.current.isLoading).toBe(false);
       });
       // Total fee recalculated: 25 + 25 = 50
-      expect(result.current.receiveAmount).toBe(1050); // (1000 + 100) - 50
+      // Receive amount: 1000 (margin only, PnL excluded) - 50 (fees) = 950
+      expect(result.current.receiveAmount).toBe(950);
+      expect(result.current.totalPnl).toBe(100); // PnL tracked separately
     });
 
-    it('handles negative receive amount when fees exceed margin', async () => {
+    it('returns zero receive amount when fees equal margin', async () => {
       // Arrange
       const positions = [
         createMockPosition({
@@ -807,7 +849,53 @@ describe('usePerpsCloseAllCalculations', () => {
       await waitFor(() => {
         expect(result.current.isLoading).toBe(false);
       });
-      expect(result.current.receiveAmount).toBe(-50); // (100 - 50) - 100
+      // Receive amount: 100 (margin only) - 100 (fees) = 0
+      expect(result.current.receiveAmount).toBe(0);
+      expect(result.current.totalPnl).toBe(-50); // PnL tracked separately
+    });
+
+    it('calculates receive amount excluding P&L for multiple positions', async () => {
+      // Arrange
+      const positions = [
+        createMockPosition({
+          coin: 'BTC',
+          marginUsed: '2000',
+          unrealizedPnl: '300',
+        }),
+        createMockPosition({
+          coin: 'ETH',
+          marginUsed: '1500',
+          unrealizedPnl: '-100',
+        }),
+      ];
+      const priceData = {
+        BTC: { price: '51000' },
+        ETH: { price: '3000' },
+      };
+      mockCalculateFees.mockResolvedValue(
+        createMockFeeResult({
+          feeAmount: 150,
+          metamaskFeeAmount: 100,
+          protocolFeeAmount: 50,
+        }),
+      );
+
+      // Act
+      const { result } = renderHook(() =>
+        usePerpsCloseAllCalculations({ positions, priceData }),
+      );
+
+      // Assert
+      await waitFor(() => {
+        expect(result.current.isLoading).toBe(false);
+      });
+      // Total margin: 2000 + 1500 = 3500 (PnL excluded)
+      // Total fees: 150 + 150 = 300 (two positions)
+      // Receive amount: 3500 - 300 = 3200
+      expect(result.current.totalMargin).toBe(3500);
+      expect(result.current.totalPnl).toBe(200); // 300 - 100
+      expect(result.current.totalFees).toBe(300);
+      expect(result.current.receiveAmount).toBe(3200);
     });
   });
 

app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.ts

@@ -14,7 +14,7 @@ import { formatAccountToCaipAccountId } from '../utils/rewardsUtils';
  * Aggregated calculations result for closing all positions
  */
 export interface CloseAllCalculationsResult {
-  /** Total margin across all positions (includes P&L) */
+  /** Total margin across all positions (excludes P&L) */
   totalMargin: number;
   /** Total unrealized P&L across all positions */
   totalPnl: number;
@@ -120,13 +120,12 @@ export function usePerpsCloseAllCalculations({
   const hasValidResultsRef = useRef(false);
   const hasValidDiscountRef = useRef(false);
 
-  // Calculate total margin (including P&L)
+  // Calculate total margin
   const totalMargin = useMemo(
     () =>
       positions.reduce((sum, pos) => {
-        const margin = parseFloat(pos.marginUsed) || 0;
-        const pnl = parseFloat(pos.unrealizedPnl) || 0;
-        return sum + margin + pnl;
+        const margin = Number.parseFloat(pos.marginUsed) || 0;
+        return sum + margin;
       }, 0),
     [positions],
   );
@@ -135,7 +134,7 @@ export function usePerpsCloseAllCalculations({
   const totalPnl = useMemo(
     () =>
       positions.reduce(
-        (sum, pos) => sum + (parseFloat(pos.unrealizedPnl) || 0),
+        (sum, pos) => sum + (Number.parseFloat(pos.unrealizedPnl) || 0),
         0,
       ),
     [positions],