Skip to content

Commit 16920ca

Browse files
committed
fix: apply suggestions
1 parent cee65f3 commit 16920ca

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

test/data/confirmations/contract-interaction.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export const genUnapprovedContractInteractionConfirmation = ({
3333
simulationData,
3434
gasFeeTokens,
3535
selectedGasFeeToken,
36-
type = TransactionType.contractInteraction,
3736
}: {
3837
address?: Hex;
3938
authorizationList?: AuthorizationList;
@@ -43,7 +42,6 @@ export const genUnapprovedContractInteractionConfirmation = ({
4342
gasFeeTokens?: GasFeeToken[];
4443
selectedGasFeeToken?: Hex;
4544
simulationData?: SimulationData;
46-
type?: TransactionType;
4745
} = {}): Confirmation => {
4846
const confirmation: Confirmation = {
4947
actionId: String(400855682),
@@ -180,7 +178,7 @@ export const genUnapprovedContractInteractionConfirmation = ({
180178
value: '0x3782dace9d900000',
181179
},
182180
gasLimitNoBuffer: '0xab77',
183-
type,
181+
type: TransactionType.contractInteraction,
184182
userEditedGasLimit: false,
185183
userFeeLevel: 'medium',
186184
verifiedOnBlockchain: false,

ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.test.tsx

+19-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import configureMockStore from 'redux-mock-store';
33
import thunk from 'redux-thunk';
44
import { Hex } from '@metamask/utils';
55
import { toHex } from '@metamask/controller-utils';
6-
import { TransactionType } from '@metamask/transaction-controller';
6+
import {
7+
NestedTransactionMetadata,
8+
TransactionType,
9+
} from '@metamask/transaction-controller';
710
import {
811
getMockConfirmState,
912
getMockConfirmStateForTransaction,
@@ -179,8 +182,22 @@ describe('<TransactionDetails />', () => {
179182

180183
describe('RecipientRow', () => {
181184
it('should not be displayed when the transaction is a batch transaction', () => {
185+
const ADDRESS_MOCK = '0x88aa6343307ec9a652ccddda3646e62b2f1a5125';
186+
const ADDRESS_2_MOCK = '0x1234567890123456789012345678901234567891';
182187
const contractInteraction = genUnapprovedContractInteractionConfirmation({
183-
type: TransactionType.batch,
188+
address: ADDRESS_MOCK,
189+
nestedTransactions: [
190+
{
191+
to: ADDRESS_MOCK,
192+
data: '0x1',
193+
type: TransactionType.contractInteraction,
194+
},
195+
{
196+
to: ADDRESS_2_MOCK,
197+
data: '0x2',
198+
type: TransactionType.contractInteraction,
199+
},
200+
] as NestedTransactionMetadata[],
184201
});
185202
const state = getMockConfirmStateForTransaction(contractInteraction, {
186203
metamask: {

ui/pages/confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
TransactionMeta,
3-
TransactionType,
4-
} from '@metamask/transaction-controller';
1+
import { TransactionMeta } from '@metamask/transaction-controller';
52
import { isValidAddress } from 'ethereumjs-util';
63
import React, { useMemo } from 'react';
74
import { useSelector } from 'react-redux';
@@ -57,8 +54,7 @@ export const RecipientRow = ({ recipient }: { recipient?: Hex } = {}) => {
5754
const { currentConfirmation } = useConfirmContext<TransactionMeta>();
5855
const { from } = currentConfirmation?.txParams ?? {};
5956
const to = recipient ?? currentConfirmation?.txParams?.to;
60-
61-
const { nestedTransactions } = currentConfirmation;
57+
const { nestedTransactions } = currentConfirmation ?? {};
6258
const isBatch = Boolean(nestedTransactions?.length) && to === from;
6359

6460
if (!to || !isValidAddress(to) || isBatch) {

0 commit comments

Comments
 (0)