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

Fixes alignments and RTL layout in Amount.tsx #1815

Merged

Conversation

myxmaster
Copy link
Contributor

Description

This fixes #1774.

  • fixed alignment of several elements (pending icon, sats, FIAT icon, BTC icon)
  • fixed slightly cut off BTC icon
  • removed empty space in Clock.svg

Before:
before_sats
before_BTC
before_FIAT

After:
after_sats
after_BTC
after_FIAT

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):

  • Embedded LND
  • LND (REST)
  • LND (Lightning Node Connect)
  • Core Lightning (c-lightning-REST)
  • LndHub
  • [DEPRECATED] Core Lightning (Spark)
  • [DEPRECATED] Eclair

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

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.

Simulator Screenshot - iPhone 14 Plus - 2023-11-02 at 20 22 41
I can observe some alignment issues with the clock icon here.

@myxmaster
Copy link
Contributor Author

Are you testing with the new font? I need to adjust lineHeight for the new font (or no adjustment needed anymore)...

@myxmaster myxmaster force-pushed the alignment_improvements_in_amount_component branch from 115433b to 8c1348f Compare November 10, 2023 12:17
@myxmaster
Copy link
Contributor Author

Done, can you please check again? @shubhamkmr04

@shubhamkmr04
Copy link
Contributor

I just remembered about this PR; sure, I'll have a look again.

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.

Screenshot_1699625969
I think the Clock Icon is close to the currency icon on the right side of the amount.

@myxmaster myxmaster force-pushed the alignment_improvements_in_amount_component branch from 8c1348f to 8fa94a7 Compare November 10, 2023 15:08
@myxmaster
Copy link
Contributor Author

myxmaster commented Nov 10, 2023

Good catch, I didn't know some currencies put the symbol on the right. Fixed by using marginHorizontal again instead of marginRight.

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

@kaloudis kaloudis merged commit f0f050e into ZeusLN:master Nov 12, 2023
3 checks passed
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.

Balance view: "pending" icon should be centered vertically
3 participants