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

Clean ConfirmTransaction page related code (#19208)

Browse Source 
* fix typo: uncofirmedTransactions -> unconfirmedTransactions

* txHelper: reorganize lines and improve test

* ConfirmTx: rn unconfirmedTxs->unconfirmedTxsSorted

* ConfirmTx: rn unconfirmedMessages-> unconfirmedTxs
This commit is contained in:
Ariella Vu 2023-06-01 16:10:26 +02:00 committed by GitHub
parent d99aecc164
commit 8d79e28560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/components/app/confirm-page-container/confirm-page-container-navigation/confirm-page-container-navigation.component.js
View File

@ -23,7 +23,7 @@ const ConfirmPageContainerNavigation = () => {
const unapprovedEncryptionPublicKeyMsgs = useSelector(
unapprovedEncryptionPublicKeyMsgsSelector,
);
const uncofirmedTransactions = useSelector(
const unconfirmedTransactions = useSelector(
unconfirmedTransactionsHashSelector,
);
@ -36,7 +36,7 @@ const ConfirmPageContainerNavigation = () => {
...enumUnapprovedEncryptMsgsKey,
];
const enumUnapprovedTxs = Object.keys(uncofirmedTransactions).filter(
const enumUnapprovedTxs = Object.keys(unconfirmedTransactions).filter(
(key) => enumDecryptAndEncryptMsgs.includes(key) === false,
);
@ -54,7 +54,7 @@ const ConfirmPageContainerNavigation = () => {
if (txId) {
dispatch(clearConfirmTransaction());
history.push(
uncofirmedTransactions[txId]?.msgParams
unconfirmedTransactions[txId]?.msgParams
? `${CONFIRM_TRANSACTION_ROUTE}/${txId}${SIGNATURE_REQUEST_PATH}`
: `${CONFIRM_TRANSACTION_ROUTE}/${txId}`,
);

16
ui/helpers/utils/tx-helper.test.js
View File

@ -5,15 +5,21 @@ describe('txHelper', () => {
it('always shows the oldest tx first', () => {
const metamaskNetworkId = NETWORK_IDS.MAINNET;
const chainId = CHAIN_IDS.MAINNET;
const txs = {
const mockUnapprovedTxs = {
a: { metamaskNetworkId, time: 3 },
b: { metamaskNetworkId, time: 1 },
b: { metamaskNetworkId, time: 6 },
c: { metamaskNetworkId, time: 2 },
};
const mockUnapprovedMsgs = {
d: { metamaskNetworkId, time: 4 },
e: { metamaskNetworkId, time: 1 },
f: { metamaskNetworkId, time: 5 },
};
const sorted = txHelper(
txs,
null,
mockUnapprovedTxs,
mockUnapprovedMsgs,
null,
null,
null,
@ -21,7 +27,9 @@ describe('txHelper', () => {
metamaskNetworkId,
chainId,
);
expect(sorted[0].time).toStrictEqual(1);
expect(sorted[2].time).toStrictEqual(3);
expect(sorted[5].time).toStrictEqual(6);
});
});

34
ui/helpers/utils/tx-helper.ts
View File

@ -29,35 +29,33 @@ export default function txHelper(
transactionMatchesNetwork(txMeta, chainId, networkId),
)
: valuesFor(unapprovedTxs);
log.debug(`tx helper found ${txValues.length} unapproved txs`);
const msgValues = valuesFor(unapprovedMsgs);
log.debug(`tx helper found ${msgValues.length} unsigned messages`);
let allValues = txValues.concat(msgValues);
const personalValues = valuesFor(personalMsgs);
const decryptValues = valuesFor(decryptMsgs);
const encryptionPublicKeyValues = valuesFor(encryptionPublicKeyMsgs);
const typedValues = valuesFor(typedMessages);
const allValues = txValues
.concat(msgValues)
.concat(personalValues)
.concat(decryptValues)
.concat(encryptionPublicKeyValues)
.concat(typedValues)
.sort((a, b) => {
return a.time - b.time;
});
log.debug(`tx helper found ${txValues.length} unapproved txs`);
log.debug(`tx helper found ${msgValues.length} unsigned messages`);
log.debug(
`tx helper found ${personalValues.length} unsigned personal messages`,
);
allValues = allValues.concat(personalValues);
const decryptValues = valuesFor(decryptMsgs);
log.debug(`tx helper found ${decryptValues.length} decrypt requests`);
allValues = allValues.concat(decryptValues);
const encryptionPublicKeyValues = valuesFor(encryptionPublicKeyMsgs);
log.debug(
`tx helper found ${encryptionPublicKeyValues.length} encryptionPublicKey requests`,
);
allValues = allValues.concat(encryptionPublicKeyValues);
const typedValues = valuesFor(typedMessages);
log.debug(`tx helper found ${typedValues.length} unsigned typed messages`);
allValues = allValues.concat(typedValues);
allValues = allValues.sort((a, b) => {
return a.time - b.time;
});
return allValues;
}

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

@ -57,22 +57,22 @@ const ConfirmTransaction = () => {
const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
const sendTo = useSelector(getSendTo);
const unapprovedTxs = useSelector(getUnapprovedTransactions);
const unconfirmedTxs = useSelector(unconfirmedTransactionsListSelector);
const unconfirmedMessages = useSelector(unconfirmedTransactionsHashSelector);
const unconfirmedTxsSorted = useSelector(unconfirmedTransactionsListSelector);
const unconfirmedTxs = useSelector(unconfirmedTransactionsHashSelector);
const totalUnapproved = unconfirmedTxs.length || 0;
const totalUnapproved = unconfirmedTxsSorted.length || 0;
const getTransaction = useCallback(() => {
return totalUnapproved
? unapprovedTxs[paramsTransactionId] ||
unconfirmedMessages[paramsTransactionId] ||
unconfirmedTxs[0]
unconfirmedTxs[paramsTransactionId] ||
unconfirmedTxsSorted[0]
: {};
}, [
paramsTransactionId,
totalUnapproved,
unapprovedTxs,
unconfirmedMessages,
unconfirmedTxs,
unconfirmedTxsSorted,
]);
const [transaction, setTransaction] = useState(getTransaction);
@ -88,8 +88,8 @@ const ConfirmTransaction = () => {
paramsTransactionId,
totalUnapproved,
unapprovedTxs,
unconfirmedMessages,
unconfirmedTxs,
unconfirmedTxsSorted,
]);
const { id, type } = transaction;