chore: Merge master into v12.5.0 (following v12.4.2)#27938
chore: Merge master into v12.5.0 (following v12.4.2)#27938danjm merged 8 commits intoVersion-v12.5.0from
Conversation
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> Take changes from 5e08c06 ## **Description** Hotfixes a problem preventing certain name resolution Snaps from being triggered due to faulty `IS_FLASK` conditions in `12.4.1`. These conditions were removed in #26242. This PR picks these changes from the previously mentioned PR, without touching the ENS integration. The problem in question occurs when trying to trigger name resolution for a given input. `lookupDomainName` is never called on stable unless the input looks similar to an ENS name. This prevents resolution of inputs that don't use TLDs for instance. [](https://codespaces.new/MetaMask/metamask-extension/pull/27880?quickstart=1) ## **Manual testing steps** 1. Use a build of stable 2. Install https://snaps.metamask.io/snap/npm/social-names-snap/ 3. See that you can resolve a Farcaster name using that Snap, e.g. `fc:frederik` 4. Check that you can also type a valid ENS name 5. Check that you can also type a valid address --------- Co-authored-by: Hassan Malik <hbmalik88@gmail.com>
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** Updates the hotfix RC changelog to mention the PR that was picked into the RC.
Version v12.4.2 RC
|
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. |
app/_locales/en/messages.json
Outdated
There was a problem hiding this comment.
This code is present on develop, and so it probably should not be deleted: https://github.com/MetaMask/metamask-extension/blob/develop/app/_locales/en/messages.json#L4323-L4325
There was a problem hiding this comment.
I agree with you that the develop shows as posted by you.
But in v12.4.2 has this changes - https://github.com/MetaMask/metamask-extension/blob/develop/app/_locales/en/messages.json#L4323-L4325
Hence I took the v12.4.2. Now my current question is how did this code get to hotfix only?
There was a problem hiding this comment.
ok thanks @danjm, I have address the conflict with the instruction you have provided.
app/_locales/en_GB/messages.json
Outdated
There was a problem hiding this comment.
On develop, this is "recipientAddressPlaceholder": https://github.com/MetaMask/metamask-extension/blob/develop/app/_locales/en_GB/messages.json#L4143-L4145
There was a problem hiding this comment.
I agree with you that the develop shows as posted by you.
But in v12.4.2 has this changes - https://github.com/MetaMask/metamask-extension/pull/27879/files#diff-7509d7529ea1cbc57ef79713676f7d124d9d5a446053f94836876c4cd3f3ccd6
Hence I took the v12.4.2. Now my current question is how did this code get to hotfix only?
Additional modifications needed as per Dan's comments.
0fcf282 to
1f0bb11
Compare
ui/ducks/send/send.js
Outdated
There was a problem hiding this comment.
This change probably needs to be removed for lint to pass
ui/ducks/send/send.test.js
Outdated
There was a problem hiding this comment.
This change probably needs to be removed for tests to pass
5da6893 to
f4acf4c
Compare
Builds ready [0e45523]
Page Load Metrics (1728 ± 108 ms)
|
0e45523 to
43a66d4
Compare
Builds ready [9f77f8f]
Page Load Metrics (1807 ± 131 ms)
|
|
No release label on PR. Adding release label release-12.5.0 on PR, as PR was added to branch 12.5.0 when release was cut. |
Description
PR to merge hotfix changes of v12.4.2 into v12.5.0