mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
21aec63f41
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.
65 lines
1.8 KiB
JavaScript
65 lines
1.8 KiB
JavaScript
import { connect } from 'react-redux';
|
|
import { compose } from 'redux';
|
|
import { withRouter } from 'react-router-dom';
|
|
|
|
import {
|
|
goHome,
|
|
encryptionPublicKeyMsg,
|
|
cancelEncryptionPublicKeyMsg,
|
|
} from '../../store/actions';
|
|
|
|
import {
|
|
conversionRateSelector,
|
|
unconfirmedTransactionsListSelector,
|
|
getTargetAccountWithSendEtherInfo,
|
|
} from '../../selectors';
|
|
|
|
import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
|
|
import { getMostRecentOverviewPage } from '../../ducks/history/history';
|
|
import ConfirmEncryptionPublicKey from './confirm-encryption-public-key.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()),
|
|
encryptionPublicKey: (msgData, event) => {
|
|
const params = { data: msgData.msgParams, metamaskId: msgData.id };
|
|
event.stopPropagation();
|
|
return dispatch(encryptionPublicKeyMsg(params));
|
|
},
|
|
cancelEncryptionPublicKey: (msgData, event) => {
|
|
event.stopPropagation();
|
|
return dispatch(cancelEncryptionPublicKeyMsg(msgData));
|
|
},
|
|
};
|
|
}
|
|
|
|
export default compose(
|
|
withRouter,
|
|
connect(mapStateToProps, mapDispatchToProps),
|
|
)(ConfirmEncryptionPublicKey);
|