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

Show a balance for the Token To, update position of the MM fee, removes a link #20030

Merged
merged 6 commits into from
Jul 14, 2023

Conversation

dan437
Copy link
Contributor

@dan437 dan437 commented Jul 14, 2023

Explanation

  • Shows balance for the Token To
  • Updates position of the MM fee and adds a link to view all quotes
  • Removes a link from the Quote rate

Screenshots

image

Testing

  • On the homepage click on the "Swap" button
  • Select Token From, Token To where you have some balance and amount
  • See a balance for Token To under its symbol, no link in the Quote rate line and a new line with the MM fee info + link to view all quotes

@dan437 dan437 requested a review from a team as a code owner July 14, 2023 12:58
@github-actions
Copy link
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.

@brad-decker
Copy link
Contributor

E2E test failures seem related @dan437

@codecov
Copy link

codecov bot commented Jul 14, 2023

Codecov Report

Merging #20030 (11719ef) into develop (91c8499) will decrease coverage by 0.00%.
The diff coverage is 85.71%.

@@             Coverage Diff             @@
##           develop   #20030      +/-   ##
===========================================
- Coverage    69.47%   69.47%   -0.00%     
===========================================
  Files          988      988              
  Lines        37313    37323      +10     
  Branches      9989     9996       +7     
===========================================
+ Hits         25923    25929       +6     
- Misses       11390    11394       +4     
Impacted Files Coverage Δ
ui/pages/swaps/prepare-swap-page/review-quote.js 73.37% <ø> (ø)
...aps/exchange-rate-display/exchange-rate-display.js 82.50% <66.67%> (-2.79%) ⬇️
.../multichain/network-list-menu/network-list-menu.js 70.18% <100.00%> (+0.53%) ⬆️
...pages/swaps/prepare-swap-page/prepare-swap-page.js 69.38% <100.00%> (+0.29%) ⬆️

... and 2 files with indirect coverage changes

`;
Copy link
Contributor

Choose a reason for hiding this comment

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

This change seems unintentional, and should likely be removed from the PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've updated snapshots and this is what I got. When I run yarn jest --updateSnapshot now, it doesn't give me anything new.

Comment on lines 21 to 26
color: var(--color-primary-default);
}

&__quote-rate--no-link {
cursor: text;
color: var(--color-text-default);
Copy link
Contributor

Choose a reason for hiding this comment

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

Why use SCSS colors versus the color prop on Typography or Box?

Comment on lines +98 to +99
expect(getByText('Includes a 1% MetaMask fee –')).toBeInTheDocument();
expect(getByText('view all quotes')).toBeInTheDocument();
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this constitute a change in our fee or just moving it around?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No change in the fee logic, just making it clearer that our MM fee is included in quotes already.

@dan437 dan437 merged commit 1295474 into MetaMask:develop Jul 14, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Jul 14, 2023
@legobeat
Copy link
Contributor

legobeat commented Jul 14, 2023

@dan437 Looks like merging this start failing unit tests on develop: https://app.circleci.com/pipelines/github/MetaMask/metamask-extension/51289/workflows/9d14840e-b2a0-4a3c-a78c-e1ca03691208/jobs/1488651

Difference in behavior due to dc9801a not being rebased on develop prior to merging.

@dan437 dan437 deleted the swap-updates-3 branch July 24, 2023 11:28
@Gudahtt Gudahtt added the release-10.35.0 Issue or pull request that will be included in release 10.35.0 label Sep 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
release-10.35.0 Issue or pull request that will be included in release 10.35.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants