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: add SchedulerConfirmationModal component for starting scheduled sweep #803

Merged
merged 4 commits into from
Aug 20, 2024
Merged

feat: add SchedulerConfirmationModal component for starting scheduled sweep #803

merged 4 commits into from
Aug 20, 2024

Conversation

0xSaksham
Copy link
Contributor

@0xSaksham 0xSaksham commented Jul 23, 2024 •
edited
Loading

This PR completes #796

Made a Confirmation Modal that starts the scheduler only when the user confirms it.

image

@0xSaksham 0xSaksham linked an issue Jul 23, 2024 that may be closed by this pull request
(ui) Confirmation Modal before starting #796
Closed
@0xSaksham 0xSaksham self-assigned this Jul 25, 2024
editwentyone
editwentyone requested changes Jul 29, 2024
View reviewed changes
Copy link

@editwentyone editwentyone left a comment

Choose a reason for hiding this comment

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

it would be nice to style this modal like the modals on "send" (jar selection, confirm, cancel)

  • vertically centered
  • different styling

@0xSaksham
Copy link
Contributor Author

0xSaksham commented Jul 29, 2024 •
edited
Loading

  • Make it vertically centered

@0xSaksham
Copy link
Contributor Author

it would be nice to style this modal like the modals on "send" (jar selection, confirm, cancel)

  • different styling

Let me know what you think of it in tomorrow's meeting. I would love some design help.

@0xSaksham
Copy link
Contributor Author

  • Make it vertically centered

image

Done, and also implemented design changes to make it look consistent.

@0xSaksham 0xSaksham requested a review from editwentyone July 29, 2024 13:10
editwentyone
editwentyone previously approved these changes Aug 4, 2024
View reviewed changes
@theborakompanioni
Copy link
Collaborator

Hey @0xSaksham - as discussed, would you be able to use ConfirmModal for that? I think we can save a lot of the custom stylings and reuse existing components (e.g. automatically have @editwentyone proposal to "vertically center" the content). Okay for you?

@0xSaksham
Copy link
Contributor Author

0xSaksham commented Aug 6, 2024 •
edited
Loading

@theborakompanioni that works for me.

The DRY principle should be followed whenever possible.

@0xSaksham
Copy link
Contributor Author

This is how it looks now.
image

@0xSaksham 0xSaksham requested a review from editwentyone August 8, 2024 08:00
@0xSaksham
Copy link
Contributor Author

0xSaksham commented Aug 17, 2024 •
edited
Loading

Hey @theborakompanioni and @editwentyone , I personally feel that

This is okay!

but this looks better

@0xSaksham 0xSaksham mentioned this pull request Aug 17, 2024
Open
3 tasks
@editwentyone
Copy link

@0xSaksham I can't see the pictures

@0xSaksham
Copy link
Contributor Author

@0xSaksham I can't see the pictures

Is it visible now?

@0xSaksham 0xSaksham merged commit 5534779 into devel Aug 20, 2024
@0xSaksham 0xSaksham deleted the 796-ui-confirmation-modal-before-starting branch August 20, 2024 06:34
@0xSaksham 0xSaksham restored the 796-ui-confirmation-modal-before-starting branch August 20, 2024 06:44
@theborakompanioni theborakompanioni mentioned this pull request Aug 20, 2024
Closed
0xSaksham added a commit that referenced this pull request Aug 21, 2024
@0xSaksham @amitx13 @theborakompanioni
Updating #812 branch (#819)
48f7095 
* fix: amount input field to properly interpret BTC (#800)

* feat: add SchedulerConfirmationModal component for starting scheduled sweep (#803)

* feat: add SchedulerConfirmationModal component for starting scheduled sweep

* removed dead code

* modal is centered and design changes

* used ConfirmModal and pre-written styles

* refactor: SchedulerConfirmationModal.tsx

minor production error

* build(deps): update dependencies (#813)

 @emotion/react          ^11.11.4  →  ^11.13.0
 @types/react             ^18.3.2  →   ^18.3.3
 formik                    ^2.4.5  →    ^2.4.6
 qrcode                    ^1.5.3  →    ^1.5.4
 react-bootstrap           ^2.9.2  →   ^2.10.4
 react-router-bootstrap   ^0.26.2  →   ^0.26.3
 react-router-dom         ^6.23.1  →   ^6.26.1
 husky            ^8.0.3  →    ^9.1.4
 i18next        ^23.11.4  →  ^23.13.0
 lint-staged     ^14.0.1  →   ^15.2.9
 prettier         ^3.2.5  →    ^3.3.3
 react-i18next   ^14.1.1  →   ^15.0.1

* refactor: align utxo list and modal components (#815)

* refactor: externalize UtxoIcon component and utxoTags function

* refactor: externalize UtxoConfirmations component

* refactor: reuse utxo icons in Jar details and UTXO list

* refactor(ui): simpler checkbox in utxo list

* refactor(send): vertically align balance

* refactor(send): tooltip for shortened addresses

* refactor(ui): externalize UtxoTags component

* ui(send): show considered UTXOs before performing transaction (#807)

---------

Co-authored-by: apX13_ <[email protected]>
Co-authored-by: Thebora Kompanioni <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@editwentyone editwentyone editwentyone approved these changes

@theborakompanioni theborakompanioni Awaiting requested review from theborakompanioni

@barrytra barrytra Awaiting requested review from barrytra

@amitx13 amitx13 Awaiting requested review from amitx13

Assignees

@0xSaksham 0xSaksham

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

(ui) Confirmation Modal before starting
3 participants
@0xSaksham @theborakompanioni @editwentyone