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

[UI] Make CJ settings more discoverable via MusicBox #12694

Merged

Conversation

SuperJMN
Copy link
Collaborator

Makes CJ settings easier to discover by a "..." menu in the Music Box.

image

image

Fixes #9432

Copy link
Collaborator

@MarnixCroes MarnixCroes left a comment

Choose a reason for hiding this comment

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

SuperJMN and others added 2 commits March 20, 2024 16:39
Co-authored-by: Max Hillebrand <30683012+MaxHillebrand@users.noreply.github.com>
@SuperJMN
Copy link
Collaborator Author

Done :)


CoinJoinStateViewModel = new CoinJoinStateViewModel(uiContext, WalletModel);
CoinJoinStateViewModel = new CoinJoinStateViewModel(uiContext, WalletModel, coinJoinSettingsCommand);
Copy link
Collaborator Author

@SuperJMN SuperJMN Mar 20, 2024

Choose a reason for hiding this comment

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

I'm not particularly proud of this line, but I felt I needed to reuse the original command to avoid having a dependency on WalletSettingsViewModel just to set the correct SelectedTab number.

@ichthus1604 can you think of a better way?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@SuperJMN Looks like you can remove the command completely from WalletViewModel, and keep it in CoinJoinStateViewModel.

It's not being used in XAML other than the MusicBox, and the only place where WalletViewModel references it is line 240, which could be replaced by CoinJoinStateViewModel.CoinJoinSettingsCommand.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

OK, I had to add a dependency on WalletSettingsViewModel to do that. Please check :)

yahiheb
yahiheb previously approved these changes Mar 20, 2024
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

Copy link
Collaborator

@MarnixCroes MarnixCroes left a comment

Choose a reason for hiding this comment

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

it's not working correcly for watch-only wallets: Wallet Settings are greyed out and not clickable/accessable

@SuperJMN
Copy link
Collaborator Author

SuperJMN commented Mar 21, 2024

it's not working correcly for watch-only wallets: Wallet Settings are greyed out and not clickable/accessable

Thanks for the catch! It should be fixed now.

Copy link
Collaborator

@ichthus1604 ichthus1604 left a comment

Choose a reason for hiding this comment

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

tACK.

@ichthus1604 ichthus1604 merged commit e571223 into zkSNACKs:master Mar 22, 2024
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[VDG] Make coinjoin settings less hidden
5 participants