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: Settings page, User agreement, Chat UI improvements, Dialogs #179

Merged
merged 26 commits into from
Feb 4, 2025

Conversation

nostrbuddha
Copy link
Contributor

@nostrbuddha nostrbuddha commented Jan 29, 2025

Here is my PR after a long delay!

  • Onboarding: Bisq Agreement screen #149
  • Bisq2 Settings for Mobile #148
    • Functionality is done only for AndroidNode. For xClients have to write WebSocket layer to handle Settings in bisq2.
    • Notification: Only UI is done. As @HenrikJannsen pointed we need to think through for how it will happen in mobile.
    • useAnimastions: Skipped, as it's not needed in mobile.
  • UI Validations Support #154
    • Not completely done.
    • Added validation support in BisqTextField and implemented it in GeneralSettingsPage and TrustedNodeSetupScreen.
    • After @rodvar review, I will implement validation in all fields across app.
  • Dialogs:
    • Seller reputation warning dialog (on offer creation, for user with 0 reputation)
    • TakeOffer: Progress, Success
  • Chat UI Improvements - Current time for new messages, Scroll to quoted message on click.
  • isInterative blocking the whole scaffold's content

PS:
Couldn't test CreateOffer/TakeOffer after rebase and pulling from bisq2 latest

@HenrikJannsen
Copy link
Contributor

WebSocket layer to handle Settings in bisq2.

I think that is already in place.

Seller reputation warning dialog (on offer creation, for user with 0 reputation)

Ignore for now the reputation based limits. It has changed and we will release very soon.

Couldn't test CreateOffer/TakeOffer after rebase and pulling from bisq2 latest

Have you published all libs?

@rodvar rodvar self-assigned this Jan 29, 2025
@rodvar rodvar added this to the MVP (version 0.1.0) milestone Jan 29, 2025
@rodvar
Copy link
Collaborator

rodvar commented Jan 29, 2025

@nostrbuddha I'm using this bisq2 commit from where I generated the jars and I run both the seed and the http-server

  • 30fd801feeca55bd993482b7ad13e1691f1fb976

Copy link
Collaborator

@rodvar rodvar left a comment

Choose a reason for hiding this comment

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

Much expected PR :) - great job @nostrbuddha !

We've got several different features included here, so I'll do the review separately:

First addressing your question on validations, yes the implemented settings example looks great and it would be awesome to use that type of component in all the validations related to the Trading flow. Only comment is that if I change the language the validation stays in the original language (won't auto refresh)

Now:

Android Node

  • all working as described, including the code examples
  • I fixed a small navigation back on the new Dialog (please review 🙏 )
  • Re the agreement, is working great even if the user has already done the onboarding.
  • i18n change applies immediately in the settings screen and works nice. Some issues are: the combo box shouldn't show languages we don't have i18n for
  • minor UI issues on the settings screens (spacing, looks too compressed. This can be left for polishing)

** xClients **

  • Settings: Henrik commented he believes the settings APIs are there, could you please check to see if we can merge this complete?
  • i18n: it would be necessary to completely remove all the lyricist stuff and apply the new i18n everywhere. Do you think we could do that in this PR?

Regarding the stuff that is incomplete (xClients settings & i18n application):

  • i18n Applications #150 -> shall we do it in this PR? Otherwise let's remove all options but english from the combo box to not give false expectations in the settings.
  • xClients settings, would you like to finish this in this PR ?

Please let me know and we'll move from there 🙏
The idea behind it is to merge working complete things ideally or at least be very conscious on what we merge that we commit to finish soon or if not leave a coherent implementation (no confusing functionality)
Cheers!

@nostrbuddha
Copy link
Contributor Author

  • I think I didn't look into Settings WS API, after the pull in bisq2. Probably looked at old code.
    Anyways I will check with it and complete Settings WS API for xClients.

  • Regarding lyricist -> i18n conversion, I prefer doing it over a weekend in a day, when no one else is working. So we can avoid merge conflicts across all screens. Makes sense? For now, I can comment all language, but English.

@rodvar
Copy link
Collaborator

rodvar commented Jan 30, 2025

  • I think I didn't look into Settings WS API, after the pull in bisq2. Probably looked at old code.
    Anyways I will check with it and complete Settings WS API for xClients.
  • Regarding lyricist -> i18n conversion, I prefer doing it over a weekend in a day, when no one else is working. So we can avoid merge conflicts across all screens. Makes sense? For now, I can comment all language, but English.

makes sense buddha, I'll wait for your next update then to do a 2nd pass!

@rodvar
Copy link
Collaborator

rodvar commented Jan 30, 2025

One more comment for the bisq settings @nostrbuddha , the "use animations" toggle would be useful actually because we have the avatar animation and also some default KMP animations we could disable if the user un-toggle the it (we could default to true).

@rodvar
Copy link
Collaborator

rodvar commented Feb 4, 2025

Buddha needed to add a bisq2 WS API to accomplish the bisq2 settings for the profile, so in order to test bisq2 http-api project instance needs to be used from here -> https://github.com/nostrbuddha/bisq2/tree/lang_ws

Copy link
Collaborator

@rodvar rodvar left a comment

Choose a reason for hiding this comment

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

All the "General Settings" stuff needs more work. We agreed with @nostrbuddha to comment that out for now until it gets fixed and merge this PR since the rest is working nicely.

Also since now we are doing fully fledged features instead of just UI PRs let's try to do PRs that target only one feature at the time (can send multiple at the time if you will)

Thanks! 🙏

@rodvar rodvar merged commit e882513 into bisq-network:main Feb 4, 2025
1 check passed
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