fix: Issue 26751 QR barcode scanner #27002
Merged
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
|
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. |
ejwessel
changed the title
darkwing
reviewed
Sep 9, 2024
| @@ -30,8 +30,8 @@ const parseContent = (content) => { | |||
| // Ethereum address links - fox ex. ethereum:0x.....1111 | |||
| if (content.split('ethereum:').length > 1) { | |||
| type = 'address'; | |||
| values = { address: content.split('ethereum:')[1] }; | |||
|
|
|||
| // uses regex capture groups to match and extract address while ignoring everythign else | |||
There was a problem hiding this comment.
Nit: everythign -> everything
| values = { address: content.split('ethereum:')[1] }; | ||
|
|
||
| // uses regex capture groups to match and extract address while ignoring everythign else | ||
| values = { address: content.match(/.*:(0x[0-9a-fA-F]{40})(?:@.*)?/)[1] } |
There was a problem hiding this comment.
I hate pointing this out but should we have this regex in a function so we can add a test? Also, is there a product consideration here? i.e. if the string ends in 0x89, and the user is on Mainnet, should something happen?
There was a problem hiding this comment.
+1 on test. though it is in parseContent, but I can make a test for this.
. if the string ends in 0x89, and the user is on Mainnet, should something happen?
perhaps, though I feel that's outside the scope of the bug.
jclancy93
previously approved these changes
Sep 10, 2024
Builds ready [7cc5c26]
Page Load Metrics (1757 ± 110 ms)
Bundle size diffs
|
ejwessel
force-pushed
the
fix-issue-26751
branch
from
7cc5c26 to
3e0d03f
Compare
Builds ready [3e0d03f]
Page Load Metrics (1622 ± 78 ms)
Bundle size diffs
|
darkwing
previously approved these changes
Sep 11, 2024
DDDDDanica
reviewed
Sep 11, 2024
darkwing
previously approved these changes
Sep 11, 2024
Builds ready [4f7f808]
Page Load Metrics (1805 ± 94 ms)
Bundle size diffs
|
|
Builds ready [d73dca0]
Page Load Metrics (1959 ± 140 ms)
Bundle size diffs
|
micaelae
approved these changes
Sep 11, 2024
jclancy93
approved these changes
Sep 12, 2024
DDDDDanica
approved these changes
Sep 12, 2024
metamaskbot
added
the
release-12.6.0
metamaskbot
added
release-12.5.0
|
Missing release label release-12.5.0 on PR. Adding release label release-12.5.0 on PR and removing other release labels(release-12.6.0), as PR was added to branch 12.5.0 when release was cut. |
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
QR scanning broke some time ago. This PR fixes scanning QR codes when provided a QR code from either mobile or from extension by extracting just the address.
Instead of using various splits and conditionals, I use regex capture groups to extract the address.
Related issues
Fixes:
#26751
#21766
Manual testing steps
tofieldScreenshots/Recordings
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist