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

feat: show total tokens in the asset list #8249

Merged
merged 11 commits into from
Mar 28, 2024
Merged

feat: show total tokens in the asset list #8249

merged 11 commits into from
Mar 28, 2024

Conversation

evavirseda
Copy link
Collaborator

@evavirseda evavirseda commented Mar 22, 2024 •
edited
Loading

Summary

Closes #8006 and closes #8229
...

Changelog

- Please write a list of changes

Testing

Platforms

Please select any platforms where your changes have been tested.

  • Desktop
    • MacOS
    • Linux
    • Windows

Instructions

Please describe the specific instructions, configurations, and/or test cases necessary to test and verify that your changes work as intended.

...

Checklist

Please tick the following boxes that are relevant to your changes.

  • I have followed the contribution guidelines for this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or modified tests that prove my changes work as intended
  • I have verified that new and existing unit tests pass locally with my changes
  • I have verified that my latest changes pass CI workflows for testing and linting
  • I have made corresponding changes to the documentation

@evavirseda evavirseda changed the base branch from develop to develop-iota2.0 March 22, 2024 10:50
@evavirseda evavirseda linked an issue Mar 22, 2024 that may be closed by this pull request
[Task]: fix consistency between available mana #8229
Closed
@evavirseda evavirseda requested a review from cpl121 March 26, 2024 11:57
cpl121
cpl121 approved these changes Mar 26, 2024
View reviewed changes
Copy link
Member

@cpl121 cpl121 left a comment

Choose a reason for hiding this comment

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

🚀

@evavirseda evavirseda requested a review from marc2332 March 27, 2024 11:47
begonaalvarezd
begonaalvarezd requested changes Mar 27, 2024
View reviewed changes
Copy link
Member

@begonaalvarezd begonaalvarezd left a comment

Choose a reason for hiding this comment

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

  • base token is being displayed with mana
    image
  • remove the secondary value if the asset has no fiat value
  • in token details popup, simplify the breakdown to be:
    • Total Balance amount
      - Available amount
      - Conditionally Locked amount

@begonaalvarezd begonaalvarezd merged commit 144f1d3 into develop-iota2.0 Mar 28, 2024
3 of 4 checks passed
@begonaalvarezd begonaalvarezd deleted the feat/show-tokens-in-assetlist branch March 28, 2024 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpl121 cpl121 cpl121 approved these changes

@marc2332 marc2332 marc2332 approved these changes

@begonaalvarezd begonaalvarezd begonaalvarezd approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Task]: fix consistency between available mana [Task]: show total tokens in the asset list
4 participants
@evavirseda @begonaalvarezd @marc2332 @cpl121