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

feat: simplified collect screen #691

Merged
merged 12 commits into from
Oct 3, 2023

Conversation

efstajas
Copy link
Contributor

@efstajas efstajas commented Sep 26, 2023

Most users will only be collecting split income (from Drip Lists and Projects), so this aims to simplify their collect screen by hiding most streaming-related stuff.

  • Completely hides streaming-related balances if they're zero
  • Hides squeezing if they're zero
  • Greatly simplifies language around collectable balances — no more "cycle", no more "splittable", etc.… just "settlement once per week".

Also:

  • Fix for AnnotationBox having a wonky layout if actions slot is empty (cc @evvvritt)

Someone who is collecting income from Drip Lists / Projects & also has some stream income now sees the screen like this:

Screenshot 2023-10-02 at 17 14 30

@efstajas efstajas requested a review from evvvritt September 26, 2023 12:27
@netlify
Copy link

netlify bot commented Sep 26, 2023

Deploy Preview for drips-app-v2 ready!

Name Link
🔨 Latest commit
🔍 Latest deploy log https://app.netlify.com/sites/drips-app-v2/deploys/651c166cdd7bbb273fb654b0
😎 Deploy Preview https://deploy-preview-691--drips-app-v2.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@evvvritt
Copy link
Collaborator

Looks good except I'd remove the "+" next to the earned amount in this simplified version. (Perhaps other contexts it still makes sense?)

Copy link
Collaborator

@evvvritt evvvritt left a comment

Choose a reason for hiding this comment

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

(remove the "+" next to the Earned amount in the simplified version)

@efstajas
Copy link
Contributor Author

Looks good except I'd remove the "+" next to the earned amount in this simplified version. (Perhaps other contexts it still makes sense?)

good point, one sec!

@efstajas efstajas requested a review from evvvritt September 26, 2023 12:38
@brandonhaslegs
Copy link
Collaborator

brandonhaslegs commented Sep 27, 2023

  • Should "Streams" be capitalized like Projects and Drip Lists?
  • Instead of "on a weekly cycle" use "on a weekly basis"
  • Can you actually only collect on a weekly cycle? Like if you miss the date, you have to wait another week to collect? Or is money added on a weekly cycle but you can collect at any time (after the first cycle)? Should make that more clear.
  • Is there a situation where the two amounts in the two rows would be different?
  • In the first row, will the text "From Project or Drip Lists" change if funds have also come from Streams?

@evvvritt evvvritt merged commit 15694ed into main Oct 3, 2023
9 checks passed
@evvvritt evvvritt deleted the jason/hide-splitting-percent-in-collect-flow branch October 3, 2023 13:33
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.

3 participants