fix: issue where queued request counts were not included in logic to reroute from home screen and close notification #25454
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…eroute from home screen and close notification
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
|
Verified that this resolves the issue for me |
adonesky1
force-pushed
the
ad/fix/queued-request-counts
branch
from
ce2bda5
to
34b4be2
Compare
adonesky1
commented
Jun 20, 2024
Comment on lines
+630
to
+635
| const unapprovedTxRequests = getApprovalRequestsByType( | ||
| state, | ||
| ApprovalType.Transaction, | ||
| ); | ||
| return ( | ||
| hasUnapprovedTransactionsInCurrentNetwork(state) || | ||
| unapprovedTxRequests.length > 0 || |
There was a problem hiding this comment.
since we queue requests on different dapps which can be on different networks now we don't want to restrict this boolean check to only transactions that match the currently selected network. I'm not actually sure how there could have been pending transactions on different networks previously that necessitated this check 🤔... but I might be forgetting something
jiexi
previously approved these changes
Jun 20, 2024
Builds ready [234c8ab]
Page Load Metrics (258 ± 293 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #25454 +/- ##
===========================================
- Coverage 65.22% 65.21% -0.02%
===========================================
Files 1405 1405
Lines 55528 55530 +2
Branches 14587 14583 -4
===========================================
- Hits 36218 36209 -9
- Misses 19310 19321 +11 ☔ View full report in Codecov by Sentry. |
shanejonas
approved these changes
Jun 21, 2024
NidhiKJha
approved these changes
Jun 21, 2024
Builds ready [3a2f12c]
Page Load Metrics (47 ± 4 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
metamaskbot
added
the
release-12.1.0
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
We introduced logic to add queued requests (pending requests not yet in the
ApprovalController) to the trayIcon badge number, but failed to account for these requests in two other crucial spots:Related issues
Fixes: #25412
Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2677
Manual testing steps
Screenshots/Recordings
Before
Screen.Recording.2024-06-20.at.4.51.16.PM.mov
After
Screen.Recording.2024-06-20.at.4.44.57.PM.mov
Pre-merge author checklist
Pre-merge reviewer checklist