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

Pat/revamp stacking page #2959

Merged
merged 36 commits into from
Sep 16, 2022
Merged

Pat/revamp stacking page #2959

merged 36 commits into from
Sep 16, 2022

Conversation

nistadev
Copy link
Contributor

Todo: Remove delegated pool placeholders.

Before
image

After
image

paulclindo and others added 28 commits December 22, 2021 01:32
# Conflicts:
#	packages/yoroi-extension/app/containers/wallet/staking/StakingPage.js
#	packages/yoroi-extension/app/i18n/locales/en-US.json
@neuodev
Copy link
Contributor

neuodev commented Aug 11, 2022

@nistadev If this PR is open for review please assign someone else you can convert it to a draft!

@nistadev nistadev requested a review from vsubhuman August 11, 2022 13:34
@nistadev nistadev requested review from neuodev and removed request for vsubhuman and neuodev August 11, 2022 13:34
@nistadev nistadev marked this pull request as draft August 12, 2022 07:37
@neuodev
Copy link
Contributor

neuodev commented Sep 8, 2022

Resolve the conflicts plz @nistadev

@neuodev
Copy link
Contributor

neuodev commented Sep 14, 2022

the extension crashes when navigating to the staking page while the wallet is still checking, plz fix it @nistadev.

@nistadev nistadev requested a review from neuodev September 14, 2022 23:10
@nistadev nistadev marked this pull request as ready for review September 14, 2022 23:10
@nistadev
Copy link
Contributor Author

I resolved the conflicts and fixed the flow issues. Can you review again @AhmedIbrahim336? Thanks!

@vsubhuman vsubhuman added this to the 4.17.0 milestone Sep 15, 2022
Copy link
Contributor

@vsubhuman vsubhuman left a comment

Choose a reason for hiding this comment

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

/check

Copy link
Contributor

@vsubhuman vsubhuman left a comment

Choose a reason for hiding this comment

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

/check

Copy link
Contributor

@vsubhuman vsubhuman left a comment

Choose a reason for hiding this comment

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

Thank you, @nistadev !

@vsubhuman vsubhuman merged commit 00949a6 into develop Sep 16, 2022
@vsubhuman vsubhuman deleted the pat/revamp-stacking-page branch September 16, 2022 15:41
@vsubhuman vsubhuman mentioned this pull request Sep 19, 2022
19 tasks
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.

4 participants