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

cherrypick fix: xchain linea bugs (#29409) #29511

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

infiniteflower
Copy link
Contributor

@infiniteflower infiniteflower commented Jan 8, 2025

Description

Open in GitHub Codespaces

This PR cherry picks 481505f into 12.10.0 RC.

This fixes the bug: #29591

This PR fixes a couple of issues and does the following:

  1. Shows a loading spinner on the Bridge button after submitting
  2. Does not wait 5 sec to submit a bridge tx on Linea if there is no approval tx

Related issues

Fixes:

Manual testing steps

Gas token

  1. Start a bridge from Linea to any chain for ETH
  2. Observe that you are redirected to Activity page almost instantly

ERC20

  1. Start a bridge from Linea to any chain for an ERC20
  2. Observe that a loading spinner shows on the button
  3. Observe you are redirected to Activity page after 5 sec

Screenshots/Recordings

Before

After

Screen.Recording.2024-12-20.at.4.08.00.PM.mov
Screen.Recording.2024-12-20.at.4.08.39.PM.mov

Pre-merge author checklist

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.

Description

Open in GitHub Codespaces

Related issues

Fixes:

Manual testing steps

  1. Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

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.

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

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

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29409?quickstart=1)

This PR fixes a couple of issues and does the following:

1. Shows a loading spinner on the Bridge button after submitting
2. Does not wait 5 sec to submit a bridge tx on Linea if there is no
approval tx

## **Related issues**

Fixes:

## **Manual testing steps**

Gas token

1. Start a bridge from Linea to any chain for ETH
3. Observe that you are redirected to Activity page almost instantly

ERC20
1. Start a bridge from Linea to any chain for an ERC20
2. Observe that a loading spinner shows on the button
4. Observe you are redirected to Activity page after 5 sec


## **Screenshots/Recordings**

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

### **Before**

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

### **After**

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


https://github.com/user-attachments/assets/24445f52-ddaf-4d08-b3ce-755c10b3f976



https://github.com/user-attachments/assets/ae93204d-80f6-4beb-aff5-b8274e4541e7




## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] 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
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/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.
Copy link
Contributor

github-actions bot commented Jan 8, 2025

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.

@infiniteflower infiniteflower marked this pull request as ready for review January 8, 2025 15:55
@infiniteflower infiniteflower requested a review from a team as a code owner January 8, 2025 15:55
@infiniteflower infiniteflower changed the title fix: xchain linea bugs (#29409) cherrypick fix: xchain linea bugs (#29409) Jan 8, 2025
@metamaskbot
Copy link
Collaborator

Builds ready [4617582]
Page Load Metrics (1885 ± 75 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint29821921732492236
domContentLoaded15312176184215775
load15412198188515775
domInteractive26128573015
backgroundConnect890432813
firstReactRender1678402311
getState56116126
initialActions01000
loadScripts11471658138214469
setupStore760232110
uiStartup17682506213317885
Bundle size diffs [🚨 Warning! Bundle size has increased!]
  • background: 2.04 KiB (0.04%)
  • ui: -879 Bytes (-0.01%)
  • common: 646 Bytes (0.01%)

@dbrans dbrans self-assigned this Jan 8, 2025
@dbrans
Copy link
Contributor

dbrans commented Jan 8, 2025

@danjm – This diff matches the cherry-picked commit diff. Diff is small and change appears low-risk.

@dbrans dbrans merged commit b5f4ce1 into Version-v12.10.0 Jan 9, 2025
75 checks passed
@dbrans dbrans deleted the cherrypick/12.10.0-xchain-linea branch January 9, 2025 20:36
@github-actions github-actions bot locked and limited conversation to collaborators Jan 9, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants