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
9 changes: 9 additions & 0 deletions app/components/Nav/Main/onUnapprovedTransaction.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@ describe('onUnapprovedTransaction', () => {
expect(callbacks.autoSign).not.toHaveBeenCalled();
});

it('skips processing when origin is MetaMask Mobile Card (MMM_CARD)', () => {
const callbacks = mockCallbacks();
const txMeta = buildSwapTxMeta({ origin: 'MetaMask Mobile Card' });

onUnapprovedTransaction(txMeta, callbacks);

expect(callbacks.autoSign).not.toHaveBeenCalled();
});

it('calls autoSign for hardware wallet swap', () => {
isHardwareAccountMock.mockReturnValue(true);
const callbacks = mockCallbacks();
Expand Down
6 changes: 5 additions & 1 deletion app/components/Nav/Main/onUnapprovedTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ export function onUnapprovedTransaction(
) {
const transactionMeta = cloneDeep(transactionMetaOriginal);

if (transactionMeta.origin === TransactionTypes.MMM) return;
if (
transactionMeta.origin === TransactionTypes.MMM ||
transactionMeta.origin === TransactionTypes.MMM_CARD
)
return;

const to = transactionMeta.txParams.to?.toLowerCase();
const data = transactionMeta.txParams.data as string;
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/Card/hooks/useCardDelegation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ describe('useCardDelegation', () => {
},
{
networkClientId: mockNetworkClientId,
origin: TransactionTypes.MMM,
origin: TransactionTypes.MMM_CARD,
type: TransactionType.tokenMethodApprove,
deviceConfirmedOn: WalletDevice.MM_MOBILE,
requireApproval: true,
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/Card/hooks/useCardDelegation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export const useCardDelegation = (token?: CardTokenAllowance | null) => {
},
{
networkClientId,
origin: TransactionTypes.MMM,
origin: TransactionTypes.MMM_CARD,
type: TransactionType.tokenMethodApprove,
deviceConfirmedOn: WalletDevice.MM_MOBILE,
requireApproval: true,
Expand Down
1 change: 1 addition & 0 deletions app/constants/transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const PREFIX_HEX_STRING = '0x';
export const INTERNAL_ORIGINS = [
process.env.MM_FOX_CODE,
TransactionTypes.MMM,
TransactionTypes.MMM_CARD,
ORIGIN_METAMASK,
];

Expand Down
6 changes: 5 additions & 1 deletion app/core/Permissions/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ import { getNetworkConfigurationsByCaipChainId } from '../../selectors/networkCo
import { areAddressesEqual } from '../../util/address';
import Logger from '../../util/Logger';

const INTERNAL_ORIGINS = [process.env.MM_FOX_CODE, TransactionTypes.MMM];
const INTERNAL_ORIGINS = [
process.env.MM_FOX_CODE,
TransactionTypes.MMM,
TransactionTypes.MMM_CARD,
];

// TODO: Replace "any" with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down
1 change: 1 addition & 0 deletions app/core/TransactionTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ export default {
ERC1155: 'ERC1155',
},
MMM: 'MetaMask Mobile',
MMM_CARD: 'MetaMask Mobile Card',
MM: 'metamask',
};
Loading