m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix encypt/decrypt tx queueing (#10350)

Browse Source 
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.
This commit is contained in:
Thomas Huang 2021-02-17 12:47:01 -08:00 committed by GitHub
parent b056867c33
commit 21aec63f41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
View File

@ -10,6 +10,7 @@ import {
} from '../../store/actions'; } from '../../store/actions';
import { import {
getTargetAccountWithSendEtherInfo, getTargetAccountWithSendEtherInfo,
unconfirmedTransactionsListSelector,
conversionRateSelector, conversionRateSelector,
} from '../../selectors'; } from '../../selectors';
import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck'; import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
@ -18,11 +19,12 @@ import ConfirmDecryptMessage from './confirm-decrypt-message.component';
function mapStateToProps(state) { function mapStateToProps(state) {
const { const {
confirmTransaction,
metamask: { domainMetadata = {} }, metamask: { domainMetadata = {} },
} = state; } = state;
const { txData = {} } = confirmTransaction; const unconfirmedTransactions = unconfirmedTransactionsListSelector(state);
const txData = unconfirmedTransactions[0];
const { const {
msgParams: { from }, msgParams: { from },

6
ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
View File

@ -10,6 +10,7 @@ import {
import { import {
conversionRateSelector, conversionRateSelector,
unconfirmedTransactionsListSelector,
getTargetAccountWithSendEtherInfo, getTargetAccountWithSendEtherInfo,
} from '../../selectors'; } from '../../selectors';
@ -19,11 +20,12 @@ import ConfirmEncryptionPublicKey from './confirm-encryption-public-key.componen
function mapStateToProps(state) { function mapStateToProps(state) {
const { const {
confirmTransaction,
metamask: { domainMetadata = {} }, metamask: { domainMetadata = {} },
} = state; } = state;
const { txData = {} } = confirmTransaction; const unconfirmedTransactions = unconfirmedTransactionsListSelector(state);
const txData = unconfirmedTransactions[0];
const { msgParams: from } = txData; const { msgParams: from } = txData;