Skip to content
Merged
Changes from all commits
Commits
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
34 changes: 21 additions & 13 deletions ui/selectors/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -2472,19 +2472,27 @@ export function getShowRecoveryPhraseReminder(state) {
* @param state - Redux state object.
* @returns Number of unapproved transactions
*/
export function getNumberOfAllUnapprovedTransactionsAndMessages(state) {
const unapprovedTxs = getUnapprovedTransactions(state);

const allUnapprovedMessages = {
...unapprovedTxs,
...state.metamask.unapprovedDecryptMsgs,
...state.metamask.unapprovedPersonalMsgs,
...state.metamask.unapprovedEncryptionPublicKeyMsgs,
...state.metamask.unapprovedTypedMessages,
};
const numUnapprovedMessages = Object.keys(allUnapprovedMessages).length;
return numUnapprovedMessages;
}
export const getNumberOfAllUnapprovedTransactionsAndMessages = createSelector(
[
getUnapprovedTransactions,
(state) => state.metamask.unapprovedDecryptMsgs,
(state) => state.metamask.unapprovedPersonalMsgs,
(state) => state.metamask.unapprovedEncryptionPublicKeyMsgs,
(state) => state.metamask.unapprovedTypedMessages,
],
(
unapprovedTxs,
unapprovedDecryptMsgs,
unapprovedPersonalMsgs,
unapprovedEncryptionPublicKeyMsgs,
unapprovedTypedMessages,
) =>
Object.keys(unapprovedTxs ?? {}).length +
Object.keys(unapprovedDecryptMsgs ?? {}).length +
Object.keys(unapprovedPersonalMsgs ?? {}).length +
Object.keys(unapprovedEncryptionPublicKeyMsgs ?? {}).length +
Object.keys(unapprovedTypedMessages ?? {}).length,
);

export const getCurrentNetwork = createDeepEqualSelector(
getNetworkConfigurationsByChainId,
Expand Down
Loading