| t |
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1>");try{for(var c=0,d=this.length;c
+ {showErrorBanner && (
+
+
+ {t('transactionFailedBannerMessage')}
+
+
+ )}
{showSpeedUp && (
)}
@@ -258,22 +281,18 @@ export default class TransactionListItemDetails extends PureComponent {
data-testid="transaction-list-item-details-tx-status"
>
{t('status')}
-
-
+
-
{
+const render = (overrideProps) => {
const rpcPrefs = {
blockExplorerUrl: 'https://customblockexplorer.com/',
};
@@ -71,7 +71,7 @@ const render = async (overrideProps) => {
senderAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
tryReverseResolveAddress: jest.fn(),
transactionGroup,
- transactionStatus: () => ,
+ transactionStatus: () => ,
blockExplorerLinkText,
rpcPrefs,
...overrideProps,
@@ -79,59 +79,57 @@ const render = async (overrideProps) => {
const mockStore = configureMockStore([thunk])(mockState);
- let result;
-
- await act(
- async () =>
- (result = renderWithProvider(
-
)}
- {completedTransactions.length > 0 ? (
- completedTransactions
- .map(removeIncomingTxsButToAnotherAddress)
- .map(removeTxGroupsWithNoTx)
- .filter(dateGroupsWithTransactionGroups)
- .slice(0, limit)
- .map((dateGroup) => {
- return dateGroup.transactionGroups.map(
- (transactionGroup, index) => {
- return (
-
- {renderDateStamp(index, dateGroup)}
- {transactionGroup.initialTransaction
- ?.isSmartTransaction ? (
-
- );
- },
- );
- })
- ) : (
-
-
- {isChainIdMismatch
- ? noTransactionsMessage
- : t('noTransactions')}
-
-
- )}
+ {completedTransactions.length > 0
+ ? completedTransactions
+ .map(removeIncomingTxsButToAnotherAddress)
+ .map(removeTxGroupsWithNoTx)
+ .filter(dateGroupsWithTransactionGroups)
+ .slice(0, limit)
+ .map((dateGroup) => {
+ return dateGroup.transactionGroups.map(
+ (transactionGroup, index) => {
+ return (
+
+ {renderDateStamp(index, dateGroup)}
+ {transactionGroup.initialTransaction
+ ?.isSmartTransaction ? (
+
+ );
+ },
+ );
+ })
+ : null}
{completedTransactions.length > limit && (
diff --git a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
index 7b0605b7ea60..a23161205c8e 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -348,7 +348,7 @@ exports[`SendPage render and initialization should render correctly even when a
style="bottom: -1px; right: 2px;"
>
-
-
+
?
@@ -191,7 +191,7 @@ exports[`TokenListItem should display warning scam modal fallback when safechain
class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
>
?
@@ -270,7 +270,7 @@ exports[`TokenListItem should render correctly 1`] = `
class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
>
?
@@ -403,7 +403,7 @@ exports[`TokenListItem should render crypto balance with warning scam 1`] = `
class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
>
?
diff --git a/ui/components/multichain/token-list-item/token-list-item.tsx b/ui/components/multichain/token-list-item/token-list-item.tsx
index 40b91a001f17..d5ce348e0297 100644
--- a/ui/components/multichain/token-list-item/token-list-item.tsx
+++ b/ui/components/multichain/token-list-item/token-list-item.tsx
@@ -40,7 +40,6 @@ import {
} from '../../component-library';
import {
getMetaMetricsId,
- getTestNetworkBackgroundColor,
getParticipateInMetaMetrics,
getDataCollectionForMarketing,
getMarketData,
@@ -228,7 +227,6 @@ export const TokenListItem = ({
);
// Used for badge icon
const allNetworks = useSelector(getNetworkConfigurationsByChainId);
- const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
return (
-
+ />
-
-
- You have no transactions
-
-
-
+ />
-
-
- You have no transactions
-
-
-
+ />
-
-
- You have no transactions
-
-
+
+
+
+
+
+
+
+ + Estimated changes +
+
+
+
+
+
+
+
+ + You're giving someone else permission to withdraw NFTs from your account. +
+
+
+
+
+
+
+ + Withdraw +
+
+
+
+
+
+
+ + #0.0001 +
+
+
+
+
+
+ + 0x07614...3ad68 +
+
+
+
+
diff --git a/ui/pages/confirmations/components/confirm/info/approve/approve-details/approve-details.test.tsx b/ui/pages/confirmations/components/confirm/info/approve/approve-details/approve-details.test.tsx
index daec14c166af..df6147914304 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/approve-details/approve-details.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/approve-details/approve-details.test.tsx
@@ -1,15 +1,29 @@
import React from 'react';
import configureMockStore from 'redux-mock-store';
import thunk from 'redux-thunk';
-import mockState from '../../../../../../../../test/data/mock-state.json';
import { renderWithConfirmContextProvider } from '../../../../../../../../test/lib/confirmations/render-helpers';
+import { genUnapprovedApproveConfirmation } from '../../../../../../../../test/data/confirmations/token-approve';
+import { getMockConfirmStateForTransaction } from '../../../../../../../../test/data/confirmations/helper';
import { ApproveDetails } from './approve-details';
+jest.mock(
+ '../../../../../../../components/app/alert-system/contexts/alertMetricsContext.tsx',
+ () => ({
+ useAlertMetrics: () => ({
+ trackInlineAlertClicked: jest.fn(),
+ trackAlertRender: jest.fn(),
+ trackAlertActionClicked: jest.fn(),
+ }),
+ }),
+);
+
describe('();
const { isNFT } = useIsNFT(transactionMeta);
+ const parsedTransactionData = useTokenTransactionData();
- const decodedResponse = useDecodedTransactionData();
-
- const { value, pending } = decodedResponse;
-
- if (pending) {
- return ();
- const fetchExchangeRate = async () => {
- const result = await useTokenExchangeRate(transactionMeta?.txParams?.to);
-
- setExchangeRate(result);
- };
- fetchExchangeRate();
+ const decodedTransferValue =
+ decimals !== undefined && value
+ ? calcTokenAmount(value, Number(decimals)).toFixed()
+ : '0';
const fiatValue =
exchangeRate &&
decodedTransferValue &&
exchangeRate.times(decodedTransferValue, 10).toNumber();
- const fiatFormatter = useFiatFormatter();
+
const fiatDisplayValue =
fiatValue && fiatFormatter(fiatValue, { shorten: true });
- const locale = useSelector(getIntlLocale);
const displayTransferValue = formatAmount(
locale,
new BigNumber(decodedTransferValue),
@@ -90,6 +47,5 @@ export const useTokenValues = (transactionMeta: TransactionMeta) => {
displayTransferValue,
fiatDisplayValue,
fiatValue,
- pending: pending || isDecodedTransferValuePending,
};
};
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useDecodedTransactionData.test.ts b/ui/pages/confirmations/components/confirm/info/hooks/useDecodedTransactionData.test.ts
index 32a711abf754..c12ce7025cb5 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/useDecodedTransactionData.test.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useDecodedTransactionData.test.ts
@@ -76,6 +76,32 @@ describe('useDecodedTransactionData', () => {
expect(result).toStrictEqual({ pending: false, value: undefined });
});
+ it('returns undefined if decode disabled', async () => {
+ decodeTransactionDataMock.mockResolvedValue(TRANSACTION_DECODE_SOURCIFY);
+
+ const result = await runHook(
+ getMockConfirmStateForTransaction(
+ {
+ id: '123',
+ chainId: CHAIN_ID_MOCK,
+ type: TransactionType.contractInteraction,
+ status: TransactionStatus.unapproved,
+ txParams: {
+ data: TRANSACTION_DATA_UNISWAP,
+ to: CONTRACT_ADDRESS_MOCK,
+ } as TransactionParams,
+ },
+ {
+ metamask: {
+ use4ByteResolution: false,
+ },
+ },
+ ),
+ );
+
+ expect(result).toStrictEqual({ pending: false, value: undefined });
+ });
+
it('returns the decoded data', async () => {
decodeTransactionDataMock.mockResolvedValue(TRANSACTION_DECODE_SOURCIFY);
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useDecodedTransactionData.ts b/ui/pages/confirmations/components/confirm/info/hooks/useDecodedTransactionData.ts
index 5276e02eaad1..3486f16ed864 100644
--- a/ui/pages/confirmations/components/confirm/info/hooks/useDecodedTransactionData.ts
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useDecodedTransactionData.ts
@@ -1,6 +1,7 @@
import { Hex } from '@metamask/utils';
import { TransactionMeta } from '@metamask/transaction-controller';
+import { useSelector } from 'react-redux';
import {
AsyncResult,
useAsyncResult,
@@ -9,11 +10,13 @@ import { decodeTransactionData } from '../../../../../../store/actions';
import { DecodedTransactionDataResponse } from '../../../../../../../shared/types/transaction-decode';
import { useConfirmContext } from '../../../../context/confirm';
import { hasTransactionData } from '../../../../../../../shared/modules/transaction.utils';
+import { use4ByteResolutionSelector } from '../../../../../../selectors';
export function useDecodedTransactionData(
transactionTypeFilter?: string,
): AsyncResult {
const { currentConfirmation } = useConfirmContext();
+ const isDecodeEnabled = useSelector(use4ByteResolutionSelector);
const currentTransactionType = currentConfirmation?.type;
const chainId = currentConfirmation?.chainId as Hex;
@@ -23,6 +26,7 @@ export function useDecodedTransactionData(
return useAsyncResult(async () => {
if (
+ !isDecodeEnabled ||
!hasTransactionData(transactionData) ||
!transactionTo ||
(transactionTypeFilter &&
@@ -36,5 +40,11 @@ export function useDecodedTransactionData(
chainId,
contractAddress,
});
- }, [transactionData, transactionTo, chainId, contractAddress]);
+ }, [
+ isDecodeEnabled,
+ transactionData,
+ transactionTo,
+ chainId,
+ contractAddress,
+ ]);
}
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useTokenTransactionData.test.ts b/ui/pages/confirmations/components/confirm/info/hooks/useTokenTransactionData.test.ts
new file mode 100644
index 000000000000..f73372d9391f
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useTokenTransactionData.test.ts
@@ -0,0 +1,94 @@
+import { Hex } from '@metamask/utils';
+import { TransactionDescription } from '@ethersproject/abi';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../../../../test/data/confirmations/contract-interaction';
+import { getMockConfirmStateForTransaction } from '../../../../../../../test/data/confirmations/helper';
+import {
+ genUnapprovedTokenTransferConfirmation,
+ TRANSFER_FROM_TRANSACTION_DATA,
+} from '../../../../../../../test/data/confirmations/token-transfer';
+import { renderHookWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
+import { genUnapprovedApproveConfirmation } from '../../../../../../../test/data/confirmations/token-approve';
+import {
+ genUnapprovedSetApprovalForAllConfirmation,
+ INCREASE_ALLOWANCE_TRANSACTION_DATA,
+} from '../../../../../../../test/data/confirmations/set-approval-for-all';
+import { useTokenTransactionData } from './useTokenTransactionData';
+
+function runHook(transactionData: string) {
+ const transaction = genUnapprovedContractInteractionConfirmation({
+ txData: transactionData as Hex,
+ });
+
+ const state = getMockConfirmStateForTransaction(transaction);
+
+ const { result } = renderHookWithConfirmContextProvider(
+ useTokenTransactionData,
+ state,
+ );
+
+ return result.current as TransactionDescription;
+}
+
+describe('useTokenTransactionData', () => {
+ it('parses transfer transaction', () => {
+ const transactionData =
+ genUnapprovedTokenTransferConfirmation().txParams.data;
+
+ const result = runHook(transactionData);
+
+ expect(result.name).toBe('transfer');
+ expect(result.args._to).toBe('0x2e0D7E8c45221FcA00d74a3609A0f7097035d09B');
+ expect(result.args._value.toHexString()).toBe('0x01');
+ });
+
+ it('parses transferFrom transaction', () => {
+ const result = runHook(TRANSFER_FROM_TRANSACTION_DATA);
+
+ expect(result.name).toBe('transferFrom');
+ expect(result.args._from).toBe(
+ '0x2e0D7E8c45221FcA00d74a3609A0f7097035d09B',
+ );
+ expect(result.args._to).toBe('0x2e0d7E8c45221fCa00d74A3609A0F7097035D09c');
+ expect(result.args._value.toHexString()).toEqual('0x0123');
+ });
+
+ it('parses approve transaction', () => {
+ const transactionData = genUnapprovedApproveConfirmation().txParams.data;
+
+ const result = runHook(transactionData);
+
+ expect(result.name).toBe('approve');
+ expect(result.args._spender).toBe(
+ '0x2e0D7E8c45221FcA00d74a3609A0f7097035d09B',
+ );
+ expect(result.args._value.toHexString()).toBe('0x01');
+ });
+
+ it('parses setApprovalForAll transaction', () => {
+ const transactionData =
+ genUnapprovedSetApprovalForAllConfirmation().txParams.data;
+
+ const result = runHook(transactionData);
+
+ expect(result.name).toBe('setApprovalForAll');
+ expect(result.args._operator).toBe(
+ '0x2e0D7E8c45221FcA00d74a3609A0f7097035d09B',
+ );
+ expect(result.args._approved).toBe(true);
+ });
+
+ it('parses increaseAllowance transaction', () => {
+ const result = runHook(INCREASE_ALLOWANCE_TRANSACTION_DATA);
+
+ expect(result.name).toBe('increaseAllowance');
+ expect(result.args.spender).toBe(
+ '0x2e0D7E8c45221FcA00d74a3609A0f7097035d09B',
+ );
+ expect(result.args.increment.toHexString()).toBe('0x0123');
+ });
+
+ it('returns undefined if no transaction data', () => {
+ const result = runHook(undefined as never);
+ expect(result).toBeUndefined();
+ });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useTokenTransactionData.ts b/ui/pages/confirmations/components/confirm/info/hooks/useTokenTransactionData.ts
new file mode 100644
index 000000000000..c7ca2af1c19c
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useTokenTransactionData.ts
@@ -0,0 +1,14 @@
+import { TransactionMeta } from '@metamask/transaction-controller';
+import { useConfirmContext } from '../../../../context/confirm';
+import { parseStandardTokenTransactionData } from '../../../../../../../shared/modules/transaction.utils';
+
+export function useTokenTransactionData() {
+ const { currentConfirmation } = useConfirmContext();
+ const transactionData = currentConfirmation?.txParams?.data;
+
+ if (!transactionData) {
+ return undefined;
+ }
+
+ return parseStandardTokenTransactionData(transactionData);
+}
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useTransferRecipient.test.ts b/ui/pages/confirmations/components/confirm/info/hooks/useTransferRecipient.test.ts
new file mode 100644
index 000000000000..26d007ba148b
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useTransferRecipient.test.ts
@@ -0,0 +1,74 @@
+import {
+ TransactionMeta,
+ TransactionType,
+} from '@metamask/transaction-controller';
+import { renderHookWithConfirmContextProvider } from '../../../../../../../test/lib/confirmations/render-helpers';
+import { getMockConfirmStateForTransaction } from '../../../../../../../test/data/confirmations/helper';
+import { genUnapprovedContractInteractionConfirmation } from '../../../../../../../test/data/confirmations/contract-interaction';
+import { genUnapprovedTokenTransferConfirmation } from '../../../../../../../test/data/confirmations/token-transfer';
+import { useTransferRecipient } from './useTransferRecipient';
+
+const ADDRESS_MOCK = '0x2e0D7E8c45221FcA00d74a3609A0f7097035d09B';
+const ADDRESS_2_MOCK = '0x2e0D7E8c45221FcA00d74a3609A0f7097035d09C';
+
+const TRANSACTION_METADATA_MOCK =
+ genUnapprovedContractInteractionConfirmation() as TransactionMeta;
+
+function runHook(transaction?: TransactionMeta) {
+ const state = transaction
+ ? getMockConfirmStateForTransaction(transaction)
+ : {};
+
+ const { result } = renderHookWithConfirmContextProvider(
+ useTransferRecipient,
+ state,
+ );
+
+ return result.current as string | undefined;
+}
+
+describe('useTransferRecipient', () => {
+ it('returns undefined if no transaction', () => {
+ expect(runHook()).toBeUndefined();
+ });
+
+ it('returns parameter to address if simple send', () => {
+ expect(
+ runHook({
+ ...TRANSACTION_METADATA_MOCK,
+ type: TransactionType.simpleSend,
+ txParams: {
+ ...TRANSACTION_METADATA_MOCK.txParams,
+ to: ADDRESS_MOCK,
+ },
+ }),
+ ).toBe(ADDRESS_MOCK);
+ });
+
+ it('returns data to address if token data', () => {
+ expect(
+ runHook({
+ ...TRANSACTION_METADATA_MOCK,
+ txParams: {
+ ...TRANSACTION_METADATA_MOCK.txParams,
+ to: ADDRESS_2_MOCK,
+ data: genUnapprovedTokenTransferConfirmation().txParams.data,
+ },
+ }),
+ ).toBe(ADDRESS_MOCK);
+ });
+
+ it('returns parameter to address if token data but type is simple send', () => {
+ expect(
+ runHook({
+ ...TRANSACTION_METADATA_MOCK,
+ type: TransactionType.simpleSend,
+ txParams: {
+ ...TRANSACTION_METADATA_MOCK.txParams,
+ to: ADDRESS_2_MOCK,
+ data: genUnapprovedTokenTransferConfirmation().txParams.data,
+ },
+ }),
+ ).toBe(ADDRESS_2_MOCK);
+ });
+});
diff --git a/ui/pages/confirmations/components/confirm/info/hooks/useTransferRecipient.ts b/ui/pages/confirmations/components/confirm/info/hooks/useTransferRecipient.ts
new file mode 100644
index 000000000000..fcfd98fedaf4
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/info/hooks/useTransferRecipient.ts
@@ -0,0 +1,20 @@
+import {
+ TransactionMeta,
+ TransactionType,
+} from '@metamask/transaction-controller';
+import { useConfirmContext } from '../../../../context/confirm';
+import { useTokenTransactionData } from './useTokenTransactionData';
+
+export function useTransferRecipient() {
+ const { currentConfirmation: transactionMetadata } =
+ useConfirmContext();
+
+ const transactionData = useTokenTransactionData();
+ const transactionType = transactionMetadata?.type;
+ const transactionTo = transactionMetadata?.txParams?.to;
+ const transferTo = transactionData?.args?._to as string | undefined;
+
+ return transactionType === TransactionType.simpleSend
+ ? transactionTo
+ : transferTo;
+}
diff --git a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
index 406fd66ae962..6ec41230cdab 100644
--- a/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/native-transfer/__snapshots__/native-transfer.test.tsx.snap
@@ -16,6 +16,181 @@ exports[`NativeTransferInfo renders correctly 1`] = `
0 ETH
+
+
+
+
+
+
+ + Spender +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+
+
+
+
@@ -83,70 +157,144 @@ exports[`
+
+
+
+
+
+
+ + Permission for +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+
renders component for approve details 1`] = `
data-testid="confirmation__approve-details"
>
+
+
+
+
-
+
-
+ +
+
- Data
-
+
+
-
+ + 0x2e0D7...5d09B +
+
+
+
+
+
+ Request from +
+
+
-
+
+
+ metamask.github.io +
+
-
+
-
+ +
+
- Data
-
+
+
-
+ + 0x2e0D7...5d09B +
+
+
+
+
+
+ Request from +
+
+
-
+
+
+ metamask.github.io +
+
+
+
+
+
+
+
+
+
+
+ + From +
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+
+
+
+
+
+
+ + To +
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+
diff --git a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
index 5ce090406606..3e9233e5c742 100644
--- a/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/nft-token-transfer/__snapshots__/nft-token-transfer.test.tsx.snap
@@ -44,6 +44,181 @@ exports[`NFTTokenTransferInfo renders correctly 1`] = `
#undefined
+
+
+
+
+
+
+
+
+
+
+ + From +
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+
+
+
+
+
+
+ + To +
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
index 3b5d1dfc3e62..336ef3f9f92f 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/personal-sign.test.tsx
@@ -149,7 +149,7 @@ describe('PersonalSignInfo', () => {
getMockPersonalSignConfirmStateForRequest(signatureRequestSIWE);
(utils.isSIWESignatureRequest as jest.Mock).mockReturnValue(false);
- (snapUtils.isSnapId as jest.Mock).mockReturnValue(true);
+ (snapUtils.isSnapId as unknown as jest.Mock).mockReturnValue(true);
const mockStore = configureMockStore([])(state);
const { queryByText, getByText } = renderWithConfirmContextProvider(
@@ -171,7 +171,7 @@ describe('PersonalSignInfo', () => {
const state =
getMockPersonalSignConfirmStateForRequest(signatureRequestSIWE);
(utils.isSIWESignatureRequest as jest.Mock).mockReturnValue(false);
- (snapUtils.isSnapId as jest.Mock).mockReturnValue(true);
+ (snapUtils.isSnapId as unknown as jest.Mock).mockReturnValue(true);
const mockStore = configureMockStore([])(state);
const { getByText, queryByText } = renderWithConfirmContextProvider(
diff --git a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
index a3f8724e7561..034bb47c38cb 100644
--- a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/__snapshots__/set-approval-for-all-info.test.tsx.snap
@@ -110,6 +110,102 @@ exports[`
+
+
renders component for approve request 1`] = `
+
+
+
+ + Permission for +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+
renders component for approve request 1`] = `
', () => {
mockStore,
);
- await waitFor(() => {
- expect(screen.getByText('Data')).toBeInTheDocument();
- });
-
expect(container).toMatchSnapshot();
});
diff --git a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/set-approval-for-all-info.tsx b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/set-approval-for-all-info.tsx
index 6902a6da9b1f..e2371d09454d 100644
--- a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/set-approval-for-all-info.tsx
+++ b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/set-approval-for-all-info.tsx
@@ -2,11 +2,10 @@ import { TransactionMeta } from '@metamask/transaction-controller';
import React from 'react';
import { useConfirmContext } from '../../../../context/confirm';
import { ApproveDetails } from '../approve/approve-details/approve-details';
-import { useDecodedTransactionData } from '../hooks/useDecodedTransactionData';
import { AdvancedDetails } from '../shared/advanced-details/advanced-details';
-import { ConfirmLoader } from '../shared/confirm-loader/confirm-loader';
import { GasFeesSection } from '../shared/gas-fees-section/gas-fees-section';
import { getIsRevokeSetApprovalForAll } from '../utils';
+import { useTokenTransactionData } from '../hooks/useTokenTransactionData';
import { RevokeSetApprovalForAllStaticSimulation } from './revoke-set-approval-for-all-static-simulation/revoke-set-approval-for-all-static-simulation';
import { SetApprovalForAllStaticSimulation } from './set-approval-for-all-static-simulation/set-approval-for-all-static-simulation';
@@ -14,22 +13,18 @@ const SetApprovalForAllInfo = () => {
const { currentConfirmation: transactionMeta } =
useConfirmContext();
- const decodedResponse = useDecodedTransactionData();
+ const parsedTransactionData = useTokenTransactionData();
- const { value, pending } = decodedResponse;
+ const spender = parsedTransactionData?.args?._operator;
- const isRevokeSetApprovalForAll = getIsRevokeSetApprovalForAll(value);
-
- const spender = value?.data[0].params[0].value;
+ const isRevokeSetApprovalForAll = getIsRevokeSetApprovalForAll(
+ parsedTransactionData,
+ );
if (!transactionMeta?.txParams) {
return null;
}
- if (pending) {
- return
diff --git a/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js b/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
index 19f51b6fa798..50fb4a04e4c7 100644
--- a/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
+++ b/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
@@ -159,6 +159,7 @@ describe('add-ethereum-chain confirmation', () => {
"Attackers sometimes mimic sites by making small changes to the site address. Make sure you're interacting with the intended site before you continue. Punycode version: https://xn--ifura-dig.io/gnosis",
),
).toBeInTheDocument();
+ expect(getByText('https://iոfura.io/gnosis')).toBeInTheDocument();
});
});
});
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
index 93da09a9674e..7fe4ceb1d2e2 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.test.ts
@@ -1,17 +1,19 @@
-import { ApprovalType } from '@metamask/controller-utils';
import {
TransactionMeta,
TransactionStatus,
TransactionType,
} from '@metamask/transaction-controller';
-import { getMockConfirmState } from '../../../../../../test/data/confirmations/helper';
+import { getMockConfirmStateForTransaction } from '../../../../../../test/data/confirmations/helper';
import { renderHookWithConfirmContextProvider } from '../../../../../../test/lib/confirmations/render-helpers';
import { Severity } from '../../../../../helpers/constants/design-system';
import { RowAlertKey } from '../../../../../components/app/confirm/info/row/constants';
+import { genUnapprovedTokenTransferConfirmation } from '../../../../../../test/data/confirmations/token-transfer';
import { useFirstTimeInteractionAlert } from './useFirstTimeInteractionAlert';
-const ACCOUNT_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
+const ACCOUNT_ADDRESS_MOCK = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
+const ACCOUNT_ADDRESS_2_MOCK = '0x2e0d7e8c45221fca00d74a3609a0f7097035d09b';
+const CONTRACT_ADDRESS_MOCK = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7be';
const TRANSACTION_ID_MOCK = '123-456';
const TRANSACTION_META_MOCK = {
@@ -21,7 +23,7 @@ const TRANSACTION_META_MOCK = {
status: TransactionStatus.unapproved,
type: TransactionType.contractInteraction,
txParams: {
- from: ACCOUNT_ADDRESS,
+ from: ACCOUNT_ADDRESS_MOCK,
},
time: new Date().getTime() - 10000,
} as TransactionMeta;
@@ -33,28 +35,20 @@ function runHook({
currentConfirmation?: TransactionMeta;
internalAccountAddresses?: string[];
} = {}) {
- const pendingApprovals = currentConfirmation
- ? {
- [currentConfirmation.id as string]: {
- id: currentConfirmation.id,
- type: ApprovalType.Transaction,
- },
- }
- : {};
-
- const transactions = currentConfirmation ? [currentConfirmation] : [];
-
const internalAccounts = {
accounts: internalAccountAddresses?.map((address) => ({ address })) ?? [],
};
- const state = getMockConfirmState({
- metamask: {
- internalAccounts,
- pendingApprovals,
- transactions,
- },
- });
+ const state = currentConfirmation
+ ? getMockConfirmStateForTransaction(
+ currentConfirmation as TransactionMeta,
+ {
+ metamask: {
+ internalAccounts,
+ },
+ },
+ )
+ : {};
const response = renderHookWithConfirmContextProvider(
useFirstTimeInteractionAlert,
@@ -101,15 +95,35 @@ describe('useFirstTimeInteractionAlert', () => {
const firstTimeConfirmation = {
...TRANSACTION_META_MOCK,
isFirstTimeInteraction: true,
+ type: TransactionType.simpleSend,
+ txParams: {
+ ...TRANSACTION_META_MOCK.txParams,
+ to: ACCOUNT_ADDRESS_2_MOCK,
+ },
+ };
+ expect(
+ runHook({
+ currentConfirmation: firstTimeConfirmation,
+ internalAccountAddresses: [ACCOUNT_ADDRESS_2_MOCK],
+ }),
+ ).toEqual([]);
+ });
+
+ it('returns no alerts if token transfer recipient is internal account', () => {
+ const firstTimeConfirmation = {
+ ...TRANSACTION_META_MOCK,
+ isFirstTimeInteraction: true,
+ type: TransactionType.tokenMethodTransfer,
txParams: {
...TRANSACTION_META_MOCK.txParams,
- to: ACCOUNT_ADDRESS,
+ to: CONTRACT_ADDRESS_MOCK,
+ data: genUnapprovedTokenTransferConfirmation().txParams.data,
},
};
expect(
runHook({
currentConfirmation: firstTimeConfirmation,
- internalAccountAddresses: [ACCOUNT_ADDRESS],
+ internalAccountAddresses: [ACCOUNT_ADDRESS_2_MOCK],
}),
).toEqual([]);
});
@@ -118,15 +132,16 @@ describe('useFirstTimeInteractionAlert', () => {
const firstTimeConfirmation = {
...TRANSACTION_META_MOCK,
isFirstTimeInteraction: true,
+ type: TransactionType.simpleSend,
txParams: {
...TRANSACTION_META_MOCK.txParams,
- to: ACCOUNT_ADDRESS.toLowerCase(),
+ to: ACCOUNT_ADDRESS_2_MOCK.toLowerCase(),
},
};
expect(
runHook({
currentConfirmation: firstTimeConfirmation,
- internalAccountAddresses: [ACCOUNT_ADDRESS.toUpperCase()],
+ internalAccountAddresses: [ACCOUNT_ADDRESS_2_MOCK.toUpperCase()],
}),
).toEqual([]);
});
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.ts b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.ts
index c74552575667..f83f5d1ce30e 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useFirstTimeInteractionAlert.ts
@@ -8,14 +8,14 @@ import { Severity } from '../../../../../helpers/constants/design-system';
import { RowAlertKey } from '../../../../../components/app/confirm/info/row/constants';
import { useConfirmContext } from '../../../context/confirm';
import { getInternalAccounts } from '../../../../../selectors';
+import { useTransferRecipient } from '../../../components/confirm/info/hooks/useTransferRecipient';
export function useFirstTimeInteractionAlert(): Alert[] {
const t = useI18nContext();
const { currentConfirmation } = useConfirmContext();
const internalAccounts = useSelector(getInternalAccounts);
-
- const { txParams, isFirstTimeInteraction } = currentConfirmation ?? {};
- const { to } = txParams ?? {};
+ const to = useTransferRecipient();
+ const { isFirstTimeInteraction } = currentConfirmation ?? {};
const isInternalAccount = internalAccounts.some(
(account) => account.address?.toLowerCase() === to?.toLowerCase(),
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
index f7be0f93e2c1..e045a648f484 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/usePendingTransactionAlerts.test.ts
@@ -4,34 +4,18 @@ import {
TransactionStatus,
TransactionType,
} from '@metamask/transaction-controller';
-import { useSelector } from 'react-redux';
-import { useParams } from 'react-router-dom';
import { genUnapprovedContractInteractionConfirmation } from '../../../../../../test/data/confirmations/contract-interaction';
import { getMockConfirmState } from '../../../../../../test/data/confirmations/helper';
import { renderHookWithConfirmContextProvider } from '../../../../../../test/lib/confirmations/render-helpers';
import { RowAlertKey } from '../../../../../components/app/confirm/info/row/constants';
import { Severity } from '../../../../../helpers/constants/design-system';
-import {
- getRedesignedTransactionsEnabled,
- submittedPendingTransactionsSelector,
-} from '../../../../../selectors';
import { PendingTransactionAlertMessage } from './PendingTransactionAlertMessage';
import { usePendingTransactionAlerts } from './usePendingTransactionAlerts';
-jest.mock('react-redux', () => ({
- ...jest.requireActual('react-redux'),
- useSelector: jest.fn(),
-}));
-
jest.mock('./PendingTransactionAlertMessage', () => ({
PendingTransactionAlertMessage: () => 'PendingTransactionAlertMessage',
}));
-jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: jest.fn().mockReturnValue({ id: 'mock-transaction-id' }),
-}));
-
const ACCOUNT_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
const TRANSACTION_ID_MOCK = '123-456';
@@ -59,6 +43,7 @@ function runHook({
transactions?: TransactionMeta[];
} = {}) {
let pendingApprovals = {};
+
if (currentConfirmation) {
pendingApprovals = {
[currentConfirmation.id as string]: {
@@ -68,12 +53,14 @@ function runHook({
};
transactions.push(currentConfirmation);
}
+
const state = getMockConfirmState({
metamask: {
pendingApprovals,
transactions,
},
});
+
const response = renderHookWithConfirmContextProvider(
usePendingTransactionAlerts,
state,
@@ -83,19 +70,8 @@ function runHook({
}
describe('usePendingTransactionAlerts', () => {
- const useSelectorMock = useSelector as jest.Mock;
-
beforeEach(() => {
jest.resetAllMocks();
-
- (useParams as jest.Mock).mockReturnValue({ id: 'mock-transaction-id' });
-
- useSelectorMock.mockImplementation((selector) => {
- if (selector.toString().includes('pendingApprovalsSortedSelector')) {
- return [];
- }
- return undefined;
- });
});
it('returns no alerts if no confirmation', () => {
@@ -152,24 +128,6 @@ describe('usePendingTransactionAlerts', () => {
});
it('returns alert if submitted transaction', () => {
- useSelectorMock.mockImplementation((selector) => {
- if (selector === submittedPendingTransactionsSelector) {
- return [
- { name: 'first transaction', id: '1' },
- { name: 'second transaction', id: '2' },
- ];
- } else if (selector === getRedesignedTransactionsEnabled) {
- return true;
- } else if (selector.toString().includes('getUnapprovedTransaction')) {
- return { type: TransactionType.contractInteraction };
- } else if (
- selector.toString().includes('pendingApprovalsSortedSelector')
- ) {
- return [];
- }
- return undefined;
- });
-
const alerts = runHook({
currentConfirmation: CONFIRMATION_MOCK,
transactions: [TRANSACTION_META_MOCK],
diff --git a/ui/pages/confirmations/hooks/useConfirmationNavigation.test.ts b/ui/pages/confirmations/hooks/useConfirmationNavigation.test.ts
index edaddc0e520f..9804e14a0e00 100644
--- a/ui/pages/confirmations/hooks/useConfirmationNavigation.test.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationNavigation.test.ts
@@ -28,34 +28,40 @@ jest.mock('../confirmation/templates', () => ({
const APPROVAL_ID_MOCK = '123-456';
const APPROVAL_ID_2_MOCK = '456-789';
-function renderHook(
- approvalType: ApprovalType,
- requestData?: Json,
- approvalFlows?: ApprovalFlowState[],
-) {
+function renderHookWithState(state: Record) {
const { result } = renderHookWithProvider(() => useConfirmationNavigation(), {
...mockState,
metamask: {
...mockState.metamask,
- pendingApprovals: {
- [APPROVAL_ID_MOCK]: {
- id: APPROVAL_ID_MOCK,
- type: approvalType,
- requestData,
- },
- [APPROVAL_ID_2_MOCK]: {
- id: APPROVAL_ID_2_MOCK,
- type: approvalType,
- requestData,
- },
- },
- approvalFlows,
+ ...state,
},
});
return result.current;
}
+function renderHook(
+ approvalType: ApprovalType,
+ requestData?: Json,
+ approvalFlows?: ApprovalFlowState[],
+) {
+ return renderHookWithState({
+ pendingApprovals: {
+ [APPROVAL_ID_MOCK]: {
+ id: APPROVAL_ID_MOCK,
+ type: approvalType,
+ requestData,
+ },
+ [APPROVAL_ID_2_MOCK]: {
+ id: APPROVAL_ID_2_MOCK,
+ type: approvalType,
+ requestData,
+ },
+ },
+ approvalFlows,
+ });
+}
+
describe('useConfirmationNavigation', () => {
const useHistoryMock = jest.mocked(useHistory);
const history = { replace: jest.fn() };
@@ -202,6 +208,36 @@ describe('useConfirmationNavigation', () => {
const result = renderHook(ApprovalType.Transaction);
expect(result.count).toBe(2);
});
+
+ // @ts-expect-error This function is missing from the Mocha type definitions
+ it.each([
+ ['token', undefined],
+ ['NFT', '123'],
+ ])(
+ 'ignores additional watch %s approvals',
+ (_title: string, tokenId?: string) => {
+ const result = renderHookWithState({
+ pendingApprovals: {
+ [APPROVAL_ID_MOCK]: {
+ id: APPROVAL_ID_MOCK,
+ type: ApprovalType.WatchAsset,
+ requestData: { asset: { tokenId } },
+ },
+ [APPROVAL_ID_2_MOCK]: {
+ id: APPROVAL_ID_2_MOCK,
+ type: ApprovalType.Transaction,
+ },
+ duplicate: {
+ id: 'duplicate',
+ type: ApprovalType.WatchAsset,
+ requestData: { asset: { tokenId } },
+ },
+ },
+ });
+
+ expect(result.count).toBe(2);
+ },
+ );
});
describe('getIndex', () => {
@@ -224,5 +260,37 @@ describe('useConfirmationNavigation', () => {
APPROVAL_ID_2_MOCK,
]);
});
+
+ // @ts-expect-error This function is missing from the Mocha type definitions
+ it.each([
+ ['token', undefined],
+ ['NFT', '123'],
+ ])(
+ 'ignores additional watch %s approvals',
+ (_title: string, tokenId?: string) => {
+ const result = renderHookWithState({
+ pendingApprovals: {
+ [APPROVAL_ID_MOCK]: {
+ id: APPROVAL_ID_MOCK,
+ type: ApprovalType.WatchAsset,
+ requestData: { asset: { tokenId } },
+ },
+ [APPROVAL_ID_2_MOCK]: {
+ id: APPROVAL_ID_2_MOCK,
+ type: ApprovalType.Transaction,
+ },
+ duplicate: {
+ id: 'duplicate',
+ type: ApprovalType.WatchAsset,
+ requestData: { asset: { tokenId } },
+ },
+ },
+ });
+
+ expect(
+ result.confirmations.map(({ id }: { id: string }) => id),
+ ).toEqual([APPROVAL_ID_MOCK, APPROVAL_ID_2_MOCK]);
+ },
+ );
});
});
diff --git a/ui/pages/confirmations/hooks/useConfirmationNavigation.ts b/ui/pages/confirmations/hooks/useConfirmationNavigation.ts
index 9a5cdfc5cd9e..95bc1d93cd34 100644
--- a/ui/pages/confirmations/hooks/useConfirmationNavigation.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationNavigation.ts
@@ -19,7 +19,7 @@ import {
import { isSignatureTransactionType } from '../utils';
import {
getApprovalFlows,
- pendingApprovalsSortedSelector,
+ selectPendingApprovalsForNavigation,
} from '../../../selectors';
const CONNECT_APPROVAL_TYPES = [
@@ -30,7 +30,7 @@ const CONNECT_APPROVAL_TYPES = [
];
export function useConfirmationNavigation() {
- const confirmations = useSelector(pendingApprovalsSortedSelector, isEqual);
+ const confirmations = useSelector(selectPendingApprovalsForNavigation);
const approvalFlows = useSelector(getApprovalFlows, isEqual);
const history = useHistory();
diff --git a/ui/pages/confirmations/hooks/useGasFeeInputs.js b/ui/pages/confirmations/hooks/useGasFeeInputs.js
index 8675b726038a..129778bfcf20 100644
--- a/ui/pages/confirmations/hooks/useGasFeeInputs.js
+++ b/ui/pages/confirmations/hooks/useGasFeeInputs.js
@@ -164,7 +164,11 @@ export function useGasFeeInputs(
});
const [gasLimit, setGasLimit] = useState(() =>
- Number(hexToDecimal(transaction?.txParams?.gas ?? '0x0')),
+ Number(
+ hexToDecimal(
+ transaction?.txParams?.gasLimit ?? transaction?.txParams?.gas ?? '0x0',
+ ),
+ ),
);
const properGasLimit = Number(hexToDecimal(transaction?.originalGasEstimate));
@@ -195,7 +199,15 @@ export function useGasFeeInputs(
setEstimateUsed(transaction?.userFeeLevel);
}
- setGasLimit(Number(hexToDecimal(transaction?.txParams?.gas ?? '0x0')));
+ setGasLimit(
+ Number(
+ hexToDecimal(
+ transaction?.txParams?.gasLimit ??
+ transaction?.txParams?.gas ??
+ '0x0',
+ ),
+ ),
+ );
}
}, [
setEstimateUsed,
diff --git a/ui/pages/confirmations/hooks/useTransactionFunction.test.js b/ui/pages/confirmations/hooks/useTransactionFunction.test.js
index 22984ba71a37..ec823d2acf70 100644
--- a/ui/pages/confirmations/hooks/useTransactionFunction.test.js
+++ b/ui/pages/confirmations/hooks/useTransactionFunction.test.js
@@ -164,4 +164,16 @@ describe('useMaxPriorityFeePerGasInput', () => {
userFeeLevel: 'dappSuggested',
});
});
+
+ it('returns early when gasFeeEstimates is undefined', () => {
+ const mockUpdateTransaction = jest
+ .spyOn(Actions, 'updateTransactionGasFees')
+ .mockImplementation(() => ({ type: '' }));
+
+ const { result } = renderUseTransactionFunctions({
+ gasFeeEstimates: undefined,
+ });
+ result.current.updateTransactionUsingEstimate(GasRecommendations.low);
+ expect(mockUpdateTransaction).not.toHaveBeenCalled();
+ });
});
diff --git a/ui/pages/confirmations/hooks/useTransactionFunctions.js b/ui/pages/confirmations/hooks/useTransactionFunctions.js
index 17b5165da94e..96b41cd5e08e 100644
--- a/ui/pages/confirmations/hooks/useTransactionFunctions.js
+++ b/ui/pages/confirmations/hooks/useTransactionFunctions.js
@@ -201,9 +201,10 @@ export const useTransactionFunctions = ({
const updateTransactionUsingEstimate = useCallback(
(gasFeeEstimateToUse) => {
- if (!gasFeeEstimates[gasFeeEstimateToUse]) {
+ if (!gasFeeEstimates?.[gasFeeEstimateToUse]) {
return;
}
+
const { suggestedMaxFeePerGas, suggestedMaxPriorityFeePerGas } =
gasFeeEstimates[gasFeeEstimateToUse];
updateTransaction({
diff --git a/ui/pages/confirmations/utils/confirm.test.ts b/ui/pages/confirmations/utils/confirm.test.ts
index 9a8b3d1a0f8a..a81b5959a916 100644
--- a/ui/pages/confirmations/utils/confirm.test.ts
+++ b/ui/pages/confirmations/utils/confirm.test.ts
@@ -93,8 +93,11 @@ describe('confirm util', () => {
expect(toPunycodeURL('https://iոfura.io/gnosis')).toStrictEqual(
'https://xn--ifura-dig.io/gnosis',
);
- expect(toPunycodeURL('https://www.google.com')).toStrictEqual(
- 'https://www.google.com/',
+ expect(toPunycodeURL('https://iոfura.io')).toStrictEqual(
+ 'https://xn--ifura-dig.io',
+ );
+ expect(toPunycodeURL('https://iոfura.io/')).toStrictEqual(
+ 'https://xn--ifura-dig.io/',
);
expect(
toPunycodeURL('https://iոfura.io/gnosis:5050?test=iոfura&foo=bar'),
@@ -102,7 +105,7 @@ describe('confirm util', () => {
'https://xn--ifura-dig.io/gnosis:5050?test=i%D5%B8fura&foo=bar',
);
expect(toPunycodeURL('https://www.google.com')).toStrictEqual(
- 'https://www.google.com/',
+ 'https://www.google.com',
);
});
});
diff --git a/ui/pages/confirmations/utils/confirm.ts b/ui/pages/confirmations/utils/confirm.ts
index f464f51e8159..379d98728be2 100644
--- a/ui/pages/confirmations/utils/confirm.ts
+++ b/ui/pages/confirmations/utils/confirm.ts
@@ -80,7 +80,12 @@ export const isValidASCIIURL = (urlString?: string) => {
export const toPunycodeURL = (urlString: string) => {
try {
- return new URL(urlString).href;
+ const url = new URL(urlString);
+ const { protocol, hostname, port, search, hash } = url;
+ const pathname =
+ url.pathname === '/' && !urlString.endsWith('/') ? '' : url.pathname;
+
+ return `${protocol}//${hostname}${port}${pathname}${search}${hash}`;
} catch (err: unknown) {
console.error(`Failed to convert URL to Punycode: ${err}`);
return undefined;
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 4fb46ccc1744..cae73b180f4d 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -40,7 +40,7 @@ import {
getSelectedInternalAccount,
getQueuedRequestCount,
getEditedNetwork,
- pendingApprovalsSortedSelector,
+ selectPendingApprovalsForNavigation,
///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
getAccountType,
///: END:ONLY_INCLUDE_IF
@@ -108,7 +108,7 @@ const mapStateToProps = (state) => {
const totalUnapprovedAndQueuedRequestCount =
totalUnapprovedCount + queuedRequestCount;
const swapsEnabled = getSwapsFeatureIsLive(state);
- const pendingApprovals = pendingApprovalsSortedSelector(state);
+ const pendingApprovals = selectPendingApprovalsForNavigation(state);
///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
const institutionalConnectRequests = getInstitutionalConnectRequests(state);
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index 163091e41958..b7c4e07aa9d6 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -721,7 +721,7 @@ export default function PrivacySettings() {
value={turnOn4ByteResolution}
setValue={setTurnOn4ByteResolution}
title={t('use4ByteResolution')}
- description={t('use4ByteResolutionDescription')}
+ description={t('toggleDecodeDescription')}
/>
- To improve user experience, we customize the activity tab with messages based on the smart contracts you interact with. MetaMask uses a service called 4byte.directory to decode data and show you a version of a smart contract that's easier to read. This helps reduce your chances of approving malicious smart contract actions, but can result in your IP address being shared.
+ We use 4byte.directory and Sourcify services to decode and display more readable transaction data. This helps you understand the outcome of pending and past transactions, but can result in your IP address being shared.
{
metamask: { currencyRates },
} = state;
const remoteFeatureFlags = getRemoteFeatureFlags(state);
+
+ const settingsPageSnapsIds = getSettingsPageSnapsIds(state);
+ const snapsMetadata = getSnapsMetadata(state);
const conversionDate = currencyRates[ticker]?.conversionDate;
const pathNameTail = pathname.match(/[^/]+$/u)[0];
@@ -75,6 +83,7 @@ const mapStateToProps = (state, ownProps) => {
const isAddPopularCustomNetwork = Boolean(
pathname.match(ADD_POPULAR_CUSTOM_NETWORK),
);
+ const isSnapSettingsRoute = Boolean(pathname.match(SNAP_SETTINGS_ROUTE));
const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
const pathnameI18nKey = ROUTES_TO_I18N_KEYS[pathname];
@@ -102,6 +111,16 @@ const mapStateToProps = (state, ownProps) => {
);
const useExternalServices = getUseExternalServices(state);
+ const snapNameGetter = getSnapName(snapsMetadata);
+
+ const settingsPageSnaps = settingsPageSnapsIds.map((snapId) => ({
+ id: snapId,
+ name: snapNameGetter(snapId),
+ }));
+
+ const snapSettingsTitle =
+ isSnapSettingsRoute && snapNameGetter(decodeSnapIdFromPathname(pathname));
+
return {
addNewNetwork,
addressName,
@@ -115,6 +134,8 @@ const mapStateToProps = (state, ownProps) => {
mostRecentOverviewPage: getMostRecentOverviewPage(state),
pathnameI18nKey,
remoteFeatureFlags,
+ settingsPageSnaps,
+ snapSettingsTitle,
useExternalServices,
};
};
diff --git a/ui/pages/settings/settings.stories.js b/ui/pages/settings/settings.stories.js
index 53437f4175db..b6b695a89cb1 100644
--- a/ui/pages/settings/settings.stories.js
+++ b/ui/pages/settings/settings.stories.js
@@ -62,6 +62,7 @@ const Settings = ({ history }) => {
pathnameI18nKey={pathnameI18nKey}
backRoute={SETTINGS_ROUTE}
remoteFeatureFlags={{}}
+ settingsPageSnaps={[]}
/>
);
diff --git a/ui/selectors/approvals.ts b/ui/selectors/approvals.ts
index 55a5d052579c..f8f937bb2f34 100644
--- a/ui/selectors/approvals.ts
+++ b/ui/selectors/approvals.ts
@@ -1,6 +1,10 @@
-import { ApprovalControllerState } from '@metamask/approval-controller';
+import {
+ ApprovalControllerState,
+ ApprovalRequest,
+} from '@metamask/approval-controller';
import { ApprovalType } from '@metamask/controller-utils';
import { createSelector } from 'reselect';
+import { Json } from '@metamask/utils';
import { createDeepEqualSelector } from '../../shared/modules/selectors/util';
export type ApprovalsMetaMaskState = {
@@ -58,6 +62,32 @@ export function pendingApprovalsSortedSelector(state: ApprovalsMetaMaskState) {
return getPendingApprovals(state).sort((a1, a2) => a1.time - a2.time);
}
+/**
+ * Returns pending approvals sorted by time for use in confirmation navigation.
+ * Excludes duplicate watch asset approvals as they are combined into a single confirmation.
+ */
+export const selectPendingApprovalsForNavigation = createDeepEqualSelector(
+ pendingApprovalsSortedSelector,
+ (sortedPendingApprovals) =>
+ sortedPendingApprovals.filter((approval, index) => {
+ if (
+ isWatchNftApproval(approval) &&
+ sortedPendingApprovals.findIndex(isWatchNftApproval) !== index
+ ) {
+ return false;
+ }
+
+ if (
+ isWatchTokenApproval(approval) &&
+ sortedPendingApprovals.findIndex(isWatchTokenApproval) !== index
+ ) {
+ return false;
+ }
+
+ return true;
+ }),
+);
+
const internalSelectPendingApproval = createSelector(
getPendingApprovals,
(_state: ApprovalsMetaMaskState, id: string) => id,
@@ -68,3 +98,17 @@ export const selectPendingApproval = createDeepEqualSelector(
internalSelectPendingApproval,
(approval) => approval,
);
+
+function isWatchTokenApproval(approval: ApprovalRequest>) {
+ const tokenId = (approval.requestData?.asset as Record)
+ ?.tokenId;
+
+ return approval.type === ApprovalType.WatchAsset && !tokenId;
+}
+
+function isWatchNftApproval(approval: ApprovalRequest>) {
+ const tokenId = (approval.requestData?.asset as Record)
+ ?.tokenId;
+
+ return approval.type === ApprovalType.WatchAsset && Boolean(tokenId);
+}
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 61c15000baba..ce117af76262 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1,3 +1,4 @@
+import { toUnicode } from 'punycode/punycode.js';
import { SubjectType } from '@metamask/permission-controller';
import { ApprovalType } from '@metamask/controller-utils';
import {
@@ -12,6 +13,7 @@ import { NameType } from '@metamask/name-controller';
import { TransactionStatus } from '@metamask/transaction-controller';
import { isEvmAccountType } from '@metamask/keyring-api';
import { RpcEndpointType } from '@metamask/network-controller';
+import { SnapEndowments } from '@metamask/snaps-rpc-methods';
import {
getCurrentChainId,
getProviderConfig,
@@ -110,6 +112,7 @@ import { BridgeFeatureFlagsKey } from '../../shared/types/bridge';
import { hasTransactionData } from '../../shared/modules/transaction.utils';
import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
import { createDeepEqualSelector } from '../../shared/modules/selectors/util';
+import { isSnapIgnoredInProd } from '../helpers/utils/snaps';
import {
getAllUnapprovedTransactions,
getCurrentNetworkTransactions,
@@ -729,7 +732,10 @@ export function getAddressBook(state) {
export function getEnsResolutionByAddress(state, address) {
if (state.metamask.ensResolutionsByAddress[address]) {
- return state.metamask.ensResolutionsByAddress[address];
+ const ensResolution = state.metamask.ensResolutionsByAddress[address];
+ // ensResolution is a punycode encoded string hence toUnicode is used to decode it from same package
+ const normalizedEnsResolution = toUnicode(ensResolution);
+ return normalizedEnsResolution;
}
const entry =
@@ -1914,6 +1920,19 @@ export const getInsightSnaps = createDeepEqualSelector(
},
);
+export const getSettingsPageSnaps = createDeepEqualSelector(
+ getEnabledSnaps,
+ getPermissionSubjects,
+ (snaps, subjects) => {
+ return Object.values(snaps).filter(
+ ({ id, preinstalled }) =>
+ subjects[id]?.permissions[SnapEndowments.SettingsPage] &&
+ preinstalled &&
+ !isSnapIgnoredInProd(id),
+ );
+ },
+);
+
export const getSignatureInsightSnaps = createDeepEqualSelector(
getEnabledSnaps,
getPermissionSubjects,
@@ -1944,6 +1963,11 @@ export const getNameLookupSnapsIds = createDeepEqualSelector(
},
);
+export const getSettingsPageSnapsIds = createDeepEqualSelector(
+ getSettingsPageSnaps,
+ (snaps) => snaps.map((snap) => snap.id),
+);
+
export const getNotifySnaps = createDeepEqualSelector(
getEnabledSnaps,
getPermissionSubjects,
diff --git a/yarn.lock b/yarn.lock
index ed1c8a1de350..f45eb5cf233e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4873,6 +4873,16 @@ __metadata:
languageName: node
linkType: hard
+"@metamask/abi-utils@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "@metamask/abi-utils@npm:3.0.0"
+ dependencies:
+ "@metamask/superstruct": "npm:^3.1.0"
+ "@metamask/utils": "npm:^11.0.1"
+ checksum: 10/068b98185148b9e185b4af4392c6a6f82f1d4b1ff60013c57679c618f37afe9030e3ccc940e1a8b690be6f62ea91115ab18b73f3c3c09f4eff1794e31ababb9b
+ languageName: node
+ linkType: hard
+
"@metamask/account-watcher@npm:^4.1.2":
version: 4.1.2
resolution: "@metamask/account-watcher@npm:4.1.2"
@@ -5085,13 +5095,13 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/base-controller@npm:^7.0.0, @metamask/base-controller@npm:^7.0.1, @metamask/base-controller@npm:^7.0.2":
- version: 7.0.2
- resolution: "@metamask/base-controller@npm:7.0.2"
+"@metamask/base-controller@npm:^7.0.0, @metamask/base-controller@npm:^7.0.1, @metamask/base-controller@npm:^7.0.2, @metamask/base-controller@npm:^7.1.0":
+ version: 7.1.0
+ resolution: "@metamask/base-controller@npm:7.1.0"
dependencies:
"@metamask/utils": "npm:^10.0.0"
immer: "npm:^9.0.6"
- checksum: 10/6f78ec5af840c9947aa8eac6e402df6469600260d613a92196daefd5b072097a176fe5da1c386f2d36853513254b74140d667d817a12880c46f088e18ff3606a
+ checksum: 10/5a0b50c1e096cbf6483e308eddb3ca2e5e1865b803b5dba778bf635ec59657290895e21ada71c7508d8e34ff9695a192a414fd75e287d290346359ef8e23960a
languageName: node
linkType: hard
@@ -5260,16 +5270,16 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/eth-block-tracker@npm:^11.0.3":
- version: 11.0.3
- resolution: "@metamask/eth-block-tracker@npm:11.0.3"
+"@metamask/eth-block-tracker@npm:^11.0.3, @metamask/eth-block-tracker@npm:^11.0.4":
+ version: 11.0.4
+ resolution: "@metamask/eth-block-tracker@npm:11.0.4"
dependencies:
"@metamask/eth-json-rpc-provider": "npm:^4.1.5"
"@metamask/safe-event-emitter": "npm:^3.1.1"
- "@metamask/utils": "npm:^9.1.0"
+ "@metamask/utils": "npm:^11.0.1"
json-rpc-random-id: "npm:^1.0.1"
pify: "npm:^5.0.0"
- checksum: 10/c73a570f889c613ab309643c84a4aed1a4eeed5c101434da84b34babe2352218c65f863602e013a8a55052e3f80a538efed865cc5fb7af558d168c52c5a399a4
+ checksum: 10/56b60255a3ae23a378570a49c30d0c13bd74094c0509a978cad20ef57079c80bae91fd35749acb9ac5feef2922eec45a6fef8c0ee6e754cbf3722f8e5d0d771e
languageName: node
linkType: hard
@@ -5311,35 +5321,35 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/eth-json-rpc-middleware@npm:^15.0.1":
- version: 15.0.1
- resolution: "@metamask/eth-json-rpc-middleware@npm:15.0.1"
+"@metamask/eth-json-rpc-middleware@npm:^15.0.1, @metamask/eth-json-rpc-middleware@npm:^15.1.2":
+ version: 15.1.2
+ resolution: "@metamask/eth-json-rpc-middleware@npm:15.1.2"
dependencies:
- "@metamask/eth-block-tracker": "npm:^11.0.3"
- "@metamask/eth-json-rpc-provider": "npm:^4.1.5"
- "@metamask/eth-sig-util": "npm:^7.0.3"
- "@metamask/json-rpc-engine": "npm:^10.0.0"
- "@metamask/rpc-errors": "npm:^7.0.0"
- "@metamask/utils": "npm:^9.1.0"
+ "@metamask/eth-block-tracker": "npm:^11.0.4"
+ "@metamask/eth-json-rpc-provider": "npm:^4.1.7"
+ "@metamask/eth-sig-util": "npm:^8.1.2"
+ "@metamask/json-rpc-engine": "npm:^10.0.2"
+ "@metamask/rpc-errors": "npm:^7.0.2"
+ "@metamask/utils": "npm:^11.0.1"
"@types/bn.js": "npm:^5.1.5"
bn.js: "npm:^5.2.1"
klona: "npm:^2.0.6"
pify: "npm:^5.0.0"
safe-stable-stringify: "npm:^2.4.3"
- checksum: 10/9777fca31440bf0076f5d2c24e2ddb4848ecd9d41b0a5d6114c27339567e60bfcb9057d6bfa81f18f5ca0ffa848ecf9603c765f606b8de206d3e34dba519c501
+ checksum: 10/71e7d61cc58df250bfef73438a9e30cc2f78e0e979feb8a9c0be72bbad470a2fe068fa790194cb88ef56865e36156e525272bc3e1a2a7135d07f7bd81a752239
languageName: node
linkType: hard
-"@metamask/eth-json-rpc-provider@npm:^4.0.0, @metamask/eth-json-rpc-provider@npm:^4.1.5, @metamask/eth-json-rpc-provider@npm:^4.1.6":
- version: 4.1.6
- resolution: "@metamask/eth-json-rpc-provider@npm:4.1.6"
+"@metamask/eth-json-rpc-provider@npm:^4.0.0, @metamask/eth-json-rpc-provider@npm:^4.1.5, @metamask/eth-json-rpc-provider@npm:^4.1.6, @metamask/eth-json-rpc-provider@npm:^4.1.7":
+ version: 4.1.7
+ resolution: "@metamask/eth-json-rpc-provider@npm:4.1.7"
dependencies:
- "@metamask/json-rpc-engine": "npm:^10.0.1"
- "@metamask/rpc-errors": "npm:^7.0.1"
+ "@metamask/json-rpc-engine": "npm:^10.0.2"
+ "@metamask/rpc-errors": "npm:^7.0.2"
"@metamask/safe-event-emitter": "npm:^3.0.0"
- "@metamask/utils": "npm:^10.0.0"
+ "@metamask/utils": "npm:^11.0.1"
uuid: "npm:^8.3.2"
- checksum: 10/aeec2c362a5386357e9f8c707da9baa4326e83889633723656b6801b6461ea8ab8f020b0d9ed0bbc2d8fd6add4af4c99cc9c9a1cbedca267a033a9f19da41200
+ checksum: 10/ddfa2a888c83015672a6b879bad061f1e617d6875b741aa714cbe7ac0878dbc8beb9d4ce00ec61a2672d2dfe251f04c4d3eed77b8a9877b7aeb0034eec3e7c51
languageName: node
linkType: hard
@@ -5381,17 +5391,17 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/eth-sig-util@npm:^8.0.0":
- version: 8.0.0
- resolution: "@metamask/eth-sig-util@npm:8.0.0"
+"@metamask/eth-sig-util@npm:^8.0.0, @metamask/eth-sig-util@npm:^8.1.2":
+ version: 8.1.2
+ resolution: "@metamask/eth-sig-util@npm:8.1.2"
dependencies:
"@ethereumjs/util": "npm:^8.1.0"
- "@metamask/abi-utils": "npm:^2.0.4"
- "@metamask/utils": "npm:^9.0.0"
+ "@metamask/abi-utils": "npm:^3.0.0"
+ "@metamask/utils": "npm:^11.0.1"
"@scure/base": "npm:~1.1.3"
ethereum-cryptography: "npm:^2.1.2"
tweetnacl: "npm:^1.0.3"
- checksum: 10/5de92bc59df31bcf417ecbdfd2b47f15c21b29454f45108513c55d9c005b7cb51373e9d254bd97533603ab7c7758fdf8fc5159612f366b05f92ebe5beb6d75d8
+ checksum: 10/32b284fc8c3229e3741b1c21f44ca3f55c2215ef8ad700775cd9501bbaab56a4e861827bef24ed263734d28c899eb3b34a9646e9d21ec3fce12204b7eb58bfed
languageName: node
linkType: hard
@@ -5626,14 +5636,14 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.1":
- version: 10.0.1
- resolution: "@metamask/json-rpc-engine@npm:10.0.1"
+"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.1, @metamask/json-rpc-engine@npm:^10.0.2":
+ version: 10.0.2
+ resolution: "@metamask/json-rpc-engine@npm:10.0.2"
dependencies:
- "@metamask/rpc-errors": "npm:^7.0.1"
+ "@metamask/rpc-errors": "npm:^7.0.2"
"@metamask/safe-event-emitter": "npm:^3.0.0"
- "@metamask/utils": "npm:^10.0.0"
- checksum: 10/15a8eeab9af39b9ed87311da728e81169484ace733a8ef9fc469bd887654e37afa19f9e5228246dc80daad3fbf9b16067e73b2969d37d44acf5bc6ffa2c70082
+ "@metamask/utils": "npm:^11.0.1"
+ checksum: 10/479e4c36ee10ecaa9b26bf8aaea375f7dbe68b5379fabc0f78ac087e310d0040b0e7a2d55eccebd820089404a2170f498c4e2b82eb7f0d34c5becbd811340d49
languageName: node
linkType: hard
@@ -6053,12 +6063,12 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/preinstalled-example-snap@npm:^0.2.0":
- version: 0.2.0
- resolution: "@metamask/preinstalled-example-snap@npm:0.2.0"
+"@metamask/preinstalled-example-snap@npm:^0.3.0":
+ version: 0.3.0
+ resolution: "@metamask/preinstalled-example-snap@npm:0.3.0"
dependencies:
- "@metamask/snaps-sdk": "npm:^6.9.0"
- checksum: 10/f8ad6f42c9bd7ce3b7fc9b45eecda6191320ff762b48c482ba4944a6d7a228682b833c15e56058f26ac7bb10417dfe9de340af1c8eb9bbe5dc03c665426ccb13
+ "@metamask/snaps-sdk": "npm:^6.14.0"
+ checksum: 10/add8f89c1b7327bc90486d868a9d4b7eff426ef98a5a96235fc6fdce4710c6d17842636ccd02db6638d061ce2b16939c6fe1f06e69cdde8bde2f6026c7b82df5
languageName: node
linkType: hard
@@ -6158,13 +6168,13 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/rpc-errors@npm:^7.0.0, @metamask/rpc-errors@npm:^7.0.1":
- version: 7.0.1
- resolution: "@metamask/rpc-errors@npm:7.0.1"
+"@metamask/rpc-errors@npm:^7.0.0, @metamask/rpc-errors@npm:^7.0.1, @metamask/rpc-errors@npm:^7.0.2":
+ version: 7.0.2
+ resolution: "@metamask/rpc-errors@npm:7.0.2"
dependencies:
- "@metamask/utils": "npm:^10.0.0"
+ "@metamask/utils": "npm:^11.0.1"
fast-safe-stringify: "npm:^2.0.6"
- checksum: 10/819708b4a7d9695ee67fd867d8f94bb5a273b479a242b17bd53c83d1fceec421fc42928f0bb340f4f138ec803dd82ec9659ce7b09a86aedad6a81d5a39ec5c35
+ checksum: 10/daf77a48b3f970585ef1f2efe3383d620fd4bffb550e8c6378b04a052f6948724a0b7e8a3e45b8b73298c70c4b9594b71fe0272664ea99620fe36e23443f8545
languageName: node
linkType: hard
@@ -6255,9 +6265,9 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/snaps-controllers@npm:^9.10.0, @metamask/snaps-controllers@npm:^9.15.0":
- version: 9.15.0
- resolution: "@metamask/snaps-controllers@npm:9.15.0"
+"@metamask/snaps-controllers@npm:^9.10.0, @metamask/snaps-controllers@npm:^9.16.0":
+ version: 9.16.0
+ resolution: "@metamask/snaps-controllers@npm:9.16.0"
dependencies:
"@metamask/approval-controller": "npm:^7.1.1"
"@metamask/base-controller": "npm:^7.0.2"
@@ -6270,9 +6280,9 @@ __metadata:
"@metamask/post-message-stream": "npm:^8.1.1"
"@metamask/rpc-errors": "npm:^7.0.1"
"@metamask/snaps-registry": "npm:^3.2.2"
- "@metamask/snaps-rpc-methods": "npm:^11.7.0"
- "@metamask/snaps-sdk": "npm:^6.13.0"
- "@metamask/snaps-utils": "npm:^8.6.1"
+ "@metamask/snaps-rpc-methods": "npm:^11.8.0"
+ "@metamask/snaps-sdk": "npm:^6.14.0"
+ "@metamask/snaps-utils": "npm:^8.7.0"
"@metamask/utils": "npm:^10.0.0"
"@xstate/fsm": "npm:^2.0.0"
browserify-zlib: "npm:^0.2.0"
@@ -6286,30 +6296,30 @@ __metadata:
semver: "npm:^7.5.4"
tar-stream: "npm:^3.1.7"
peerDependencies:
- "@metamask/snaps-execution-environments": ^6.10.0
+ "@metamask/snaps-execution-environments": ^6.11.0
peerDependenciesMeta:
"@metamask/snaps-execution-environments":
optional: true
- checksum: 10/dd849398c4deefbca55b3b4a5e3fe885c45012cd8132bb83367d024c0c2dc99b13be036aa84049d5a1ba1431f9fd66897623f3961a34ebbbf70fe7bce4db322e
+ checksum: 10/f0a9efaad8fac2aa833edd5df6a4929a84de31f3e11457d407f39793c9ecd3b94eff543135729691b125c32f4290183375ae6416bc04e4aad31466517727af4f
languageName: node
linkType: hard
-"@metamask/snaps-execution-environments@npm:^6.10.0":
- version: 6.10.0
- resolution: "@metamask/snaps-execution-environments@npm:6.10.0"
+"@metamask/snaps-execution-environments@npm:^6.11.0":
+ version: 6.11.0
+ resolution: "@metamask/snaps-execution-environments@npm:6.11.0"
dependencies:
"@metamask/json-rpc-engine": "npm:^10.0.1"
"@metamask/object-multiplex": "npm:^2.0.0"
"@metamask/post-message-stream": "npm:^8.1.1"
"@metamask/providers": "npm:^18.1.1"
"@metamask/rpc-errors": "npm:^7.0.1"
- "@metamask/snaps-sdk": "npm:^6.11.0"
- "@metamask/snaps-utils": "npm:^8.6.0"
+ "@metamask/snaps-sdk": "npm:^6.14.0"
+ "@metamask/snaps-utils": "npm:^8.7.0"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^10.0.0"
nanoid: "npm:^3.1.31"
readable-stream: "npm:^3.6.2"
- checksum: 10/a881696ec942f268d7485869fcb8c6bc0c278319bbfaf7e5c6099e86278c7f59049595f00ecfc27511d0106b5ad2f7621f734c7b17f088b835e38e638d80db01
+ checksum: 10/3fc46e1b1d7e11996ce8c3694738d1cdab9b5d6c129a45e691b98f0d753e044869c3d0471729cba9e120bb2ff7ebd8e9aa644e608792903e74eee61213509b08
languageName: node
linkType: hard
@@ -6325,38 +6335,38 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/snaps-rpc-methods@npm:^11.7.0":
- version: 11.7.0
- resolution: "@metamask/snaps-rpc-methods@npm:11.7.0"
+"@metamask/snaps-rpc-methods@npm:^11.8.0":
+ version: 11.8.0
+ resolution: "@metamask/snaps-rpc-methods@npm:11.8.0"
dependencies:
"@metamask/key-tree": "npm:^10.0.1"
"@metamask/permission-controller": "npm:^11.0.3"
"@metamask/rpc-errors": "npm:^7.0.1"
- "@metamask/snaps-sdk": "npm:^6.13.0"
- "@metamask/snaps-utils": "npm:^8.6.1"
+ "@metamask/snaps-sdk": "npm:^6.14.0"
+ "@metamask/snaps-utils": "npm:^8.7.0"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^10.0.0"
"@noble/hashes": "npm:^1.3.1"
- checksum: 10/92e4131d15b8dd68a29bd845e6c795aab8c3299048eaff2c3970db78a5eb476d8841f6a612b42e878812bb0757f2126287581f4e12259846851f02d6e6d836f5
+ checksum: 10/a84c3648195efaeaeb021bd86c8a90e3f555236a8804cb2191778dddcf2acf7ea23ebc30f4670f6669dc881736c28f387b6ca2fc61050393411ee947a86cd47b
languageName: node
linkType: hard
-"@metamask/snaps-sdk@npm:^6.13.0":
- version: 6.13.0
- resolution: "@metamask/snaps-sdk@npm:6.13.0"
+"@metamask/snaps-sdk@npm:^6.14.0":
+ version: 6.14.0
+ resolution: "@metamask/snaps-sdk@npm:6.14.0"
dependencies:
"@metamask/key-tree": "npm:^10.0.1"
"@metamask/providers": "npm:^18.1.1"
"@metamask/rpc-errors": "npm:^7.0.1"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^10.0.0"
- checksum: 10/115c738cb140810856ded055ac92a538c011adbd6a5f32a4e1fde42dcbd162c7eac182aab904de6b65af99b9520995d768627bd7f460da11d0aa359700e05b04
+ checksum: 10/dafe8618418c607c5d962bbcf675324651254631791a257898f4a939c58a8b2f56a743dcff534aa7889662d5fb1a4dd1048558f4b025404e0dcd507ff5a5e89a
languageName: node
linkType: hard
-"@metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.6.0, @metamask/snaps-utils@npm:^8.6.1":
- version: 8.6.1
- resolution: "@metamask/snaps-utils@npm:8.6.1"
+"@metamask/snaps-utils@npm:^8.3.0, @metamask/snaps-utils@npm:^8.7.0":
+ version: 8.7.0
+ resolution: "@metamask/snaps-utils@npm:8.7.0"
dependencies:
"@babel/core": "npm:^7.23.2"
"@babel/types": "npm:^7.23.0"
@@ -6366,7 +6376,7 @@ __metadata:
"@metamask/rpc-errors": "npm:^7.0.1"
"@metamask/slip44": "npm:^4.0.0"
"@metamask/snaps-registry": "npm:^3.2.2"
- "@metamask/snaps-sdk": "npm:^6.13.0"
+ "@metamask/snaps-sdk": "npm:^6.14.0"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^10.0.0"
"@noble/hashes": "npm:^1.3.1"
@@ -6381,7 +6391,7 @@ __metadata:
semver: "npm:^7.5.4"
ses: "npm:^1.1.0"
validate-npm-package-name: "npm:^5.0.0"
- checksum: 10/d58e276b2849662e764a4ce5f45a03df361a5c65e9c09814e41b723407dffbd3a215626f5d9a8c4705a0cad73b702e10d76201174b44f92fbc68fdf59fb24d5d
+ checksum: 10/0681878e29c010853b610ed99569044feaa37b4cc92bafdba28b1eec68694d7779833fb4262a05a4d18182c6931d258531ed628e422d7c96567b61d1b710a95d
languageName: node
linkType: hard
@@ -6436,9 +6446,9 @@ __metadata:
languageName: node
linkType: hard
-"@metamask/transaction-controller@npm:^42.0.0":
- version: 42.0.0
- resolution: "@metamask/transaction-controller@npm:42.0.0"
+"@metamask/transaction-controller@npm:^42.1.0":
+ version: 42.1.0
+ resolution: "@metamask/transaction-controller@npm:42.1.0"
dependencies:
"@ethereumjs/common": "npm:^3.2.0"
"@ethereumjs/tx": "npm:^4.2.0"
@@ -6446,13 +6456,13 @@ __metadata:
"@ethersproject/abi": "npm:^5.7.0"
"@ethersproject/contracts": "npm:^5.7.0"
"@ethersproject/providers": "npm:^5.7.0"
- "@metamask/base-controller": "npm:^7.0.2"
+ "@metamask/base-controller": "npm:^7.1.0"
"@metamask/controller-utils": "npm:^11.4.4"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/metamask-eth-abis": "npm:^3.1.1"
"@metamask/nonce-tracker": "npm:^6.0.0"
- "@metamask/rpc-errors": "npm:^7.0.1"
- "@metamask/utils": "npm:^10.0.0"
+ "@metamask/rpc-errors": "npm:^7.0.2"
+ "@metamask/utils": "npm:^11.0.1"
async-mutex: "npm:^0.5.0"
bn.js: "npm:^5.2.1"
eth-method-registry: "npm:^4.0.0"
@@ -6466,7 +6476,7 @@ __metadata:
"@metamask/eth-block-tracker": ">=9"
"@metamask/gas-fee-controller": ^22.0.0
"@metamask/network-controller": ^22.0.0
- checksum: 10/73c510803a720b4c1da0b82f1279a404a9b11c4ab76f8e5e4378c65d5d08bbb32c52062abfe319476cc3f5e2623a8987775c4524e55aa94002af73d73721b869
+ checksum: 10/9f842e2b68e84cbffdda301a0e15faab08226fd8e22eb954690ed41df60fe92c24acffdd9186b4c9f1da911a368cbe22cdb9ee046fc02d079c53f76100c66755
languageName: node
linkType: hard
@@ -6513,6 +6523,23 @@ __metadata:
languageName: node
linkType: hard
+"@metamask/utils@npm:^11.0.1":
+ version: 11.0.1
+ resolution: "@metamask/utils@npm:11.0.1"
+ dependencies:
+ "@ethereumjs/tx": "npm:^4.2.0"
+ "@metamask/superstruct": "npm:^3.1.0"
+ "@noble/hashes": "npm:^1.3.1"
+ "@scure/base": "npm:^1.1.3"
+ "@types/debug": "npm:^4.1.7"
+ debug: "npm:^4.3.4"
+ pony-cause: "npm:^2.1.10"
+ semver: "npm:^7.5.4"
+ uuid: "npm:^9.0.1"
+ checksum: 10/3949d16c8021bfb5f70e3b1c99f097ffaf43158116734197b039b32be6aabecb12178deb62c0b182e45295b0865618636324020059821c5b053029d8bdc90d70
+ languageName: node
+ linkType: hard
+
"@metamask/utils@npm:^8.1.0, @metamask/utils@npm:^8.2.0, @metamask/utils@npm:^8.3.0":
version: 8.5.0
resolution: "@metamask/utils@npm:8.5.0"
@@ -26597,7 +26624,7 @@ __metadata:
"@metamask/eslint-config-typescript": "npm:^9.0.1"
"@metamask/eslint-plugin-design-tokens": "npm:^1.1.0"
"@metamask/eth-json-rpc-filters": "npm:^9.0.0"
- "@metamask/eth-json-rpc-middleware": "npm:^15.0.1"
+ "@metamask/eth-json-rpc-middleware": "npm:^15.1.2"
"@metamask/eth-json-rpc-provider": "npm:^4.1.6"
"@metamask/eth-ledger-bridge-keyring": "npm:^5.0.1"
"@metamask/eth-query": "npm:^4.0.0"
@@ -26636,7 +26663,7 @@ __metadata:
"@metamask/post-message-stream": "npm:^8.0.0"
"@metamask/ppom-validator": "npm:0.36.0"
"@metamask/preferences-controller": "npm:^15.0.1"
- "@metamask/preinstalled-example-snap": "npm:^0.2.0"
+ "@metamask/preinstalled-example-snap": "npm:^0.3.0"
"@metamask/profile-sync-controller": "npm:^3.1.1"
"@metamask/providers": "npm:^18.2.0"
"@metamask/queued-request-controller": "npm:^7.0.1"
@@ -26648,15 +26675,15 @@ __metadata:
"@metamask/selected-network-controller": "npm:^19.0.0"
"@metamask/signature-controller": "npm:^23.1.0"
"@metamask/smart-transactions-controller": "npm:^16.0.0"
- "@metamask/snaps-controllers": "npm:^9.15.0"
- "@metamask/snaps-execution-environments": "npm:^6.10.0"
- "@metamask/snaps-rpc-methods": "npm:^11.7.0"
- "@metamask/snaps-sdk": "npm:^6.13.0"
- "@metamask/snaps-utils": "npm:^8.6.1"
+ "@metamask/snaps-controllers": "npm:^9.16.0"
+ "@metamask/snaps-execution-environments": "npm:^6.11.0"
+ "@metamask/snaps-rpc-methods": "npm:^11.8.0"
+ "@metamask/snaps-sdk": "npm:^6.14.0"
+ "@metamask/snaps-utils": "npm:^8.7.0"
"@metamask/solana-wallet-snap": "npm:^1.0.4"
"@metamask/test-bundler": "npm:^1.0.0"
"@metamask/test-dapp": "npm:8.13.0"
- "@metamask/transaction-controller": "npm:^42.0.0"
+ "@metamask/transaction-controller": "npm:^42.1.0"
"@metamask/user-operation-controller": "npm:^21.0.0"
"@metamask/utils": "npm:^10.0.1"
"@ngraveio/bc-ur": "npm:^1.1.12"
-
-
+
+
+
+
+
+
+
+
+
+ + From +
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+
-
+
+
+
+
+ + To +
+
+
+
+
+
+
+
+
+
+
+
+ + 0x2e0D7...5d09B +
+ ({
}),
}));
+jest.mock('../../../../hooks/useAssetDetails', () => ({
+ useAssetDetails: jest.fn(() => ({
+ decimals: 18,
+ })),
+}));
+
describe('TokenTransferInfo', () => {
it('renders correctly', () => {
const state = getMockTokenTransferConfirmState({});
- const mockStore = configureMockStore([])(state);
+ const mockStore = configureMockStore()(state);
const { container } = renderWithConfirmContextProvider(
();
- const { value, pending } = useDecodedTransactionData();
-
- const addresses = value?.data[0].params.filter(
- (param) => param.type === 'address',
- );
- const recipientAddress =
- transactionMeta.type === TransactionType.simpleSend
- ? transactionMeta.txParams.to
- : // sometimes there's more than one address, in which case we want the last one
- addresses?.[addresses.length - 1].value;
-
- if (pending) {
- return null;
- }
-
+ const recipientAddress = useTransferRecipient();
const { chainId } = transactionMeta;
return (
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx
index 2b1e6969ddd5..83696b69ac64 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/typed-sign-v1.test.tsx
@@ -65,7 +65,7 @@ describe('TypedSignInfo', () => {
type: TransactionType.signTypedData,
chainId: '0x5',
});
- (snapUtils.isSnapId as jest.Mock).mockReturnValue(true);
+ (snapUtils.isSnapId as unknown as jest.Mock).mockReturnValue(true);
const mockStore = configureMockStore([])(mockState);
const { queryByText } = renderWithConfirmContextProvider(
Hello world again!
@@ -104,7 +104,7 @@ exports[`SnapsSection renders section personal sign request 1`] = ` style="overflow-y: auto;" >Hello world!
diff --git a/ui/pages/confirmations/components/confirm/title/title.tsx b/ui/pages/confirmations/components/confirm/title/title.tsx index e8148912cac1..7be6c59be50d 100644 --- a/ui/pages/confirmations/components/confirm/title/title.tsx +++ b/ui/pages/confirmations/components/confirm/title/title.tsx @@ -20,8 +20,8 @@ import { Confirmation, SignatureRequestType } from '../../../types/confirm'; import { isSIWESignatureRequest } from '../../../utils'; import { useTypedSignSignatureInfo } from '../../../hooks/useTypedSignSignatureInfo'; import { useIsNFT } from '../info/approve/hooks/use-is-nft'; -import { useDecodedTransactionData } from '../info/hooks/useDecodedTransactionData'; import { getIsRevokeSetApprovalForAll } from '../info/utils'; +import { useTokenTransactionData } from '../info/hooks/useTokenTransactionData'; import { useCurrentSpendingCap } from './hooks/useCurrentSpendingCap'; function ConfirmBannerAlert({ ownerId }: { ownerId: string }) { @@ -173,19 +173,12 @@ const ConfirmTitle: React.FC = memo(() => { const { customSpendingCap, pending: spendingCapPending } = useCurrentSpendingCap(currentConfirmation); - let isRevokeSetApprovalForAll = false; - let revokePending = false; - const decodedResponse = useDecodedTransactionData( - TransactionType.tokenMethodSetApprovalForAll, - ); - if ( - currentConfirmation?.type === TransactionType.tokenMethodSetApprovalForAll - ) { - isRevokeSetApprovalForAll = getIsRevokeSetApprovalForAll( - decodedResponse.value, - ); - revokePending = decodedResponse.pending; - } + const parsedTransactionData = useTokenTransactionData(); + + const isRevokeSetApprovalForAll = + currentConfirmation?.type === + TransactionType.tokenMethodSetApprovalForAll && + getIsRevokeSetApprovalForAll(parsedTransactionData); const title = useMemo( () => @@ -195,7 +188,7 @@ const ConfirmTitle: React.FC = memo(() => { isNFT, customSpendingCap, isRevokeSetApprovalForAll, - spendingCapPending || revokePending, + spendingCapPending, primaryType, tokenStandard, ), @@ -205,7 +198,6 @@ const ConfirmTitle: React.FC = memo(() => { customSpendingCap, isRevokeSetApprovalForAll, spendingCapPending, - revokePending, primaryType, tokenStandard, ], @@ -219,7 +211,7 @@ const ConfirmTitle: React.FC = memo(() => { isNFT, customSpendingCap, isRevokeSetApprovalForAll, - spendingCapPending || revokePending, + spendingCapPending, primaryType, tokenStandard, ), @@ -229,7 +221,6 @@ const ConfirmTitle: React.FC = memo(() => { customSpendingCap, isRevokeSetApprovalForAll, spendingCapPending, - revokePending, primaryType, tokenStandard, ], diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap index 1673efaa6631..4ec6bcfa5026 100644 --- a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap +++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap @@ -208,7 +208,7 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = ` style="bottom: -1px; right: 2px;" >
{t('use4ByteResolution')}
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index 724c661c9aeb..37257e2c8fcb 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -21,6 +21,7 @@ import {
ADD_POPULAR_CUSTOM_NETWORK,
DEFAULT_ROUTE,
NOTIFICATIONS_SETTINGS_ROUTE,
+ SNAP_SETTINGS_ROUTE,
} from '../../helpers/constants/routes';
import { getSettingsRoutes } from '../../helpers/utils/settings-search';
@@ -31,6 +32,7 @@ import {
IconName,
Box,
Text,
+ IconSize,
} from '../../components/component-library';
import {
AlignItems,
@@ -44,6 +46,8 @@ import MetafoxLogo from '../../components/ui/metafox-logo';
// eslint-disable-next-line import/no-restricted-paths
import { getEnvironmentType } from '../../../app/scripts/lib/util';
import { ENVIRONMENT_TYPE_POPUP } from '../../../shared/constants/app';
+import { SnapIcon } from '../../components/app/snaps/snap-icon';
+import { SnapSettingsRenderer } from '../../components/app/snaps/snap-settings-page';
import SettingsTab from './settings-tab';
import AdvancedTab from './advanced-tab';
import InfoTab from './info-tab';
@@ -70,6 +74,8 @@ class SettingsPage extends PureComponent {
mostRecentOverviewPage: PropTypes.string.isRequired,
pathnameI18nKey: PropTypes.string,
remoteFeatureFlags: PropTypes.object.isRequired,
+ settingsPageSnaps: PropTypes.array,
+ snapSettingsTitle: PropTypes.string,
toggleNetworkMenu: PropTypes.func.isRequired,
useExternalServices: PropTypes.bool,
};
@@ -210,19 +216,24 @@ class SettingsPage extends PureComponent {
renderTitle() {
const { t } = this.context;
- const { isPopup, pathnameI18nKey, addressName } = this.props;
+ const { isPopup, pathnameI18nKey, addressName, snapSettingsTitle } =
+ this.props;
let titleText;
if (isPopup && addressName) {
titleText = t('details');
} else if (pathnameI18nKey && isPopup) {
titleText = t(pathnameI18nKey);
+ } else if (snapSettingsTitle) {
+ titleText = snapSettingsTitle;
} else {
titleText = t('settings');
}
return (
- {t('use4ByteResolutionDescription')}
+ {t('toggleDecodeDescription')}
- {titleText}
+
+ {titleText}
+
);
}
@@ -293,15 +304,31 @@ class SettingsPage extends PureComponent {
}
renderTabs() {
- const { history, currentPath, useExternalServices } = this.props;
+ const { history, currentPath, useExternalServices, settingsPageSnaps } =
+ this.props;
const { t } = this.context;
+ const snapsSettings = settingsPageSnaps.map(({ id, name }) => {
+ return {
+ content: name,
+ icon: (
+