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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { usePerpsOrderDepositTracking } from './usePerpsOrderDepositTracking';

const mockShowToast = jest.fn();
const mockSubscribe = jest.fn();
const mockTrack = jest.fn();

jest.mock('./usePerpsToasts', () => ({
__esModule: true,
Expand Down Expand Up @@ -48,6 +49,24 @@ jest.mock('@metamask/perps-controller', () => ({
PERPS_CONSTANTS: {
DepositTakingLongerToastDelayMs: 100,
},
PERPS_EVENT_PROPERTY: {
SCREEN_TYPE: 'screen_type',
INTERACTION_TYPE: 'interaction_type',
},
PERPS_EVENT_VALUE: {
SCREEN_TYPE: {
CANCEL_TRADE_WITH_TOKEN_TOAST: 'cancel_trade_with_token_toast',
},
INTERACTION_TYPE: {
CANCEL_TRADE_WITH_TOKEN: 'cancel_trade_with_token',
},
},
}));

jest.mock('./usePerpsEventTracking', () => ({
usePerpsEventTracking: () => ({
track: mockTrack,
}),
}));

describe('usePerpsOrderDepositTracking', () => {
Expand Down Expand Up @@ -188,6 +207,13 @@ describe('usePerpsOrderDepositTracking', () => {
closeButtonOptions?.closeButtonOptions?.onPress?.();
});

expect(mockTrack).toHaveBeenCalledWith(
expect.objectContaining({ category: 'Perp UI Interaction' }),
expect.objectContaining({
interaction_type: 'cancel_trade_with_token',
}),
);

const statusUpdatedHandler = handlers.statusUpdated;
expect(statusUpdatedHandler).toBeDefined();
act(() => {
Expand Down Expand Up @@ -260,6 +286,13 @@ describe('usePerpsOrderDepositTracking', () => {
jest.advanceTimersByTime(100);
});

expect(mockTrack).toHaveBeenCalledWith(
expect.objectContaining({ category: 'Perp Screen Viewed' }),
expect.objectContaining({
screen_type: 'cancel_trade_with_token_toast',
}),
);

expect(mockShowToast).toHaveBeenCalled();
expect(mockShowToast.mock.calls[0][0]).toMatchObject({
closeButtonOptions: expect.any(Object),
Expand Down
28 changes: 26 additions & 2 deletions app/components/UI/Perps/hooks/usePerpsOrderDepositTracking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@ import {
import { useCallback } from 'react';
import Engine from '../../../../core/Engine';
import { strings } from '../../../../../locales/i18n';
import { PERPS_CONSTANTS } from '@metamask/perps-controller';
import {
PERPS_CONSTANTS,
PERPS_EVENT_PROPERTY,
PERPS_EVENT_VALUE,
} from '@metamask/perps-controller';
import usePerpsToasts from './usePerpsToasts';
import { MetaMetricsEvents } from '../../../../core/Analytics';
import { usePerpsEventTracking } from './usePerpsEventTracking';

/**
* Hook to track deposit status for Perps order view
Expand All @@ -23,6 +29,7 @@ import usePerpsToasts from './usePerpsToasts';
*/
export const usePerpsOrderDepositTracking = () => {
const { showToast, PerpsToastOptions } = usePerpsToasts();
const { track } = usePerpsEventTracking();

const showProgressToast = useCallback(
(transactionId: string) => {
Expand Down Expand Up @@ -57,11 +64,23 @@ export const usePerpsOrderDepositTracking = () => {
PerpsToastOptions.accountManagement.deposit.takingLonger;
const cancelTradeOnPress = () => {
cancelTradeRequested = true;

track(MetaMetricsEvents.PERPS_UI_INTERACTION, {
[PERPS_EVENT_PROPERTY.INTERACTION_TYPE]:
PERPS_EVENT_VALUE.INTERACTION_TYPE.CANCEL_TRADE_WITH_TOKEN,
});

// Replace current toast with "Trade canceled" (don't close first to avoid race)
showToast(PerpsToastOptions.accountManagement.deposit.tradeCanceled);
};
const depositLongerTimeoutId = setTimeout(() => {
const baseClose = takingLongerToastOptions.closeButtonOptions;

track(MetaMetricsEvents.PERPS_SCREEN_VIEWED, {
[PERPS_EVENT_PROPERTY.SCREEN_TYPE]:
PERPS_EVENT_VALUE.SCREEN_TYPE.CANCEL_TRADE_WITH_TOKEN_TOAST,
});

showToast({
...takingLongerToastOptions,
closeButtonOptions: baseClose
Expand Down Expand Up @@ -111,7 +130,12 @@ export const usePerpsOrderDepositTracking = () => {
handleTransactionStatusUpdated,
);
},
[showToast, showProgressToast, PerpsToastOptions.accountManagement.deposit],
[
showToast,
showProgressToast,
PerpsToastOptions.accountManagement.deposit,
track,
],
);

return {
Expand Down
112 changes: 112 additions & 0 deletions app/components/UI/Perps/hooks/usePerpsOrderExecution.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,47 @@ describe('usePerpsOrderExecution', () => {
}),
);
});

it('tracks success with mm_pay_token_selected Perps Balance when trackingData has tradeWithToken false', async () => {
const onSuccess = jest.fn();
const paramsWithPerpsBalance: OrderParams = {
...mockOrderParams,
size: '0.2',
trackingData: {
totalFee: 0,
marketPrice: 50000,
tradeWithToken: false,
},
};

mockPlaceOrder.mockResolvedValue({
success: true,
orderId: 'order123',
filledSize: '0.1',
});
mockGetPositions.mockResolvedValue([mockPosition]);

const { result } = renderHook(() =>
usePerpsOrderExecution({ onSuccess, onError: jest.fn() }),
);

await act(async () => {
await result.current.placeOrder(paramsWithPerpsBalance);
});

await waitFor(() => {
expect(result.current.isPlacing).toBe(false);
});

expect(mockTrack).toHaveBeenCalledWith(
MetaMetricsEvents.PERPS_TRADE_TRANSACTION,
expect.objectContaining({
[PERPS_EVENT_PROPERTY.TRADE_WITH_TOKEN]: false,
[PERPS_EVENT_PROPERTY.MM_PAY_TOKEN_SELECTED]:
PERPS_EVENT_VALUE.MM_PAY_TOKEN.PERPS_BALANCE,
}),
);
});
});

describe('failed order placement', () => {
Expand Down Expand Up @@ -280,6 +321,43 @@ describe('usePerpsOrderExecution', () => {
);
});

it('tracks failed order with mm_pay_token_selected Perps Balance when trackingData has tradeWithToken false', async () => {
const onError = jest.fn();
const paramsWithPerpsBalance: OrderParams = {
...mockOrderParams,
trackingData: {
totalFee: 0,
marketPrice: 50000,
tradeWithToken: false,
},
};

mockPlaceOrder.mockResolvedValue({
success: false,
error: 'Insufficient margin',
});

const { result } = renderHook(() => usePerpsOrderExecution({ onError }));

await act(async () => {
await result.current.placeOrder(paramsWithPerpsBalance);
});

await waitFor(() => {
expect(result.current.isPlacing).toBe(false);
});

expect(mockTrack).toHaveBeenCalledWith(
MetaMetricsEvents.PERPS_TRADE_TRANSACTION,
expect.objectContaining({
[PERPS_EVENT_PROPERTY.STATUS]: PERPS_EVENT_VALUE.STATUS.FAILED,
[PERPS_EVENT_PROPERTY.TRADE_WITH_TOKEN]: false,
[PERPS_EVENT_PROPERTY.MM_PAY_TOKEN_SELECTED]:
PERPS_EVENT_VALUE.MM_PAY_TOKEN.PERPS_BALANCE,
}),
);
});

it('calls onError with unknown error when order returns success false without error', async () => {
const onError = jest.fn();

Expand Down Expand Up @@ -355,6 +433,40 @@ describe('usePerpsOrderExecution', () => {
}),
);
});

it('tracks exception with mm_pay_token_selected Perps Balance when placeOrder rejects and trackingData has tradeWithToken false', async () => {
const onError = jest.fn();
const paramsWithPerpsBalance: OrderParams = {
...mockOrderParams,
trackingData: {
totalFee: 0,
marketPrice: 50000,
tradeWithToken: false,
},
};

mockPlaceOrder.mockRejectedValue(new Error('Network timeout'));

const { result } = renderHook(() => usePerpsOrderExecution({ onError }));

await act(async () => {
await result.current.placeOrder(paramsWithPerpsBalance);
});

await waitFor(() => {
expect(result.current.isPlacing).toBe(false);
});

expect(mockTrack).toHaveBeenCalledWith(
MetaMetricsEvents.PERPS_TRADE_TRANSACTION,
expect.objectContaining({
[PERPS_EVENT_PROPERTY.STATUS]: PERPS_EVENT_VALUE.STATUS.FAILED,
[PERPS_EVENT_PROPERTY.TRADE_WITH_TOKEN]: false,
[PERPS_EVENT_PROPERTY.MM_PAY_TOKEN_SELECTED]:
PERPS_EVENT_VALUE.MM_PAY_TOKEN.PERPS_BALANCE,
}),
);
});
});

describe('error state management', () => {
Expand Down
9 changes: 9 additions & 0 deletions app/components/UI/Perps/hooks/usePerpsOrderExecution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ export function usePerpsOrderExecution(
partialProps[PERPS_EVENT_PROPERTY.MM_PAY_NETWORK_SELECTED] =
orderParams.trackingData.mmPayNetworkSelected;
}
} else if (orderParams.trackingData !== undefined) {
partialProps[PERPS_EVENT_PROPERTY.MM_PAY_TOKEN_SELECTED] =
PERPS_EVENT_VALUE.MM_PAY_TOKEN.PERPS_BALANCE;
}
track(MetaMetricsEvents.PERPS_TRADE_TRANSACTION, partialProps);
}
Expand Down Expand Up @@ -172,6 +175,9 @@ export function usePerpsOrderExecution(
failedProps[PERPS_EVENT_PROPERTY.MM_PAY_NETWORK_SELECTED] =
orderParams.trackingData.mmPayNetworkSelected;
}
} else if (orderParams.trackingData !== undefined) {
failedProps[PERPS_EVENT_PROPERTY.MM_PAY_TOKEN_SELECTED] =
PERPS_EVENT_VALUE.MM_PAY_TOKEN.PERPS_BALANCE;
}
track(MetaMetricsEvents.PERPS_TRADE_TRANSACTION, failedProps);

Expand Down Expand Up @@ -228,6 +234,9 @@ export function usePerpsOrderExecution(
exceptionProps[PERPS_EVENT_PROPERTY.MM_PAY_NETWORK_SELECTED] =
orderParams.trackingData.mmPayNetworkSelected;
}
} else if (orderParams.trackingData !== undefined) {
exceptionProps[PERPS_EVENT_PROPERTY.MM_PAY_TOKEN_SELECTED] =
PERPS_EVENT_VALUE.MM_PAY_TOKEN.PERPS_BALANCE;
}
track(MetaMetricsEvents.PERPS_TRADE_TRANSACTION, exceptionProps);

Expand Down
8 changes: 8 additions & 0 deletions app/controllers/perps/constants/eventNames.ts
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ export const PERPS_EVENT_VALUE = {
// Pay-with interactions
PAYMENT_TOKEN_SELECTOR: 'payment_token_selector',
PAYMENT_METHOD_CHANGED: 'payment_method_changed',
// Deposit + order (pay-with token) cancel
CANCEL_TRADE_WITH_TOKEN: 'cancel_trade_with_token',
},
ACTION_TYPE: {
START_TRADING: 'start_trading',
Expand Down Expand Up @@ -376,6 +378,8 @@ export const PERPS_EVENT_VALUE = {
ADD_MARGIN: 'add_margin',
REMOVE_MARGIN: 'remove_margin',
GEO_BLOCK_NOTIF: 'geo_block_notif',
// Deposit + order (pay-with token) cancel toast
CANCEL_TRADE_WITH_TOKEN_TOAST: 'cancel_trade_with_token_toast',
},
SETTING_TYPE: {
LEVERAGE: 'leverage',
Expand Down Expand Up @@ -413,6 +417,10 @@ export const PERPS_EVENT_VALUE = {
FUNDING: 'funding',
DEPOSITS: 'deposits',
},
/** Value for mm_pay_token_selected when user pays with Perps balance (not a token) */
MM_PAY_TOKEN: {
PERPS_BALANCE: 'Perps Balance',
},
// A/B testing values
AB_TEST: {
// Test IDs
Expand Down
43 changes: 43 additions & 0 deletions app/controllers/perps/services/TradingService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
createMockPerpsControllerState,
createMockInfrastructure,
} from '../../../components/UI/Perps/__mocks__/serviceMocks';
import { PERPS_EVENT_VALUE } from '../constants/eventNames';
import { PerpsAnalyticsEvent } from '../types';
import type {
PerpsProvider,
Expand Down Expand Up @@ -322,6 +323,48 @@ describe('TradingService', () => {
);
});

it('includes mm_pay_token_selected "Perps Balance" when user uses perps balance', async () => {
const orderParams: OrderParams = {
symbol: 'BTC',
isBuy: true,
size: '0.1',
orderType: 'market',
leverage: 10,
trackingData: {
totalFee: 0,
marketPrice: 50000,
tradeWithToken: false,
},
};
const mockOrderResult: OrderResult = {
success: true,
orderId: 'order-123',
filledSize: '0.1',
averagePrice: '50000',
};

mockProvider.placeOrder.mockResolvedValue(mockOrderResult);
mockRewardsIntegrationService.calculateUserFeeDiscount.mockResolvedValue(
undefined,
);

await tradingService.placeOrder({
provider: mockProvider,
params: orderParams,
context: mockContext,
reportOrderToDataLake: mockReportOrderToDataLake,
});

expect(mockDeps.metrics.trackPerpsEvent).toHaveBeenCalledWith(
PerpsAnalyticsEvent.TradeTransaction,
expect.objectContaining({
status: 'executed',
trade_with_token: false,
mm_pay_token_selected: PERPS_EVENT_VALUE.MM_PAY_TOKEN.PERPS_BALANCE,
}),
);
});

it('tracks analytics event when order fails', async () => {
const orderParams: OrderParams = {
symbol: 'BTC',
Expand Down
5 changes: 4 additions & 1 deletion app/controllers/perps/services/TradingService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export class TradingService {
if (params.trackingData?.tradeAction) {
properties[PERPS_EVENT_PROPERTY.ACTION] = params.trackingData.tradeAction;
}
// Pay with any token: trade_with_token (boolean); when true, include mm_pay_token_selected and mm_pay_network_selected
// Pay with any token: trade_with_token (boolean); when true, include mm_pay_token_selected and mm_pay_network_selected; when false (Perps balance), include mm_pay_token_selected: "Perps Balance"
properties[PERPS_EVENT_PROPERTY.TRADE_WITH_TOKEN] =
params.trackingData?.tradeWithToken === true;
if (params.trackingData?.tradeWithToken === true) {
Expand All @@ -175,6 +175,9 @@ export class TradingService {
properties[PERPS_EVENT_PROPERTY.MM_PAY_NETWORK_SELECTED] =
params.trackingData.mmPayNetworkSelected;
}
} else if (params.trackingData !== undefined) {
properties[PERPS_EVENT_PROPERTY.MM_PAY_TOKEN_SELECTED] =
PERPS_EVENT_VALUE.MM_PAY_TOKEN.PERPS_BALANCE;
Comment thread
michalconsensys marked this conversation as resolved.
}

// Add success-specific properties
Expand Down
2 changes: 1 addition & 1 deletion docs/perps/perps-metametrics-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ this.#getMetrics().trackPerpsEvent(PerpsAnalyticsEvent.TradeTransaction, {
- `input_method` (optional): How value was entered: `'slider' | 'keyboard' | 'preset' | 'manual' | 'percentage_button'`
- `limit_price` (optional): Limit order price (for limit orders) (number)
- `trade_with_token` (optional): Whether the user paid with a token other than Perps balance (boolean)
- `mm_pay_token_selected` (optional): Token symbol selected for pay-with (e.g. `'USDC'`), included when `trade_with_token` is true
- `mm_pay_token_selected` (optional): Token symbol selected for pay-with (e.g. `'USDC'`); when `trade_with_token` is true, the selected token symbol; when user uses Perps balance, `'Perps Balance'`
- `mm_pay_network_selected` (optional): Network/chain for pay-with (e.g. `'ethereum'`), included when `trade_with_token` is true
- `error_message` (optional): Error description when status is 'failed'

Expand Down
Loading