diff options
author | Alexander Tseung <alextsg@users.noreply.github.com> | 2018-07-25 02:49:50 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-25 02:49:50 +0800 |
commit | fed9ae0deed5853014cfc76b4314195d477f14f4 (patch) | |
tree | ef81d610e330241215b0b5878adbf3e5d74c8771 /ui/app/selectors/confirm-transaction.js | |
parent | 653e42cf79f20e57af63f2bcc36cb3c236239e9b (diff) | |
parent | a61227f224e37559c8d6e2c59441b0032633feaf (diff) | |
download | tangerine-wallet-browser-fed9ae0deed5853014cfc76b4314195d477f14f4.tar.gz tangerine-wallet-browser-fed9ae0deed5853014cfc76b4314195d477f14f4.tar.zst tangerine-wallet-browser-fed9ae0deed5853014cfc76b4314195d477f14f4.zip |
Merge pull request #4865 from MetaMask/i4829-close-notifications-from-ui
Close notifications from UI actions
Diffstat (limited to 'ui/app/selectors/confirm-transaction.js')
-rw-r--r-- | ui/app/selectors/confirm-transaction.js | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/ui/app/selectors/confirm-transaction.js b/ui/app/selectors/confirm-transaction.js index 54016a30e..8f8e0ea74 100644 --- a/ui/app/selectors/confirm-transaction.js +++ b/ui/app/selectors/confirm-transaction.js @@ -62,6 +62,34 @@ export const unconfirmedTransactionsHashSelector = createSelector( } ) +const unapprovedMsgCountSelector = state => state.metamask.unapprovedMsgCount +const unapprovedPersonalMsgCountSelector = state => state.metamask.unapprovedPersonalMsgCount +const unapprovedTypedMessagesCountSelector = state => state.metamask.unapprovedTypedMessagesCount + +export const unconfirmedTransactionsCountSelector = createSelector( + unapprovedTxsSelector, + unapprovedMsgCountSelector, + unapprovedPersonalMsgCountSelector, + unapprovedTypedMessagesCountSelector, + networkSelector, + ( + unapprovedTxs = {}, + unapprovedMsgCount = 0, + unapprovedPersonalMsgCount = 0, + unapprovedTypedMessagesCount = 0, + network + ) => { + const filteredUnapprovedTxIds = Object.keys(unapprovedTxs).filter(txId => { + const { metamaskNetworkId } = unapprovedTxs[txId] + return metamaskNetworkId === network + }) + + return filteredUnapprovedTxIds.length + unapprovedTypedMessagesCount + unapprovedMsgCount + + unapprovedPersonalMsgCount + } +) + + export const currentCurrencySelector = state => state.metamask.currentCurrency export const conversionRateSelector = state => state.metamask.conversionRate @@ -156,7 +184,6 @@ export const sendTokenTokenAmountAndToAddressSelector = createSelector( } ) - export const contractExchangeRateSelector = createSelector( contractExchangeRatesSelector, tokenAddressSelector, |