Skip to content

Commit 0075098

Browse files
committed
Ignore incoming transactions
1 parent e144cc5 commit 0075098

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

packages/transaction-controller/src/helpers/PendingTransactionTracker.test.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,38 @@ describe('PendingTransactionTracker', () => {
565565

566566
expect(listener).not.toHaveBeenCalled();
567567
});
568+
569+
it('unless incoming transaction', async () => {
570+
const listener = jest.fn();
571+
572+
const confirmedTransactionMetaMock = {
573+
...TRANSACTION_SUBMITTED_MOCK,
574+
id: `${ID_MOCK}2`,
575+
status: TransactionStatus.confirmed,
576+
isTransfer: false,
577+
} as unknown as TransactionMeta;
578+
579+
const submittedTransactionMetaMock = {
580+
...TRANSACTION_SUBMITTED_MOCK,
581+
};
582+
583+
pendingTransactionTracker = new PendingTransactionTracker({
584+
...options,
585+
getTransactions: () => [
586+
confirmedTransactionMetaMock,
587+
submittedTransactionMetaMock,
588+
],
589+
});
590+
591+
pendingTransactionTracker.hub.addListener(
592+
'transaction-dropped',
593+
listener,
594+
);
595+
596+
await onPoll();
597+
598+
expect(listener).not.toHaveBeenCalled();
599+
});
568600
});
569601

570602
describe('fires confirmed event', () => {

packages/transaction-controller/src/helpers/PendingTransactionTracker.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,8 @@ export class PendingTransactionTracker {
543543
tx.status === TransactionStatus.confirmed &&
544544
tx.txParams.nonce &&
545545
tx.txParams.nonce === txParams.nonce &&
546-
tx.type !== TransactionType.incoming,
546+
tx.type !== TransactionType.incoming &&
547+
tx.isTransfer === undefined,
547548
);
548549
}
549550

0 commit comments

Comments
 (0)