Skip to content
Draft
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
1 change: 1 addition & 0 deletions packages/transaction-pay-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Prevent Pay-configured transactions from falling back to raw publish when no Pay quote is available ([#9101](https://github.com/MetaMask/core/pull/9101))
- Clear stale `fiatPayment.rampsQuote` when a fiat quote fetch fails, preventing the "No quotes" alert from being silently suppressed after a prior successful fetch ([#9073](https://github.com/MetaMask/core/pull/9073))

## [23.5.1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
import { TransactionPayStrategy } from '..';
import { getMessengerMock } from '../tests/messenger-mock';
import type {
TransactionData,
TransactionPayControllerState,
TransactionPayQuote,
} from '../types';
Expand All @@ -25,6 +26,22 @@ const QUOTE_MOCK = {
strategy: TransactionPayStrategy.Test,
} as TransactionPayQuote<unknown>;

const PAYMENT_TOKEN_MOCK = {
address: '0xdef',
balanceFiat: '1',
balanceHuman: '1',
balanceRaw: '1000000',
balanceUsd: '1',
chainId: '0x1',
decimals: 6,
symbol: 'TEST',
};

const EMPTY_TRANSACTION_DATA_MOCK = {
isLoading: false,
tokens: [],
} as TransactionData;

describe('TransactionPayPublishHook', () => {
const isSmartTransactionMock = jest.fn();
const executeMock = jest.fn();
Expand Down Expand Up @@ -115,6 +132,47 @@ describe('TransactionPayPublishHook', () => {
expect(executeMock).not.toHaveBeenCalled();
});

it('does nothing if no quotes exist for transaction data without explicit pay config', async () => {
getControllerStateMock.mockReturnValue({
transactionData: {
[TRANSACTION_META_MOCK.id]: EMPTY_TRANSACTION_DATA_MOCK,
},
});

await runHook();

expect(executeMock).not.toHaveBeenCalled();
});

it.each([
['account override', { accountOverride: '0xdef' }],
[
'fiat payment method',
{ fiatPayment: { selectedPaymentMethodId: 'test-payment-method' } },
],
['payment override', { paymentOverride: {} }],
['payment token', { paymentToken: PAYMENT_TOKEN_MOCK }],
['post-quote flag', { isPostQuote: true }],
] as [string, Partial<TransactionData>][])(
'throws if no quotes exist for transaction data with %s',
async (_description, transactionData) => {
getControllerStateMock.mockReturnValue({
transactionData: {
[TRANSACTION_META_MOCK.id]: {
...EMPTY_TRANSACTION_DATA_MOCK,
...transactionData,
},
},
});

await expect(runHook()).rejects.toThrow(
'MetaMask Pay: No pay quote available',
);

expect(executeMock).not.toHaveBeenCalled();
},
);

it('sets submittedTime on the transaction before executing strategy', async () => {
await runHook();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { createModuleLogger } from '@metamask/utils';

import { projectLogger } from '../logger';
import type {
TransactionData,
TransactionPayControllerMessenger,
TransactionPayQuote,
} from '../types';
Expand All @@ -19,6 +20,8 @@ const EMPTY_RESULT = {
transactionHash: undefined,
};

const ERROR_NO_PAY_QUOTE = 'No pay quote available';

export class TransactionPayPublishHook {
readonly #isSmartTransaction: (chainId: Hex) => boolean;

Expand Down Expand Up @@ -62,11 +65,16 @@ export class TransactionPayPublishHook {
'TransactionPayController:getState',
);

const transactionData = controllerState.transactionData?.[transactionId];

const quotes =
(controllerState.transactionData?.[transactionId]
?.quotes as TransactionPayQuote<unknown>[]) ?? [];
(transactionData?.quotes as TransactionPayQuote<unknown>[]) ?? [];

if (!quotes?.length) {
if (hasExplicitPayConfig(transactionData)) {
throw new Error(ERROR_NO_PAY_QUOTE);
}

log('Skipping as no quotes found');
return EMPTY_RESULT;
}
Expand Down Expand Up @@ -94,3 +102,17 @@ export class TransactionPayPublishHook {
});
}
}

function hasExplicitPayConfig(transactionData?: TransactionData): boolean {
if (!transactionData) {
return false;
}

return [
transactionData.accountOverride,
transactionData.fiatPayment?.selectedPaymentMethodId,
transactionData.isPostQuote,
transactionData.paymentOverride,
transactionData.paymentToken,
].some(Boolean);
}
Loading