Skip to content

Conversation

@SteP-n-s
Copy link
Contributor

@SteP-n-s SteP-n-s commented Oct 29, 2025

Explanation

Updates logic of getBridgeERC20Allowance method to use chainId parameter to retrieve the networkClient.

References

Checklist

  • I've updated the test suite for new or updated code as appropriate
  • I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
  • I've communicated my changes to consumers by updating changelogs for packages I've changed, highlighting breaking changes as necessary
  • I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

Note

Update getBridgeERC20Allowance to fetch the network client by chainId; add error handling/tests and update changelog.

  • BridgeController:
    • Add #getNetworkClientByChainId(chainId) to resolve client via NetworkController:findNetworkClientIdByChainId then getNetworkClientById.
    • Update getBridgeERC20Allowance to use #getNetworkClientByChainId instead of the selected network; throw on missing client/provider.
  • Tests (src/bridge-controller.test.ts):
    • Adjust mocks to expect findNetworkClientIdByChainIdgetNetworkClientById call sequence.
    • Add cases for missing network client and missing provider errors.
  • Docs:
    • Update CHANGELOG.md under Unreleased with the fix entry.

Written by Cursor Bugbot for commit 159d089. This will update automatically on new commits. Configure here.

@micaelae micaelae changed the title Refactor/update allowance logic fix: remove global network reference in bridge allowance handler Oct 29, 2025
@micaelae micaelae marked this pull request as ready for review October 29, 2025 16:50
@micaelae micaelae requested a review from a team as a code owner October 29, 2025 16:50
@micaelae micaelae requested a review from a team as a code owner October 29, 2025 16:50
@micaelae micaelae enabled auto-merge (squash) October 29, 2025 16:50
micaelae
micaelae previously approved these changes Oct 29, 2025
@micaelae micaelae merged commit 8a31998 into main Oct 29, 2025
255 checks passed
@micaelae micaelae deleted the refactor/update-allowance-logic branch October 29, 2025 17:02
joaoloureirop added a commit to MetaMask/metamask-mobile that referenced this pull request Nov 6, 2025
…eERC20Allowance handler (#22230)

<!--
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**

Patching MetaMask/core#6994 into
`@metamask/bridge-controller` to improve USDT swap/bridge tx success
rates

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Changelog**

<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`

If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`

(This helps the Release Engineer do their job more quickly and
accurately)
-->

CHANGELOG entry: fix: remove selected network reference from bridge
getBridgeERC20Allowance handler

## **Related issues**

Fixes:

## **Manual testing steps**

```gherkin
Feature: my feature name

  Scenario: user [verb for user action]
    Given [describe expected initial app state]

    When user [verb for user action]
    Then [describe expected outcome]
```

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.


<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Switches `getBridgeERC20Allowance` to use the network client for the
provided `chainId`, adds a helper to fetch it, and wires the patched
`@metamask/bridge-controller` dependency.
> 
> - **Bridge Controller (`dist/bridge-controller.cjs`)**:
> - `getBridgeERC20Allowance`: use provider from
`getNetworkClientByChainId(chainId)` instead of selected network.
> - Add `#getNetworkClientByChainId` helper: looks up client ID via
`NetworkController:findNetworkClientIdByChainId` and retrieves client;
use `messagingSystem` API.
>   - Minor whitespace cleanup in `fetchQuotes` call.
> - **Dependencies**:
> - Switch `@metamask/bridge-controller@50.0.0` to a Yarn patch (adds
above changes); update `yarn.lock` accordingly.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
87b3583. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

---------

Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants