-
- {t('accessAndSpendNotice', [origin])}
-
-
-
- {t('approvedAmountWithColon')}
-
-
- {`${Number(customTokenAmount || tokenAmount)} ${tokenSymbol}`}
-
-
-
-
- {t('grantedToWithColon')}
-
-
- {`${displayedAddress}`}
-
-
-
-
-
-
-
- {this.renderApproveContentCard({
- symbol: ,
- title: t('permissionRequest'),
- content: this.renderERC20PermissionContent(),
- showEdit: true,
- onEditClick: () =>
- showEditApprovalPermissionModal({
- customTokenAmount,
- decimals,
- origin,
- setCustomAmount,
- tokenAmount,
- tokenSymbol,
- tokenBalance,
- }),
- })}
-
-
- {this.renderApproveContentCard({
- symbol: ,
- title: 'Data',
- content: this.renderDataContent(),
- noBorder: true,
- })}
-
-
-
- showEditApprovalPermissionModal({
- customTokenAmount,
- decimals,
- origin,
- setCustomAmount,
- tokenAmount,
- tokenSymbol,
- tokenBalance,
- })
- }
- >
- {t('editPermission')}
-
-
{this.renderApproveContentCard({
symbol:
,
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
index 0d59cdf37..321151d57 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
@@ -13,17 +13,12 @@ const renderComponent = (props) => {
};
const props = {
- decimals: 16,
siteImage: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
- customTokenAmount: '10',
- tokenAmount: '10',
origin: 'https://metamask.github.io/test-dapp/',
- tokenSymbol: 'TST',
- assetStandard: TokenStandard.ERC20,
+ tokenSymbol: 'TestDappCollectibles (#1)',
+ assetStandard: TokenStandard.ERC721,
tokenImage: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
- tokenBalance: '15',
showCustomizeGasModal: jest.fn(),
- showEditApprovalPermissionModal: jest.fn(),
data: '0x095ea7b30000000000000000000000009bc5baf874d2da8d216ae9f137804184ee5afef40000000000000000000000000000000000000000000000000000000000011170',
toAddress: '0x9bc5baf874d2da8d216ae9f137804184ee5afef4',
currentCurrency: 'TST',
@@ -47,21 +42,16 @@ describe('ConfirmApproveContent Component', () => {
queryByText('https://metamask.github.io/test-dapp/'),
).toBeInTheDocument();
expect(getByTestId('confirm-approve-title').textContent).toStrictEqual(
- ' Give permission to access your TST? ',
+ ' Allow access to and transfer of your TestDappCollectibles (#1)? ',
);
expect(
queryByText(
- 'By granting permission, you are allowing the following contract to access your funds',
+ 'This allows a third party to access and transfer the following NFTs without further notice until you revoke its access.',
),
).toBeInTheDocument();
- expect(queryByText('0x9bc5...fef4')).toBeInTheDocument();
+ expect(queryByText('Verify contract details')).toBeInTheDocument();
expect(queryByText('View full transaction details')).toBeInTheDocument();
- expect(queryByText('Edit permission')).toBeInTheDocument();
- const editPermission = getByText('Edit permission');
- fireEvent.click(editPermission);
- expect(props.showEditApprovalPermissionModal).toHaveBeenCalledTimes(1);
-
const editButtons = getAllByText('Edit');
expect(queryByText('Transaction fee')).toBeInTheDocument();
@@ -79,13 +69,21 @@ describe('ConfirmApproveContent Component', () => {
const showViewTxDetails = getByText('View full transaction details');
expect(queryByText('Permission request')).not.toBeInTheDocument();
- expect(queryByText('Approved amount:')).not.toBeInTheDocument();
+ expect(queryByText('Approved asset:')).not.toBeInTheDocument();
expect(queryByText('Granted to:')).not.toBeInTheDocument();
+ expect(queryByText('Data')).not.toBeInTheDocument();
fireEvent.click(showViewTxDetails);
expect(getByText('Hide full transaction details')).toBeInTheDocument();
expect(getByText('Permission request')).toBeInTheDocument();
- expect(getByText('Approved amount:')).toBeInTheDocument();
+ expect(getByText('Approved asset:')).toBeInTheDocument();
expect(getByText('Granted to:')).toBeInTheDocument();
- expect(getByText('0x9bc5...fef4')).toBeInTheDocument();
+ expect(getByText('Contract (0x9bc5baF8...fEF4)')).toBeInTheDocument();
+ expect(getByText('Data')).toBeInTheDocument();
+ expect(getByText('Function: Approve')).toBeInTheDocument();
+ expect(
+ getByText(
+ '0x095ea7b30000000000000000000000009bc5baf874d2da8d216ae9f137804184ee5afef40000000000000000000000000000000000000000000000000000000000011170',
+ ),
+ ).toBeInTheDocument();
});
});
diff --git a/ui/pages/confirm-approve/confirm-approve.js b/ui/pages/confirm-approve/confirm-approve.js
index 14158d2fe..17f0c0bf6 100644
--- a/ui/pages/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirm-approve/confirm-approve.js
@@ -27,7 +27,6 @@ import {
getRpcPrefsForCurrentProvider,
getIsMultiLayerFeeNetwork,
checkNetworkAndAccountSupports1559,
- getIsImprovedTokenAllowanceEnabled,
} from '../../selectors';
import { useApproveTransaction } from '../../hooks/useApproveTransaction';
import AdvancedGasFeePopover from '../../components/app/advanced-gas-fee-popover';
@@ -87,10 +86,6 @@ export default function ConfirmApprove({
const supportsEIP1559 = networkAndAccountSupports1559;
- const improvedTokenAllowanceEnabled = useSelector(
- getIsImprovedTokenAllowanceEnabled,
- );
-
const previousTokenAmount = useRef(tokenAmount);
const {
approveTransaction,
@@ -142,9 +137,7 @@ export default function ConfirmApprove({
const { iconUrl: siteImage = '' } = subjectMetadata[origin] || {};
let tokensText;
- if (assetStandard === TokenStandard.ERC20) {
- tokensText = `${Number(tokenAmount)} ${tokenSymbol}`;
- } else if (
+ if (
assetStandard === TokenStandard.ERC721 ||
assetStandard === TokenStandard.ERC1155
) {
@@ -171,7 +164,7 @@ export default function ConfirmApprove({
if (assetStandard === undefined) {
return
;
}
- if (improvedTokenAllowanceEnabled && assetStandard === TokenStandard.ERC20) {
+ if (assetStandard === TokenStandard.ERC20) {
return (
@@ -234,46 +227,15 @@ export default function ConfirmApprove({
userAddress={userAddress}
isSetApproveForAll={isSetApproveForAll}
isApprovalOrRejection={isApprovalOrRejection}
- decimals={decimals}
siteImage={siteImage}
- setCustomAmount={setCustomPermissionAmount}
- customTokenAmount={String(customPermissionAmount)}
- tokenAmount={tokenAmount}
origin={formattedOrigin}
tokenSymbol={tokenSymbol}
tokenImage={tokenImage}
- tokenBalance={tokenBalance}
tokenId={tokenId}
assetName={assetName}
assetStandard={assetStandard}
tokenAddress={tokenAddress}
showCustomizeGasModal={approveTransaction}
- showEditApprovalPermissionModal={({
- /* eslint-disable no-shadow */
- customTokenAmount,
- decimals,
- origin,
- setCustomAmount,
- tokenAmount,
- tokenBalance,
- tokenSymbol,
- /* eslint-enable no-shadow */
- }) =>
- dispatch(
- showModal({
- name: 'EDIT_APPROVAL_PERMISSION',
- customTokenAmount,
- decimals,
- origin,
- setCustomAmount,
- tokenAmount,
- tokenBalance,
- tokenSymbol,
- tokenId,
- assetStandard,
- }),
- )
- }
data={customData || transactionData}
toAddress={toAddress}
currentCurrency={currentCurrency}
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js
index bd9dab471..000c05dd2 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js
@@ -24,8 +24,6 @@ export default class ExperimentalTab extends PureComponent {
setUseNftDetection: PropTypes.func,
setOpenSeaEnabled: PropTypes.func,
openSeaEnabled: PropTypes.bool,
- improvedTokenAllowanceEnabled: PropTypes.bool,
- setImprovedTokenAllowanceEnabled: PropTypes.func,
transactionSecurityCheckEnabled: PropTypes.bool,
setTransactionSecurityCheckEnabled: PropTypes.func,
};
@@ -102,43 +100,6 @@ export default class ExperimentalTab extends PureComponent {
);
}
- renderImprovedTokenAllowanceToggle() {
- const { t } = this.context;
- const { improvedTokenAllowanceEnabled, setImprovedTokenAllowanceEnabled } =
- this.props;
-
- return (
-
-
-
{t('improvedTokenAllowance')}
-
- {t('improvedTokenAllowanceDescription')}
-
-
-
-
- {
- this.context.trackEvent({
- category: EVENT.CATEGORIES.SETTINGS,
- event: 'Enabled/Disable ImprovedTokenAllowance',
- properties: {
- action: 'Enabled/Disable ImprovedTokenAllowance',
- legacy_event: true,
- },
- });
- setImprovedTokenAllowanceEnabled(!value);
- }}
- offLabel={t('off')}
- onLabel={t('on')}
- />
-
-
-
{process.env.TRANSACTION_SECURITY_PROVIDER &&
this.renderTransactionSecurityCheckToggle()}
- {this.renderImprovedTokenAllowanceToggle()}
{this.renderOpenSeaEnabledToggle()}
);
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.container.js b/ui/pages/settings/experimental-tab/experimental-tab.container.js
index 8d028d5a9..97d8ddbd8 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.container.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.container.js
@@ -4,13 +4,11 @@ import { withRouter } from 'react-router-dom';
import {
setUseNftDetection,
setOpenSeaEnabled,
- setImprovedTokenAllowanceEnabled,
setTransactionSecurityCheckEnabled,
} from '../../../store/actions';
import {
getUseNftDetection,
getOpenSeaEnabled,
- getIsImprovedTokenAllowanceEnabled,
getIsTransactionSecurityCheckEnabled,
} from '../../../selectors';
import ExperimentalTab from './experimental-tab.component';
@@ -19,7 +17,6 @@ const mapStateToProps = (state) => {
return {
useNftDetection: getUseNftDetection(state),
openSeaEnabled: getOpenSeaEnabled(state),
- improvedTokenAllowanceEnabled: getIsImprovedTokenAllowanceEnabled(state),
transactionSecurityCheckEnabled:
getIsTransactionSecurityCheckEnabled(state),
};
@@ -29,8 +26,6 @@ const mapDispatchToProps = (dispatch) => {
return {
setUseNftDetection: (val) => dispatch(setUseNftDetection(val)),
setOpenSeaEnabled: (val) => dispatch(setOpenSeaEnabled(val)),
- setImprovedTokenAllowanceEnabled: (val) =>
- dispatch(setImprovedTokenAllowanceEnabled(val)),
setTransactionSecurityCheckEnabled: (val) =>
dispatch(setTransactionSecurityCheckEnabled(val)),
};
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 420f0b9f2..a5ce6a86f 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1306,16 +1306,6 @@ export function getIstokenDetectionInactiveOnNonMainnetSupportedNetwork(state) {
return isDynamicTokenListAvailable && !useTokenDetection && !isMainnet;
}
-/**
- * To get the `improvedTokenAllowanceEnabled` value which determines whether we use the improved token allowance
- *
- * @param {*} state
- * @returns Boolean
- */
-export function getIsImprovedTokenAllowanceEnabled(state) {
- return state.metamask.improvedTokenAllowanceEnabled;
-}
-
/**
* To get the `transactionSecurityCheckEnabled` value which determines whether we use the transaction security check
*
diff --git a/ui/store/actions.js b/ui/store/actions.js
index 78ebb1512..12e4309b5 100644
--- a/ui/store/actions.js
+++ b/ui/store/actions.js
@@ -3811,20 +3811,6 @@ export function setCollectiblesDetectionNoticeDismissed() {
]);
}
-export function setImprovedTokenAllowanceEnabled(
- improvedTokenAllowanceEnabled,
-) {
- return async () => {
- try {
- await submitRequestToBackground('setImprovedTokenAllowanceEnabled', [
- improvedTokenAllowanceEnabled,
- ]);
- } catch (error) {
- log.error(error);
- }
- };
-}
-
export function setTransactionSecurityCheckEnabled(
transactionSecurityCheckEnabled,
) {