diff --git a/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts b/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts index 383a3bd6b924..4aeda07a3758 100644 --- a/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts +++ b/test/e2e/tests/confirmations/signatures/nft-permit.spec.ts @@ -126,9 +126,9 @@ async function assertInfoValues(driver: Driver) { text: '0x581c3...45947', }); - const title = driver.findElement({ text: 'Withdrawal request' }); + const title = driver.findElement({ text: 'Signature request' }); const description = driver.findElement({ - text: 'This site wants permission to withdraw your NFTs', + text: 'Review request details before you confirm.', }); const primaryType = driver.findElement({ text: 'Permit' }); const spender = driver.findElement({ diff --git a/test/integration/confirmations/signatures/permit.test.tsx b/test/integration/confirmations/signatures/permit.test.tsx index 7af3be743f5f..ba51deb7336c 100644 --- a/test/integration/confirmations/signatures/permit.test.tsx +++ b/test/integration/confirmations/signatures/permit.test.tsx @@ -191,9 +191,9 @@ describe('Permit Confirmation', () => { }); await waitFor(() => { - expect(screen.getByText('Spending cap request')).toBeInTheDocument(); + expect(screen.getByText('Signature request')).toBeInTheDocument(); expect( - screen.getByText('This site wants permission to spend your tokens.'), + screen.getByText('Review request details before you confirm.'), ).toBeInTheDocument(); }); }); diff --git a/ui/pages/confirmations/components/confirm/title/title.test.tsx b/ui/pages/confirmations/components/confirm/title/title.test.tsx index 3d4d6672940d..b20b67b05c97 100644 --- a/ui/pages/confirmations/components/confirm/title/title.test.tsx +++ b/ui/pages/confirmations/components/confirm/title/title.test.tsx @@ -8,13 +8,8 @@ import { getMockPersonalSignConfirmStateForRequest, getMockSetApprovalForAllConfirmState, getMockTypedSignConfirmState, - getMockTypedSignConfirmStateForRequest, } from '../../../../../../test/data/confirmations/helper'; import { unapprovedPersonalSignMsg } from '../../../../../../test/data/confirmations/personal_sign'; -import { - permitNFTSignatureMsg, - permitSignatureMsg, -} from '../../../../../../test/data/confirmations/typed_sign'; import { renderWithConfirmContextProvider } from '../../../../../../test/lib/confirmations/render-helpers'; import { tEn } from '../../../../../../test/lib/i18n-helpers'; import { @@ -59,36 +54,6 @@ describe('ConfirmTitle', () => { ).toBeInTheDocument(); }); - it('should render the title and description for a permit signature', () => { - const mockStore = configureMockStore([])( - getMockTypedSignConfirmStateForRequest(permitSignatureMsg), - ); - const { getByText } = renderWithConfirmContextProvider( - , - mockStore, - ); - - expect(getByText('Spending cap request')).toBeInTheDocument(); - expect( - getByText('This site wants permission to spend your tokens.'), - ).toBeInTheDocument(); - }); - - it('should render the title and description for a NFT permit signature', () => { - const mockStore = configureMockStore([])( - getMockTypedSignConfirmStateForRequest(permitNFTSignatureMsg), - ); - const { getByText } = renderWithConfirmContextProvider( - , - mockStore, - ); - - expect(getByText('Withdrawal request')).toBeInTheDocument(); - expect( - getByText('This site wants permission to withdraw your NFTs'), - ).toBeInTheDocument(); - }); - it('should render the title and description for typed signature', () => { const mockStore = configureMockStore([])(getMockTypedSignConfirmState()); const { getByText } = renderWithConfirmContextProvider( diff --git a/ui/pages/confirmations/components/confirm/title/title.tsx b/ui/pages/confirmations/components/confirm/title/title.tsx index a926c0f6b482..5fa3cc5b96f9 100644 --- a/ui/pages/confirmations/components/confirm/title/title.tsx +++ b/ui/pages/confirmations/components/confirm/title/title.tsx @@ -4,7 +4,6 @@ import { } from '@metamask/transaction-controller'; import React, { memo, useMemo } from 'react'; -import { TokenStandard } from '../../../../../../shared/constants/transaction'; import GeneralAlert from '../../../../../components/app/alert-system/general-alert/general-alert'; import { Box, Text } from '../../../../../components/component-library'; import { @@ -14,7 +13,6 @@ import { } from '../../../../../helpers/constants/design-system'; import useAlerts from '../../../../../hooks/useAlerts'; import { useI18nContext } from '../../../../../hooks/useI18nContext'; -import { TypedSignSignaturePrimaryTypes } from '../../../constants'; import { useConfirmContext } from '../../../context/confirm'; import { Confirmation, SignatureRequestType } from '../../../types/confirm'; import { isSIWESignatureRequest } from '../../../utils'; @@ -61,8 +59,6 @@ const getTitle = ( customSpendingCap?: string, isRevokeSetApprovalForAll?: boolean, pending?: boolean, - primaryType?: keyof typeof TypedSignSignaturePrimaryTypes, - tokenStandard?: string, ) => { if (pending) { return ''; @@ -79,12 +75,6 @@ const getTitle = ( } return t('confirmTitleSignature'); case TransactionType.signTypedData: - if (primaryType === TypedSignSignaturePrimaryTypes.PERMIT) { - if (tokenStandard === TokenStandard.ERC721) { - return t('setApprovalForAllRedesignedTitle'); - } - return t('confirmTitlePermitTokens'); - } return t('confirmTitleSignature'); case TransactionType.tokenMethodApprove: if (isNFT) { @@ -113,8 +103,6 @@ const getDescription = ( customSpendingCap?: string, isRevokeSetApprovalForAll?: boolean, pending?: boolean, - primaryType?: keyof typeof TypedSignSignaturePrimaryTypes, - tokenStandard?: string, ) => { if (pending) { return ''; @@ -131,12 +119,6 @@ const getDescription = ( } return t('confirmTitleDescSign'); case TransactionType.signTypedData: - if (primaryType === TypedSignSignaturePrimaryTypes.PERMIT) { - if (tokenStandard === TokenStandard.ERC721) { - return t('confirmTitleDescApproveTransaction'); - } - return t('confirmTitleDescPermitSignature'); - } return t('confirmTitleDescSign'); case TransactionType.tokenMethodApprove: if (isNFT) { @@ -195,8 +177,6 @@ const ConfirmTitle: React.FC = memo(() => { customSpendingCap, isRevokeSetApprovalForAll, spendingCapPending || revokePending, - primaryType, - tokenStandard, ), [ currentConfirmation, @@ -219,8 +199,6 @@ const ConfirmTitle: React.FC = memo(() => { customSpendingCap, isRevokeSetApprovalForAll, spendingCapPending || revokePending, - primaryType, - tokenStandard, ), [ currentConfirmation, diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap index 9f718a4b8a03..1d504025a44d 100644 --- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap +++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap @@ -457,12 +457,12 @@ exports[`Confirm should match snapshot for signature - typed sign - V4 - PermitB

- Spending cap request + Signature request

- This site wants permission to spend your tokens. + Review request details before you confirm.

- Spending cap request + Signature request

- This site wants permission to spend your tokens. + Review request details before you confirm.

- Spending cap request + Signature request

- This site wants permission to spend your tokens. + Review request details before you confirm.