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

[VDG] [Fluent] Allow Coinjoins to be expanded in the TreeDataGrid #7510

Merged
merged 22 commits into from Apr 4, 2022
Merged

[VDG] [Fluent] Allow Coinjoins to be expanded in the TreeDataGrid #7510

merged 22 commits into from Apr 4, 2022

Conversation

wieslawsoltes
Copy link
Collaborator

No description provided.

@pull-request-size pull-request-size bot added size/M and removed size/XS labels Mar 9, 2022
MaxHillebrand
MaxHillebrand reviewed Mar 10, 2022
View reviewed changes
Copy link
Member

@MaxHillebrand MaxHillebrand left a comment

Choose a reason for hiding this comment

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

tested 4f1bdf6

expand and collaps works well. cj tx details works.

When expanded, the included coinjoin has a tx icon, not the shield icon.

awesome work, this is really promissing!

@pull-request-size pull-request-size bot added size/L and removed size/M labels Mar 10, 2022
@yahiheb
Copy link
Collaborator

yahiheb commented Mar 15, 2022

Tested. This looks good.

One thing I noticed that can maybe improve is that if you have only one coinjoin tx then there is no need to expand it.

@wieslawsoltes
Copy link
Collaborator Author

One thing I noticed that can maybe improve is that if you have only one coinjoin tx then there is no need to expand it.

Will look into that. Should be possibile.

@wieslawsoltes
Copy link
Collaborator Author

When expanded, the included coinjoin has a tx icon, not the shield icon.

@MaxHillebrand fixed icon

@wieslawsoltes
Copy link
Collaborator Author

Tested. This looks good.

One thing I noticed that can maybe improve is that if you have only one coinjoin tx then there is no need to expand it.

@yahiheb added check and now only if more then one transaction is present expander is visible

@wieslawsoltes wieslawsoltes marked this pull request as ready for review March 20, 2022 19:50
yahiheb
yahiheb previously approved these changes Mar 20, 2022
View reviewed changes
Copy link
Collaborator

@yahiheb yahiheb left a comment

Choose a reason for hiding this comment

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

tACK

...etWasabi.Fluent/ViewModels/Wallets/Home/History/HistoryItems/CoinJoinHistoryItemViewModel.cs Outdated Show resolved Hide resolved
@MaxHillebrand
Copy link
Member

works great!
Maybe it can be indented a bit more, it's a weird little amount now. Maybe alternatively make it a different background color?
2022-03-21-084318

@wieslawsoltes
Copy link
Collaborator Author

works great! Maybe it can be indented a bit more, it's a weird little amount now. Maybe alternatively make it a different background color? 2022-03-21-084318

Changed indentation and added different background color.

MaxHillebrand
MaxHillebrand previously approved these changes Mar 22, 2022
View reviewed changes
Copy link
Member

@MaxHillebrand MaxHillebrand left a comment

Choose a reason for hiding this comment

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

tACK 743cc71
2022-03-22-122116

yahiheb
yahiheb previously approved these changes Mar 22, 2022
View reviewed changes
Copy link
Collaborator

@yahiheb yahiheb left a comment

Choose a reason for hiding this comment

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

tACK

@yahiheb yahiheb mentioned this pull request Mar 22, 2022
Merged
yahiheb
yahiheb reviewed Mar 22, 2022
View reviewed changes
...etWasabi.Fluent/ViewModels/Wallets/Home/History/HistoryItems/CoinJoinHistoryItemViewModel.cs
IObservable<Unit> updateTrigger)
: base(orderIndex, transactionSummary)
{
Label = transactionSummary.Label.Take(1).FirstOrDefault();
Copy link
Collaborator

Choose a reason for hiding this comment

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

We might not need this line if #7604 gets accepted.

@wieslawsoltes wieslawsoltes dismissed stale reviews from yahiheb and MaxHillebrand via 8630539 April 4, 2022 09:59
soosr
soosr reviewed Apr 4, 2022
View reviewed changes
Copy link
Collaborator

@soosr soosr left a comment

Choose a reason for hiding this comment

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

nit

WalletWasabi.Fluent/ViewModels/Wallets/Home/History/HistoryItems/HistoryItemViewModelBase.cs Outdated Show resolved Hide resolved
MaxHillebrand
MaxHillebrand approved these changes Apr 4, 2022
View reviewed changes
Copy link
Member

@MaxHillebrand MaxHillebrand left a comment

Choose a reason for hiding this comment

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

tACK 559bae6

soosr
soosr approved these changes Apr 4, 2022
View reviewed changes
Copy link
Collaborator

@soosr soosr left a comment

Choose a reason for hiding this comment

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

LGTM

@soosr soosr merged commit d189d8a into zkSNACKs:master Apr 4, 2022
@wieslawsoltes wieslawsoltes deleted the vdg/ExpandCoinjoinsTreeDataGrid branch April 4, 2022 11:03
@MaxHillebrand
Copy link
Member

There is no change in the mouse icon when hovering over the expand arrow, so it's not obvious that it's click able.

IMG_20220404_132642.jpgIMG_20220404_132603.jpg

@wieslawsoltes
Copy link
Collaborator Author

There is no change in the mouse icon when hovering over the expand arrow, so it's not obvious that it's click able.

IMG_20220404_132642.jpgIMG_20220404_132603.jpg

@MaxHillebrand
#7695

@yahiheb yahiheb mentioned this pull request May 19, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yahiheb yahiheb yahiheb left review comments

@soosr soosr soosr approved these changes

@MaxHillebrand MaxHillebrand MaxHillebrand approved these changes

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@wieslawsoltes @yahiheb @MaxHillebrand @soosr