Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve transaction confirmation page performance #16205

Merged
merged 6 commits into from
Oct 28, 2022
Merged

Improve transaction confirmation page performance #16205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37517d5
Reduce the amount of calls to insight snaps
FrederikBolding Oct 14, 2022
13fcf6c
Add dep
FrederikBolding Oct 14, 2022
7469c94
Update LavaMoat policies
FrederikBolding Oct 14, 2022
023f1b9
Fix selectors and revert changes to hook
FrederikBolding Oct 14, 2022
1d0bfd9
Remove dep
FrederikBolding Oct 14, 2022
84e9586
Revert "Update LavaMoat policies"
FrederikBolding Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/hooks/flask/useTransactionInsightSnap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function useTransactionInsightSnap({ transaction, chainId, snapId }) {
async function fetchInsight() {
const d = await handleSnapRequest({
snapId,
origin: 'test',
origin: '',
handler: 'onTransaction',
request: {
jsonrpc: '2.0',
Expand Down
23 changes: 5 additions & 18 deletions ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import {
getEIP1559V2Enabled,
getIsBuyableChain,
getEnsResolutionByAddress,
getUnapprovedTransaction,
getFullTxData,
///: BEGIN:ONLY_INCLUDE_IN(flask)
getInsightSnaps,
///: END:ONLY_INCLUDE_IN
Expand Down Expand Up @@ -98,10 +100,8 @@ const mapStateToProps = (state, ownProps) => {
} = metamask;
const { tokenData, txData, tokenProps, nonce } = confirmTransaction;
const { txParams = {}, id: transactionId, type } = txData;
const transaction =
Object.values(unapprovedTxs).find(
({ id }) => id === (transactionId || Number(paramsTransactionId)),
) || {};
const txId = transactionId || Number(paramsTransactionId);
const transaction = getUnapprovedTransaction(state, txId);
const {
from: fromAddress,
to: txParamsToAddress,
Expand Down Expand Up @@ -148,10 +148,6 @@ const mapStateToProps = (state, ownProps) => {
gasEstimationObject,
} = transactionFeeSelector(state, transaction);

if (transaction && transaction.simulationFails) {
txData.simulationFails = transaction.simulationFails;
}

const currentNetworkUnapprovedTxs = Object.keys(unapprovedTxs)
.filter((key) =>
transactionMatchesNetwork(unapprovedTxs[key], chainId, network),
Expand All @@ -168,16 +164,7 @@ const mapStateToProps = (state, ownProps) => {

const methodData = getKnownMethodData(state, data) || {};

let fullTxData = { ...txData, ...transaction };
if (customTxParamsData) {
fullTxData = {
...fullTxData,
txParams: {
...fullTxData.txParams,
data: customTxParamsData,
},
};
}
const fullTxData = getFullTxData(state, txId, customTxParamsData);

const isCollectibleTransfer = Boolean(
allCollectibleContracts?.[selectedAddress]?.[chainId]?.find((contract) => {
Expand Down
54 changes: 50 additions & 4 deletions ui/selectors/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import { createSelector } from 'reselect';
///: BEGIN:ONLY_INCLUDE_IN(flask)
import { memoize } from 'lodash';
///: END:ONLY_INCLUDE_IN
import {
createSelector,
createSelectorCreator,
defaultMemoize,
} from 'reselect';
import {
///: BEGIN:ONLY_INCLUDE_IN(flask)
memoize,
///: END:ONLY_INCLUDE_IN
isEqual,
} from 'lodash';
import { addHexPrefix } from '../../app/scripts/lib/util';
import {
TEST_CHAINS,
Expand Down Expand Up @@ -771,6 +778,45 @@ export function getShowWhatsNewPopup(state) {
return state.appState.showWhatsNewPopup;
}

const createDeepEqualSelector = createSelectorCreator(defaultMemoize, isEqual);

export const getUnapprovedTransactions = (state) =>
state.metamask.unapprovedTxs;

export const getTxData = (state) => state.confirmTransaction.txData;

export const getUnapprovedTransaction = createDeepEqualSelector(
getUnapprovedTransactions,
(_, transactionId) => transactionId,
(unapprovedTxs, transactionId) => {
return (
Object.values(unapprovedTxs).find(({ id }) => id === transactionId) || {}
);
},
);

export const getFullTxData = createDeepEqualSelector(
getTxData,
(state, transactionId) => getUnapprovedTransaction(state, transactionId),
(_state, _transactionId, customTxParamsData) => customTxParamsData,
(txData, transaction, customTxParamsData) => {
let fullTxData = { ...txData, ...transaction };
if (transaction && transaction.simulationFails) {
txData.simulationFails = transaction.simulationFails;
}
if (customTxParamsData) {
fullTxData = {
...fullTxData,
txParams: {
...fullTxData.txParams,
data: customTxParamsData,
},
};
}
return fullTxData;
},
);

///: BEGIN:ONLY_INCLUDE_IN(flask)
export function getSnaps(state) {
return state.metamask.snaps;
Expand Down