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

🔀 Merge dev into backend #4521

Merged
merged 13 commits into from
Sep 4, 2023
Merged

🔀 Merge dev into backend #4521

merged 13 commits into from
Sep 4, 2023

Conversation

thesan
Copy link
Member

@thesan thesan commented Sep 4, 2023

No description provided.

thesan and others added 13 commits July 21, 2023 13:27
* Add Validators Module to the side menu and add tabs to validators page

* Add widgets

* fix widgets

* display info modal on first open the page

* get the staking informations using polkadot api

* add validators list filter

* fix widgets component and hook, add last reward

* add validators' list- draft

* add 'Total rewards', but not beyond history depth

* remove filter and search box

* fix validator page notification modal

* lint:fix

* Update packages/ui/src/validators/components/widgets/Era.tsx

Co-authored-by: l1.media <[email protected]>

* Update packages/ui/src/validators/components/widgets/Era.tsx

Co-authored-by: l1.media <[email protected]>

* Update packages/ui/src/validators/components/widgets/Rewards.tsx

Co-authored-by: l1.media <[email protected]>

* Update packages/ui/src/validators/components/widgets/Rewards.tsx

Co-authored-by: l1.media <[email protected]>

* rename 'widgets' to 'statistics','validators.tsx' to 'validatorlist.tsx'

* add 'nominators' to the widget

* add staking percentage to the widget

* add blocks and points to the widget

* fix validators page notification modal

* fix the counter for active nominators

* fix the format of staking value

* yarn lint:fix

* remove route, sidebar item, tab, dashboard, modal

* add storybook for validator list page statistics

* fix storybook, remove unused variables

* Update packages/ui/src/app/pages/Validators/ValidatorList.stories.tsx

Co-authored-by: Theophile Sandoz <[email protected]>

* Update packages/ui/src/app/pages/Validators/ValidatorList.stories.tsx

Co-authored-by: Theophile Sandoz <[email protected]>

* Update packages/ui/src/app/pages/Validators/ValidatorList.stories.tsx

Co-authored-by: Theophile Sandoz <[email protected]>

* Make story values more readable

* Add a special case for `unwrap` methods

* Assign an object to unwrap

* Update packages/ui/src/common/components/charts/PercentageChart.tsx

Co-authored-by: Theophile Sandoz <[email protected]>

* Update packages/ui/src/validators/constants/constant.ts

Co-authored-by: Theophile Sandoz <[email protected]>

* Update packages/ui/src/validators/hooks/useStakingStatistics.tsx

Co-authored-by: Theophile Sandoz <[email protected]>

* Update packages/ui/src/validators/hooks/useStakingStatistics.tsx

Co-authored-by: Theophile Sandoz <[email protected]>

* Update packages/ui/src/validators/hooks/useStakingStatistics.tsx

Co-authored-by: Theophile Sandoz <[email protected]>

* fix rewardPoints

* remove InfoModal

* fix asChainData helper

* Simplify chain unwrapped mocks

* move ERA_DRATION to common/constant/number

* remove the default value for activeEra, assign undefined instead

* pass the statistic values as props

* fix some code to make it clear

* fix some issue in Era widget

---------

Co-authored-by: l1.media <[email protected]>
Co-authored-by: Theophile Sandoz <[email protected]>
* Total Votes per candidate

* lint fix

* voting test

* voting test

* voting test

* voting test

* lint fix
* add types for Validator

* add ValidatorItem component for validator table

* fix tokenValue

* add validatorLists and filter component

* complete ValidatorLists and filter

* add mocking data

* fix useValidator hook to check the state of validator

* add entries method to array for api mocking

* add waiting validators to mocking data

* remove duplicate accounts from mocking data

* mock verification state randomly in hook for test

* add filter and search  tests

* fix storybook test

* add social media to validator info

* Revert "remove route, sidebar item, tab, dashboard, modal"

This reverts commit 480cd09.

* fix the case of zero totalstaking

* Revert "Revert "remove route, sidebar item, tab, dashboard, modal""

This reverts commit 02594e1.

* fix optionVariables type mocking qn

* fix type Validator, ValidatorInfo component

* mocking validator membership in hook (temp)

* fix components according to the review

* fix storybook test, add the expectations more

* fix interaction-test

* Fix the search test

* make the process calculating apr more readable

* fix storybook interaction test according to the review

* remove startedOn

* lint fix

* fix useValidatorsList when totalStaking is zero

---------

Co-authored-by: Theophile Sandoz <[email protected]>
* preview multiple receipients modal

* multiple funding request validation

* csv reg exp pattern

* Preview And Validate Modal validation

* lint fix

* Tx fail fix

* suggestions

* lint fix

* side drawer

* csv pattern change and cleanup

* Multiple funding request test

* lint

* Update packages/ui/src/app/pages/Proposals/CurrentProposals.stories.tsx

Co-authored-by: Theophile Sandoz <[email protected]>

* requested changes

* lint

* disable preview button

* updated storybook test for multiple funding request

* requested changes

* requested changes

---------

Co-authored-by: Theophile Sandoz <[email protected]>
* Fix 4485, 4484: update the code again

* Fix 4485, 4484: Lint issue and ui-unit test
Fix wrong Vercel URL due to double "-" in the CI
@vercel
Copy link

vercel bot commented Sep 4, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
dao ✅ Ready (Inspect) Visit Preview Sep 4, 2023 11:36am
pioneer-2 ✅ Ready (Inspect) Visit Preview Sep 4, 2023 11:36am
pioneer-2-storybook ✅ Ready (Inspect) Visit Preview Sep 4, 2023 11:36am

@thesan
Copy link
Member Author

thesan commented Sep 4, 2023

"CI / interaction-tests (18.x, ubuntu-latest) (pull_request)" fails because it tries to run EmailSubscriptionModalDecline which exists on the merge but not on the Vercel storybook deployment (which is just based on dev). This is fine to merge since "CI / interaction-tests (18.x, ubuntu-latest) (push)" passes.

@thesan thesan merged commit c6136d8 into backend Sep 4, 2023
6 of 7 checks 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.

5 participants