m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Code

Prevent confirm screen from showing method name from contract registry for txes created within MetaMask (#15472)

Browse Source 
* Prevent confirm screen from showing method name from contract registry for txes created within MetaMask

* Ensure method name does not get sent in state when sending to a contract, with tx data, from metamask send screen
This commit is contained in:
Dan J Miller 2022-08-04 17:20:32 -02:30 committed by Dan Miller
parent 60ba129eb2
commit 2955b97f97
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
View File

@ -1048,7 +1048,10 @@ export default class ConfirmTransactionBase extends Component {
} = this.getNavigateTxData();
let functionType;
if (txData.type === TRANSACTION_TYPES.CONTRACT_INTERACTION) {
if (
txData.type === TRANSACTION_TYPES.CONTRACT_INTERACTION &&
txData.origin !== 'metamask'
) {
functionType = getMethodName(name);
}

12
ui/pages/confirm-transaction/confirm-transaction.component.js
View File

@ -68,7 +68,7 @@ export default class ConfirmTransaction extends Component {
sendTo,
history,
mostRecentOverviewPage,
transaction: { txParams: { data } = {} } = {},
transaction: { txParams: { data } = {}, origin } = {},
getContractMethodData,
transactionId,
paramsTransactionId,
@ -91,7 +91,9 @@ export default class ConfirmTransaction extends Component {
return;
}
getContractMethodData(data);
if (origin !== 'metamask') {
getContractMethodData(data);
}
const txId = transactionId || paramsTransactionId;
if (txId) {
@ -107,7 +109,7 @@ export default class ConfirmTransaction extends Component {
componentDidUpdate(prevProps) {
const {
setTransactionToConfirm,
transaction: { txData: { txParams: { data } = {} } = {} },
transaction: { txData: { txParams: { data } = {}, origin } = {} },
clearConfirmTransaction,
getContractMethodData,
paramsTransactionId,
@ -124,8 +126,10 @@ export default class ConfirmTransaction extends Component {
prevProps.paramsTransactionId !== paramsTransactionId
) {
clearConfirmTransaction();
getContractMethodData(data);
setTransactionToConfirm(paramsTransactionId);
if (origin !== 'metamask') {
getContractMethodData(data);
}
} else if (
prevProps.transactionId &&
!transactionId &&