1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 04:37:13 +01:00
metamask-extension/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
Thomas Huang 21aec63f41
Fix encypt/decrypt tx queueing (#10350)
Fixes #10231

Use unconfirmedTransactionsListSelector in the encypt/decrypt components to render the appropriate data to the component at the appropriate time(?).
I am still unsure how sometimes the state.confirmTransaction can we left empty sometimes on rendering the component, possibly the issue with the ConfirmTransaction componentDidUpdate constantly hitting this section.
https://github.com/MetaMask/metamask-extension/blob/develop/ui/app/pages/confirm-transaction/confirm-transaction.component.js#L94-L101

For now this seems to be an intermediate fix.
2021-02-17 12:47:01 -08:00

73 lines
2.0 KiB
JavaScript

import { connect } from 'react-redux';
import { compose } from 'redux';
import { withRouter } from 'react-router-dom';
import {
goHome,
decryptMsg,
cancelDecryptMsg,
decryptMsgInline,
} from '../../store/actions';
import {
getTargetAccountWithSendEtherInfo,
unconfirmedTransactionsListSelector,
conversionRateSelector,
} from '../../selectors';
import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
import { getMostRecentOverviewPage } from '../../ducks/history/history';
import ConfirmDecryptMessage from './confirm-decrypt-message.component';
function mapStateToProps(state) {
const {
metamask: { domainMetadata = {} },
} = state;
const unconfirmedTransactions = unconfirmedTransactionsListSelector(state);
const txData = unconfirmedTransactions[0];
const {
msgParams: { from },
} = txData;
const fromAccount = getTargetAccountWithSendEtherInfo(state, from);
return {
txData,
domainMetadata,
fromAccount,
requester: null,
requesterAddress: null,
conversionRate: conversionRateSelector(state),
mostRecentOverviewPage: getMostRecentOverviewPage(state),
};
}
function mapDispatchToProps(dispatch) {
return {
goHome: () => dispatch(goHome()),
clearConfirmTransaction: () => dispatch(clearConfirmTransaction()),
decryptMessage: (msgData, event) => {
const params = msgData.msgParams;
params.metamaskId = msgData.id;
event.stopPropagation(event);
return dispatch(decryptMsg(params));
},
cancelDecryptMessage: (msgData, event) => {
event.stopPropagation(event);
return dispatch(cancelDecryptMsg(msgData));
},
decryptMessageInline: (msgData, event) => {
const params = msgData.msgParams;
params.metamaskId = msgData.id;
event.stopPropagation(event);
return dispatch(decryptMsgInline(params));
},
};
}
export default compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps),
)(ConfirmDecryptMessage);