Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Merge master into v12.5.0 (following v12.4.2) #27938

Merged
merged 8 commits into from
Oct 17, 2024

Commits on Oct 15, 2024

  1. Version v12.4.2

    metamaskbot committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    516af04 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. fix: Correct conditions for triggering name lookup during send (#27880)

    <!--
    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.
    
    [![Open in GitHub
    Codespaces](https://github.com/codespaces/badge.svg)](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>
    FrederikBolding and hmalik88 authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e4672a8 View commit details
    Browse the repository at this point in the history
  2. chore: Update RC hotfix changelog (#27900)

    <!--
    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.
    FrederikBolding authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9221f8e View commit details
    Browse the repository at this point in the history
  3. chore: Cherry pick f523617 to v12.4.2 (#27899)

    Cherry picks f523617
    (#27856) to v12.4.2
    RC branch
    
    Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
    danjm and FrederikBolding authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    36fe5a8 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #27879 from MetaMask/Version-v12.4.2

    Version v12.4.2 RC
    Gudahtt authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    626289d View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Configuration menu
    Copy the full SHA
    43a66d4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6ec1ce9 View commit details
    Browse the repository at this point in the history
  3. Fixed the test

    hjetpoluru committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    9f77f8f View commit details
    Browse the repository at this point in the history