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

Display amount on Receive screen above QR code #1602

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

myxmaster
Copy link
Contributor

Description

This fixes #1600.

Before:
grafik

After:
grafik

This pull request is categorized as a:

  • New feature
  • Bug fix
  • Code refactor
  • Configuration change
  • Locales update
  • Quality assurance
  • Other

Checklist

  • I’ve run yarn run tsc and made sure my code compiles correctly
  • I’ve run yarn run lint and made sure my code didn’t contain any problematic patterns
  • I’ve run yarn run prettier and made sure my code is formatted correctly
  • I’ve run yarn run test and made sure all of the tests pass

Testing

If you modified or added a utility file, did you add new unit tests?

  • No, I’m a fool
  • Yes
  • N/A

I have tested this PR on the following platforms (please specify OS version and phone model/VM):

  • Android
  • iOS

I have tested this PR with the following types of nodes (please specify node version and API version where appropriate):

  • LND (REST)
  • LND (Lightning Node Connect)
  • Core Lightning (c-lightning-REST)
  • Core Lightning (Spark)
  • Eclair
  • LndHub

Locales

  • I’ve added new locale text that requires translations
  • I’m aware that new translations should be made on the Zeus Transfix page and not directly to this repo

Third Party Dependencies and Packages

  • Contributors will need to run yarn after this PR is merged in
  • 3rd party dependencies have been modified:
    • verify that package.json and yarn.lock have been properly updated
    • verify that dependencies are installed for both iOS and Android platforms

Other:

  • Changes were made that require an update to the README
  • Changes were made that require an update to onboarding

@myxmaster
Copy link
Contributor Author

Amount is now hidden if zero for on-chain.
Added converted amount (same logic as in balanace pane):

grafik

Copy link
Contributor

@shubhamkmr04 shubhamkmr04 left a comment

Choose a reason for hiding this comment

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

Can we have satsAmount in QR component as well? as we want to see the amount there as well when we tap QR icon on the Invoice view

@myxmaster
Copy link
Contributor Author

Good idea. Done.

@myxmaster myxmaster marked this pull request as draft October 6, 2023 12:27
@myxmaster myxmaster marked this pull request as ready for review October 8, 2023 13:56
Copy link
Contributor

@shubhamkmr04 shubhamkmr04 left a comment

Choose a reason for hiding this comment

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

tACK

@myxmaster
Copy link
Contributor Author

After talking to @kaloudis this feature should be opt-in.

So, ToDo: make it configurable in settings and disabled by default

@myxmaster myxmaster marked this pull request as draft October 30, 2023 13:25
@kaloudis kaloudis force-pushed the master branch 6 times, most recently from 1c682d4 to 2068ca3 Compare November 2, 2024 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Display the Price with QR Code
2 participants