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

Improve layout of receive/sending lightning/sending on-chain screens #1522

Merged
merged 1 commit into from
Nov 12, 2023

Conversation

myxmaster
Copy link
Contributor

@myxmaster myxmaster commented Jun 27, 2023

Description

This fixes #1484.

grafik
grafik
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

const { size } = props;
const randomNumber = Math.ceil(Math.random() * 3) - 1;

return (
<View
style={{
position: 'absolute',
alignSelf: 'center',
top: -220,
Copy link
Contributor

Choose a reason for hiding this comment

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

not crazy about fixes that include adding negative margins

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Improved this in latest commit.

@kaloudis
Copy link
Contributor

What do these pages look like at higher resolution, say on a tablet?

@myxmaster
Copy link
Contributor Author

I checked it on a 10" tablet and it didn't look good, so I fixed the size to make it look the same on all devices.

Tablet screenshots:

1
2

@kaloudis
Copy link
Contributor

kaloudis commented Jul 1, 2023

I don't think this is enough of an improvement. I'd like to do a refactor where the action buttons hang to the bottom of the screen and the logo and animations are scaled and spaced out depending on the size of the screen

@myxmaster
Copy link
Contributor Author

I do like the idea, but then it would be inconsistent.

grafik

@kaloudis
Copy link
Contributor

kaloudis commented Jul 2, 2023

I do like the idea, but then it would be inconsistent.

grafik

Let's make it consistent then!

@myxmaster myxmaster marked this pull request as draft September 27, 2023 21:14
@myxmaster myxmaster force-pushed the improve-send-success-screens branch 3 times, most recently from 5ff4698 to 8dfdfb6 Compare October 31, 2023 22:16
@myxmaster myxmaster changed the title Improved layout of send lightning/on-chain success screens Improve layout of receive/send lightning/on-chain success screens Oct 31, 2023
@myxmaster
Copy link
Contributor Author

Reworked all screens to make them fill the whole screen without the need for scrolling (except long LNURL messages, here you can scroll inside the box) on all devices.

Checked with three devices always in this order:

  1. 10" tablet
  2. 6,7" phone
  3. 5" phone

Because it's so many screenshots I did not create "before" versions.

Screenshots:

Lightning received:

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

Lightning sent successfully:

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

Lightning sent successfully (with LNURL success action):

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

Lightning sent with zaplocker in transit:

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

Sending lightning (while loading):

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

Sending lightning (error):

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

Sending lightning (in transit):

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

On-chain sent successfully:

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

Sending on-chain (loading):

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

Activity payment with LNURL success action:

Device 1:
grafik

Device 2:
grafik

Device 3:
grafik

@myxmaster myxmaster marked this pull request as ready for review October 31, 2023 22:34
@myxmaster myxmaster changed the title Improve layout of receive/send lightning/on-chain success screens Improve layout of receive/sending lightning/sending on-chain screens Oct 31, 2023
@myxmaster
Copy link
Contributor Author

Fixed merge conflicts and replaced old logo also in Receive screen.

grafik
grafik
grafik
grafik
grafik
grafik

@kaloudis kaloudis merged commit 5ede427 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.

Enhancement: Payment successful screen often doesn't fit on screen
2 participants