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

okx frozen balance add #7922

Closed
wants to merge 14 commits into from

Conversation

izzetemredemir
Copy link
Contributor

Closes #7915

I've fixed an issue where frozen balances were not displaying on OKX TR. After implementing the correction, I tested the changes and confirmed that everything is now working correctly.

Please review the changes at your convenience.

@CLAassistant
Copy link

CLAassistant commented May 11, 2024

CLA assistant check
All committers have signed the CLA.

@yabirgb
Copy link
Member

yabirgb commented May 11, 2024

Thanks! Make sure to run the linter with make lint

Co-authored-by: Yábir Benchakhtir <yabirgb@gmail.com>
@yabirgb
Copy link
Member

yabirgb commented May 11, 2024

Also please limit the PR to one commit (you can squash them) and add a changelog entry. Also target bugfixes with your PR

@izzetemredemir izzetemredemir changed the base branch from develop to bugfixes May 11, 2024 11:20
@izzetemredemir
Copy link
Contributor Author

Also please limit the PR to one commit (you can squash them) and add a changelog entry. Also target bugfixes with your PR

Also please limit the PR to one commit (you can squash them) and add a changelog entry. Also target bugfixes with your PR

I think it is okay now can you check again?

@yabirgb
Copy link
Member

yabirgb commented May 11, 2024

@izzetemredemir by changing the branch target only you are bringing commits from develop. You would need to pick only your changes in a branch based on bugfixes. The changes look okey but as I said limit it to a commit. ANd add a changelog entry to docs/changelog.rst

@izzetemredemir
Copy link
Contributor Author

changelog

Can you check changelog update? After that I am going to squash commits

Copy link
Member

@LefterisJP LefterisJP left a comment

Choose a reason for hiding this comment

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

Hey thanks for the PR but you need to rebase your commits on top of bugfixes and not put all of develop with it like you did now.

Do not squash develop commits into yours as this will also not be accepted.

Just don't pull any un-needed commit into develop.

Finally please sign the CLA.

Thank you!

docs/changelog.rst Outdated Show resolved Hide resolved
rotkehlchen/exchanges/okx.py Outdated Show resolved Hide resolved
izzetemredemir and others added 3 commits May 12, 2024 13:35
Co-authored-by: Lefteris Karapetsas <lefteris@refu.co>
Co-authored-by: Lefteris Karapetsas <lefteris@refu.co>
@LefterisJP
Copy link
Member

hey @izzetemredemir this is still pulling develop into bugfixes. If you don't know how to fix this just let me know and I can take over the PR and fix it for you.

@izzetemredemir
Copy link
Contributor Author

I have created a new pull request as a more practical method to resolve the Git errors. Please consider closing this one and reviewing the new one:

Pull Request #7928

Thank you.

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.

Rotki 1.33.0 not displaying cryptocurrency balance on OKX TR
7 participants