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

fix: Token Cell Setting and Token Symbol in cell (#23348) #23355

Merged
merged 1 commit into from
Mar 6, 2024

Conversation

vthomas13
Copy link
Contributor

Description

There were no merge conflicts when picking these commits

Fixing an issue where the Preferred Currency setting appeared to be flipped, and a different issue where the token symbol was being shown as USD rather than ETH.

Open in GitHub Codespaces

Related issues

Fixes:

Manual testing steps

  1. Open Extension
  2. Make note of which preferred currency setting is currently on
  3. Verify that if Fiat is toggled on, Fiat appears on top inside the first Token Cell component, and symbols are correct.
  4. Verify that if ETH is toggled on, ETH appears on top inside the first Token Cell Component, and symbols are correct.

Screenshots/Recordings

Before

Fiat Toggled ON:
image image ETH Toggled ON:
image image

After

Fiat Toggled ON:
image image

ETH Toggled ON:
image image

Pre-merge author checklist

  • I’ve followed MetaMask Coding Standards.
  • I've clearly explained what problem this PR is solving and how it is solved.
  • I've linked related issues
  • I've included manual testing steps
  • I've included screenshots/recordings if applicable
  • I’ve included tests if applicable
  • I’ve documented my code using JSDoc format if applicable
  • I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.
  • I’ve properly set the pull request status:
    • In case it's not yet "ready for review", I've set it to "draft".
  • In case it's "ready for review", I've changed it from "draft" to "non-draft".

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

  • I’ve followed MetaMask Coding Standards.
  • I've clearly explained what problem this PR is solving and how it is solved.
  • I've linked related issues
  • I've included manual testing steps
  • I've included screenshots/recordings if applicable
  • I’ve included tests if applicable
  • I’ve documented my code using JSDoc format if applicable
  • I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.
  • I’ve properly set the pull request status:
    • In case it's not yet "ready for review", I've set it to "draft".
    • In case it's "ready for review", I've changed it from "draft" to "non-draft".

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**
Fixing an issue where the Preferred Currency setting appeared to be
flipped, and a different issue where the token symbol was being shown as
USD rather than ETH.
<!--
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/23348?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Open Extension
2. Make note of which preferred currency setting is currently on
3. Verify that if Fiat is toggled on, Fiat appears on top inside the
first Token Cell component, and symbols are correct.
4. Verify that if ETH is toggled on, ETH appears on top inside the first
Token Cell Component, and symbols are correct.

## **Screenshots/Recordings**

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

### **Before**

<!-- [screenshots/recordings] -->
Fiat Toggled ON:
<img width="355" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/10986371/cc165f35-e1f8-4e2c-ac15-5bb123c880b0">
<img width="355" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/10986371/ec054145-c958-4ec7-aa48-30a17c809c7d">
ETH Toggled ON:
<img width="358" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/10986371/2a2fb134-1e1d-4ed6-bacd-2c4e720bd1fa">
<img width="358" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/10986371/1bd4b01f-051e-4d9c-b66f-62a3f1ec920e">

### **After**

<!-- [screenshots/recordings] -->
Fiat Toggled ON:
<img width="355" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/10986371/6e401774-1e2d-4c42-ad23-b3ee614d37bf">
<img width="355" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/10986371/ad06b397-9a5c-4cf3-a356-b6a71fff0b2d">

ETH Toggled ON:
<img width="358" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/10986371/7d220ccf-089e-4f43-84c5-6fcdaf2a6811">
<img width="358" alt="image"
src="https://github.com/MetaMask/metamask-extension/assets/10986371/deb66faf-3288-4819-a41c-99c4e2a4c067">




## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] 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-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **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.
@vthomas13 vthomas13 requested a review from a team as a code owner March 6, 2024 19:42
Copy link
Contributor

github-actions bot commented Mar 6, 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.

@danjm danjm merged commit 8cce696 into Version-v11.11.2 Mar 6, 2024
35 of 46 checks passed
@danjm danjm deleted the Version-v11.11.2-cherry-pick-ca90dde branch March 6, 2024 19:49
@github-actions github-actions bot locked and limited conversation to collaborators Mar 6, 2024
@metamaskbot metamaskbot added the release-11.11.2 Issue or pull request that will be included in release 11.11.2 label Mar 6, 2024
@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-11.11.2 on PR, as PR was cherry-picked in branch 11.11.2.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
release-11.11.2 Issue or pull request that will be included in release 11.11.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants