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

Add popup while synchronizing at fee payment #5801

Closed
wants to merge 2 commits into from

Conversation

sneznaj
Copy link

@sneznaj sneznaj commented Nov 3, 2021

Add popup while synchronizing at fee payment

While synchronizing the wallet the amount of BSQ is zero.
The resulting popup at fee payment did not show this reason.

closes #5522

Add popup while synchronizing at fee payment

While synchronizing the wallet the amount of BSQ is zero.
The resulting popup at fee payment did not show this reason.

closes bisq-network#5522
@ripcurlx
Copy link
Contributor

ripcurlx commented Nov 10, 2021

@sneznaj Thanks for cleaning up the Git history. As lots of PRs got merged yesterday I can review your PR now in more detail. Could you please resolve the conflicts you see above and rebase your PR on master again git pull --rebase origin master. Thanks!

@alkum
Copy link
Contributor

alkum commented Jan 29, 2022

@sneznaj any update? A rebase on master should be straightforward.

@sneznaj
Copy link
Author

sneznaj commented Jan 31, 2022

@sneznaj any update? A rebase on master should be straightforward.

Well, I didnt understand how to rebase on master here.

@alkum
Copy link
Contributor

alkum commented Jan 31, 2022

Did you try @ripcurlx 's suggestion above?

git pull --rebase origin master

@sneznaj
Copy link
Author

sneznaj commented Feb 1, 2022

ok i cd into the git repo and executed the command

@stale
Copy link

stale bot commented Apr 16, 2022

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the was:dropped label Apr 16, 2022
@stale
Copy link

stale bot commented Apr 28, 2022

This issue has been automatically closed because of inactivity. Feel free to reopen it if you think it is still relevant.

@stale stale bot closed this Apr 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Trade Step 1: If BSQ chosen for trade fees while "Synchronizing DAO", show correct warning popup
3 participants