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.

Sign up for GitHub

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

Jump to bottom

STX Timer bug cherrypick 12.3 #26935

Merged
merged 1 commit into from
Sep 17, 2024
Merged

STX Timer bug cherrypick 12.3 #26935

merged 1 commit into from
Sep 17, 2024

Conversation

martahj
Copy link
Contributor

@martahj martahj commented Sep 5, 2024 •
edited
Loading

Description

This PR fixes an issue where the STX status screen for a swap was showing a 0:00 for the timer. It is a cherrypick of #25779 into v12.3.

Open in GitHub Codespaces

Related issues

Related to: #25063

Manual testing steps

  1. Make sure Smart Transactions is on (Settings > Advanced)
  2. Do a Swap
  3. Observe that timer is not 0:00 and is a reasonable number

Screenshots/Recordings

Before

Screen.Recording.2024-07-10.at.2.41.53.PM.mov

After

Screen.Recording.2024-07-11.at.1.28.53.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.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

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.

@martahj martahj changed the base branch from develop to Version-v12.3.0 September 5, 2024 12:51
davibroc
davibroc previously approved these changes Sep 5, 2024
View reviewed changes
Copy link
Contributor

@davibroc davibroc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have tested it and it works

@martahj
Copy link
Contributor Author

martahj commented Sep 5, 2024

I'm putting this PR into review despite the two CI failures. I believe they are not introduced by this PR for the following reasons:

  • The E2E test about the BTC snap is also failing on other PRs such as this one
  • The dependency audit failure cannot have been caused by this PR because this PR does not make any dependency updates

@martahj martahj marked this pull request as ready for review September 5, 2024 13:39
@martahj martahj requested review from a team as code owners September 5, 2024 13:39
infiniteflower
infiniteflower previously approved these changes Sep 6, 2024
View reviewed changes
Copy link
Contributor

@infiniteflower infiniteflower left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Screenshot 2024-09-06 at 11 56 27 AM

@danjm danjm deleted the branch Version-v12.3.0 September 6, 2024 18:35
@danjm danjm closed this Sep 6, 2024
@martahj martahj reopened this Sep 9, 2024
@martahj martahj dismissed infiniteflower’s stale review September 9, 2024 13:11

The merge-base changed after approval.

@martahj martahj marked this pull request as draft September 9, 2024 13:11
@infiniteflower @martahj
fix: missing deadline in swaps stx status screen (#25779)
5d18259 
<!--
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.
-->

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

This PR fixes an issue where the STX status screen for a swap was
showing a 0:00 for the timer.

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

Related to: #25063

1. Make sure Smart Transactions is on (Settings > Advanced)
2. Do a Swap
3. Observe that timer is not 0:00 and is a reasonable number

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

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

https://github.com/MetaMask/metamask-extension/assets/139582705/26fe6167-614f-4771-b35b-10803bc23fc0

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

https://github.com/MetaMask/metamask-extension/assets/139582705/d92b933d-1011-48b4-bf04-344f275d35db

- [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/develop/.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/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

- [ ] 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.

---------

Co-authored-by: Marta Poling <[email protected]>
@martahj martahj marked this pull request as ready for review September 17, 2024 14:51
@metamaskbot metamaskbot added the release-12.3.0 Issue or pull request that will be included in release 12.3.0 label Sep 17, 2024
@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-12.3.0 on PR, as PR was added to branch 12.3.0 when release was cut.

4 similar comments
@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-12.3.0 on PR, as PR was added to branch 12.3.0 when release was cut.

@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-12.3.0 on PR, as PR was added to branch 12.3.0 when release was cut.

@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-12.3.0 on PR, as PR was added to branch 12.3.0 when release was cut.

@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-12.3.0 on PR, as PR was added to branch 12.3.0 when release was cut.

@martahj martahj merged commit 0713e46 into Version-v12.3.0 Sep 17, 2024
70 of 72 checks passed
@martahj martahj deleted the 12.3.0-timer-bug branch September 17, 2024 18:56
@github-actions github-actions bot locked and limited conversation to collaborators Sep 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ejwessel ejwessel ejwessel approved these changes

@jclancy93 jclancy93 jclancy93 approved these changes

@davibroc davibroc davibroc left review comments

@infiniteflower infiniteflower infiniteflower left review comments

Assignees
No one assigned
Labels
release-12.3.0 Issue or pull request that will be included in release 12.3.0 team-swaps
Projects
PR review queue
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@martahj @metamaskbot @ejwessel @davibroc @jclancy93 @infiniteflower @danjm