Skip to content

Commit 649a57c

Browse files
Address PR comment
1 parent b0af9b8 commit 649a57c

File tree

7 files changed

+392
-509
lines changed

7 files changed

+392
-509
lines changed

packages/transaction-pay-controller/src/TransactionPayController.test.ts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,45 @@ describe('TransactionPayController', () => {
365365
),
366366
).toBe(TransactionPayStrategy.Test);
367367
});
368+
369+
it('passes payment token route args into feature flag fallback', async () => {
370+
const controller = createController();
371+
372+
controller.updatePaymentToken({
373+
transactionId: TRANSACTION_ID_MOCK,
374+
tokenAddress: TOKEN_ADDRESS_MOCK,
375+
chainId: CHAIN_ID_MOCK,
376+
});
377+
378+
const { updateTransactionData } = updatePaymentTokenMock.mock.calls[0][1];
379+
380+
updateTransactionData(TRANSACTION_ID_MOCK, (data) => {
381+
data.paymentToken = {
382+
address: TOKEN_ADDRESS_MOCK,
383+
balanceFiat: '1',
384+
balanceHuman: '1',
385+
balanceRaw: '1',
386+
balanceUsd: '1',
387+
chainId: CHAIN_ID_MOCK,
388+
decimals: 6,
389+
symbol: 'USDC',
390+
};
391+
});
392+
393+
const transactionMeta = {
394+
id: TRANSACTION_ID_MOCK,
395+
type: 'perpsDeposit',
396+
} as TransactionMeta;
397+
398+
messenger.call('TransactionPayController:getStrategy', transactionMeta);
399+
400+
expect(getStrategyOrderMock).toHaveBeenCalledWith(
401+
messenger,
402+
CHAIN_ID_MOCK,
403+
TOKEN_ADDRESS_MOCK,
404+
'perpsDeposit',
405+
);
406+
});
368407
});
369408

370409
describe('transaction data update', () => {

packages/transaction-pay-controller/src/TransactionPayController.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,14 @@ export class TransactionPayController extends BaseController<
276276
return validStrategies;
277277
}
278278

279-
return getStrategyOrder(this.messenger);
279+
const paymentToken =
280+
this.state.transactionData[transaction.id]?.paymentToken;
281+
282+
return getStrategyOrder(
283+
this.messenger,
284+
paymentToken?.chainId,
285+
paymentToken?.address,
286+
transaction.type,
287+
);
280288
}
281289
}

packages/transaction-pay-controller/src/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,3 @@ export { TransactionPayStrategy } from './constants';
2929
export { TransactionPayController } from './TransactionPayController';
3030
export { TransactionPayPublishHook } from './helpers/TransactionPayPublishHook';
3131
export type { TransactionPayBridgeQuote } from './strategy/bridge/types';
32-
export type { TransactionPayRouteContext } from './utils/strategy-routing';
33-
export { getStrategiesForRoute } from './utils/strategy-routing';

packages/transaction-pay-controller/src/utils/confirmations-pay-feature-flags.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)