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

## [Unreleased]

### Added

- Add `paymentOverride` property (type `PaymentOverride`) to `TransactionConfig` and `TransactionData`, settable via `setTransactionConfig` ([#8858](https://github.com/MetaMask/core/pull/8858))

### Changed

- Bump `@metamask/assets-controller` from `^8.0.0` to `^8.0.1` ([#8874](https://github.com/MetaMask/core/pull/8874))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { Hex } from '@metamask/utils';
import { TransactionPayController } from '.';
import { updateFiatPayment } from './actions/update-fiat-payment';
import { updatePaymentToken } from './actions/update-payment-token';
import { TransactionPayStrategy } from './constants';
import { PaymentOverride, TransactionPayStrategy } from './constants';
import { deriveFiatAssetForFiatPayment } from './strategy/fiat/utils';
import { getMessengerMock } from './tests/messenger-mock';
import type {
Expand Down Expand Up @@ -206,6 +206,18 @@ describe('TransactionPayController', () => {
).toBe(true);
});

it('updates paymentOverride in state', () => {
const controller = createController();

controller.setTransactionConfig(TRANSACTION_ID_MOCK, (config) => {
config.paymentOverride = PaymentOverride.MoneyAccount;
});

expect(
controller.state.transactionData[TRANSACTION_ID_MOCK].paymentOverride,
).toBe(PaymentOverride.MoneyAccount);
});

it('triggers source amounts and quotes update when only isPostQuote changes', () => {
const controller = createController();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ export class TransactionPayController extends BaseController<
isPolymarketDepositWallet: transactionData.isPolymarketDepositWallet,
refundTo: transactionData.refundTo,
accountOverride: transactionData.accountOverride,
paymentOverride: transactionData.paymentOverride,
};

const previousAccountOverride = config.accountOverride;
Expand All @@ -153,6 +154,7 @@ export class TransactionPayController extends BaseController<
transactionData.isPolymarketDepositWallet =
config.isPolymarketDepositWallet;
transactionData.refundTo = config.refundTo;
transactionData.paymentOverride = config.paymentOverride;

if (
!config.isPostQuote &&
Expand Down
6 changes: 6 additions & 0 deletions packages/transaction-pay-controller/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ export const STABLECOINS: Record<Hex, Hex[]> = {
[CHAIN_ID_HYPERCORE]: [HYPERCORE_USDC_ADDRESS], // USDC
};

export enum PaymentOverride {
MoneyAccount = 'moneyAccount',
Perps = 'perps',
Predict = 'predict',
}

export enum TransactionPayStrategy {
Across = 'across',
Bridge = 'bridge',
Expand Down
2 changes: 1 addition & 1 deletion packages/transaction-pay-controller/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export type {
TransactionPayControllerUpdatePaymentTokenAction,
TransactionPayControllerUpdateFiatPaymentAction,
} from './TransactionPayController-method-action-types';
export { TransactionPayStrategy } from './constants';
export { PaymentOverride, TransactionPayStrategy } from './constants';
export { TransactionPayController } from './TransactionPayController';
export { TransactionPayPublishHook } from './helpers/TransactionPayPublishHook';
export type { TransactionPayBridgeQuote } from './strategy/bridge/types';
12 changes: 11 additions & 1 deletion packages/transaction-pay-controller/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ import type {
import type { Hex, Json } from '@metamask/utils';
import type { Draft } from 'immer';

import type { CONTROLLER_NAME, TransactionPayStrategy } from './constants';
import type {
CONTROLLER_NAME,
PaymentOverride,
TransactionPayStrategy,
} from './constants';
import type { TransactionPayControllerMethodActions } from './TransactionPayController-method-action-types';

export type AllowedActions =
Expand Down Expand Up @@ -140,6 +144,9 @@ export type TransactionConfig = {
* When `isPostQuote` is false, it provides the funds and pays for gas.
*/
accountOverride?: Hex;

/** Overrides the payment source for the transaction. */
paymentOverride?: PaymentOverride;
};

/** Callback to update transaction config. */
Expand Down Expand Up @@ -246,6 +253,9 @@ export type TransactionData = {
*/
accountOverride?: Hex;

/** Overrides the payment source for the transaction. */
paymentOverride?: PaymentOverride;

/**
* Token selected for the transaction.
* - For standard flows (isPostQuote=false): This is the SOURCE/payment token
Expand Down
Loading