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

Show Details implemented #811

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

Conversation

0xSaksham
Copy link
Contributor

@0xSaksham 0xSaksham commented Aug 16, 2024

Created a basic funtionality for the show details tab

Current Stage:
image

@0xSaksham 0xSaksham linked an issue Aug 16, 2024 that may be closed by this pull request
3 tasks
@editwentyone
Copy link

editwentyone commented Aug 16, 2024

can you provide me please all the data that can be made visible so I can design something that makes sense for the user?

@0xSaksham
Copy link
Contributor Author

can you provide me please all the data that can be made visible so I can design something that makes sense for the user?

image
@theborakompanioni sir, help us here by telling what more information to be displayed to user.

For the time being. I am just displaying the tx id and type of tx, INTERNAL or EXTERNAL

@0xSaksham
Copy link
Contributor Author

0xSaksham commented Aug 21, 2024

@editwentyone, me and tbk have decided that this is some of the data that we want to display to user:

  • destination id: bc1qxy2kgdygjrsqtzq2n0yrf2493p83kkfjhx0wlh
  • wait time: ~42 mins
  • Jar: A (with SVG icon)
  • State: scheduled/running

Please use this data to make a UI
If you have any more questions. Please let me know.

This is the current state of the scheduler details tab.

@editwentyone
Copy link

@0xSaksham sure, let me clarify first, if I understood correctly:

the user open up the "schedule details" to find this information:

in about this "time", the status is "scheduled or running", the funds will arrive into "Jar A" to this address "destination id: bc1…"?

source:
destination id: bc1qxy2kgdygjrsqtzq2n0yrf2493p83kkfjhx0wlh
wait time: ~42 mins
Jar: A (with SVG icon)
State: scheduled/running

@0xSaksham
Copy link
Contributor Author

in about this "time", the status is "scheduled or running", the funds will arrive into "Jar A" to this address "destination id: bc1…"?

Yes, a small change is that funds will leave from "Jar A" to the address "destination id"

in about this "time", the status is "scheduled or running", the funds will be withdrawn from "Jar A" to this address "destination id: bc1…"?

@editwentyone
Copy link

editwentyone commented Aug 27, 2024

here is my attempt for the scheduler details , let me know what you think guys @theborakompanioni @0xSaksham

https://www.figma.com/design/kfejZJFlwBywvLEnPEmJo1/JoinMarket-UI?node-id=4409-85658&t=qBOp8hvNNS4X47ZX-11

image

@0xSaksham
Copy link
Contributor Author

@theborakompanioni I think it raised some merge conflict to this. Please accept the incoming change to fix it locally.

@editwentyone
Copy link

there is nothing to review yet right?

@theborakompanioni
Copy link
Collaborator

@theborakompanioni I think it raised some merge conflict to this. Please accept the incoming change to fix it locally.

Can you resolve the conflicts yourself? You can always rebase on devel! 🙌

@0xSaksham
Copy link
Contributor Author

Can you resolve the conflicts yourself? You can always rebase on devel! 🙌
Done!

Just duplicate import statements!

.gitignore Show resolved Hide resolved
@theborakompanioni
Copy link
Collaborator

@0xSaksham It seems you have an old prettier dependency. Please keep in mind to always do an npm install when branching off of devel. 😉

@theborakompanioni
Copy link
Collaborator

@0xSaksham Converted to darft as this seems not finished and reviewable. Undraft whenever you feel it is ready for review! 🚀

@theborakompanioni theborakompanioni marked this pull request as draft August 30, 2024 17:31
@@ -382,6 +399,9 @@ export default function Jam({ wallet }: JamProps) {
>
<div className="d-flex justify-content-center align-items-center">{t('scheduler.button_stop')}</div>
</rb.Button>
{currentSchedule.length === 2 || currentSchedule.length === 8 ? (
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't quite understand why it is limited to schedules with certain amounts of entries. Care to elaborate? 🙏

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, currently the scheduler only supports 3 destination addresses, hence currentSchedule.length === 8 and,
currentSchedule === 2 is for the dev mode.

Copy link
Collaborator

Choose a reason for hiding this comment

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

The amount of schedule entries depends also on the distribution of funds in your jars
If you want to make it available exclusively in dev mode, please use isDevMode.

@editwentyone editwentyone added this to the v0.4.0 milestone Oct 31, 2024
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.

(ui) Information of Active Schedule
3 participants