Skip to content

fix: STAKE-946: fix inconsistent pooled staking reward rate#13594

Merged
Matt561 merged 11 commits into
mainfrom
fix/stake-946-fix-inconsistent-pooled-staking-reward-rate
Feb 19, 2025
Merged

fix: STAKE-946: fix inconsistent pooled staking reward rate#13594
Matt561 merged 11 commits into
mainfrom
fix/stake-946-fix-inconsistent-pooled-staking-reward-rate

Conversation

@Matt561

@Matt561 Matt561 commented Feb 18, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Fixed inconsistent APR value displayed throughout the application. Also fixed the annual rate tooltip not displaying the historic APY graph.

Related issues

Fixes: STAKE-946: [FE] Fix inconsistent pooled-staking vault APR

Manual testing steps

The pooled-staking APR is displayed in the following place:

ETH Asset Details

  • CTA for users that have never staked before contains APR.
  • Annual rate for those that have staked.
  • APR is displayed as the "weekly average APR" in the historic APR graph when clicking on the annual rate tooltip.

Staking Input View

  • APR is displayed above the quick amount buttons when user hasn't entered a value yet.
  • APR is displayed as the "weekly average APR" in the historic APR graph when clicking on the tooltip.

Stake Confirmation View

  • The reward rate/annual rate displays the APR.

Screenshots/Recordings

Before

image
image

After

stake-946-fix-inconsistent-apys.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 Bot commented Feb 18, 2025

Copy link
Copy Markdown
Contributor

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.

@Matt561 Matt561 changed the base branch from main to release/7.41.0 February 18, 2025 20:45
@nickewansmith nickewansmith added android Android specific issue iOS release-blocker This bug is blocking the next release release-7.41.0 Issue or pull request that will be included in release 7.41.0 team-stake-deprecated DEPRECATED: please use "team-earn" instead Sev2-normal An issue that may lead to users misunderstanding some limited risks they are taking labels Feb 18, 2025
@MarioAslau MarioAslau marked this pull request as ready for review February 18, 2025 21:45
@MarioAslau MarioAslau requested a review from a team as a code owner February 18, 2025 21:45
MarioAslau
MarioAslau previously approved these changes Feb 18, 2025
View reviewed changes
@Matt561

Matt561 commented Feb 18, 2025

Copy link
Copy Markdown
Contributor Author

This isn't ready to review @MarioAslau

@nickewansmith nickewansmith marked this pull request as draft February 18, 2025 22:07
@Matt561 Matt561 force-pushed the fix/stake-946-fix-inconsistent-pooled-staking-reward-rate branch from 1aa2003 to f2a2007 Compare February 18, 2025 22:24
@Matt561 Matt561 changed the base branch from release/7.41.0 to main February 18, 2025 22:24
@Matt561 Matt561 dismissed MarioAslau’s stale review February 18, 2025 22:24

The base branch was changed.

@Matt561

Matt561 commented Feb 18, 2025

Copy link
Copy Markdown
Contributor Author

@MarioAslau This should be ready for review assuming all tests pass. 👍

@Matt561 Matt561 marked this pull request as ready for review February 18, 2025 22:49
@Matt561 Matt561 requested a review from a team as a code owner February 18, 2025 22:49
@github-actions

github-actions Bot commented Feb 18, 2025 •
edited by metamaskbot
Loading

Copy link
Copy Markdown
Contributor

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: ce06ad1
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/8fc6650a-5a5b-4c52-ac38-9f6875f56e84

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Tip

  • Check the documentation if you have any doubts on how to understand the failure on bitrise

MarioAslau
MarioAslau previously approved these changes Feb 18, 2025
View reviewed changes
@Matt561

Matt561 commented Feb 19, 2025

Copy link
Copy Markdown
Contributor Author

@MarioAslau Currently debugging the failing e2e tests. Please don't merge if approved.

cc: @amitabh94 @nickewansmith

salimtb
salimtb previously approved these changes Feb 19, 2025
View reviewed changes

@salimtb salimtb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

assets changes LGTM

@Matt561 Matt561 changed the title fix: STAKE-946: fix inconsistent pooled staking reward rate fix: DO NOT MERGE - STAKE-946: fix inconsistent pooled staking reward rate Feb 19, 2025
@Matt561 Matt561 dismissed stale reviews from salimtb and MarioAslau via 5979355 February 19, 2025 17:02
@Matt561 Matt561 requested a review from a team as a code owner February 19, 2025 17:02
@github-actions

github-actions Bot commented Feb 19, 2025 •
edited by metamaskbot
Loading

Copy link
Copy Markdown
Contributor

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 5979355
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/4d9510ab-b45d-42f1-9f44-4a60b46ed533

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Tip

  • Check the documentation if you have any doubts on how to understand the failure on bitrise

nickewansmith
nickewansmith approved these changes Feb 19, 2025
View reviewed changes

@nickewansmith nickewansmith left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Tests well and LGTM

@Matt561 Matt561 changed the title fix: DO NOT MERGE - STAKE-946: fix inconsistent pooled staking reward rate fix: STAKE-946: fix inconsistent pooled staking reward rate Feb 19, 2025
@github-actions

github-actions Bot commented Feb 19, 2025 •
edited by metamaskbot
Loading

Copy link
Copy Markdown
Contributor

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 1b28c60
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/c1b56a42-1ba4-476c-bc12-4f45ea7d176f

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Tip

  • Check the documentation if you have any doubts on how to understand the failure on bitrise

@sonarqubecloud

sonarqubecloud Bot commented Feb 19, 2025

Copy link
Copy Markdown

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
81.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@Matt561 Matt561 mentioned this pull request Feb 19, 2025
Merged
7 tasks
@Matt561 Matt561 added this pull request to the merge queue Feb 19, 2025
Merged via the queue into main with commit e3c59ba Feb 19, 2025
@Matt561 Matt561 deleted the fix/stake-946-fix-inconsistent-pooled-staking-reward-rate branch February 19, 2025 19:33
@github-actions github-actions Bot locked and limited conversation to collaborators Feb 19, 2025
@metamaskbot metamaskbot added the release-7.42.0 Issue or pull request that will be included in release 7.42.0 label Feb 19, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@MarioAslau MarioAslau MarioAslau approved these changes

@salimtb salimtb salimtb approved these changes

+1 more reviewer

@nickewansmith nickewansmith nickewansmith approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

android Android specific issue iOS release-7.41.0 Issue or pull request that will be included in release 7.41.0 release-7.42.0 Issue or pull request that will be included in release 7.42.0 release-blocker This bug is blocking the next release Sev2-normal An issue that may lead to users misunderstanding some limited risks they are taking team-stake-deprecated DEPRECATED: please use "team-earn" instead

Projects

PR review queue
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Matt561 @nickewansmith @MarioAslau @salimtb @metamaskbot