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.

Sign up for GitHub

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

🧹 Finalize validator dashboard #4742

Merged
merged 12 commits into from
Jan 22, 2024
Merged

🧹 Finalize validator dashboard #4742

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d8b0a64
Factor common queries
thesan Jan 18, 2024
4384e30
Fix tests
thesan Jan 19, 2024
881508c
Simplify validators mocks
thesan Jan 19, 2024
dfb6efa
Factor stakers queries
thesan Jan 19, 2024
cee220b
Fix APR and the latest reward stat
thesan Jan 19, 2024
b687c53
Fix uptime stat
thesan Jan 19, 2024
f127b99
Fix the Era statistic
thesan Jan 19, 2024
b1f1667
Watch `totalIssuance` and `useObservable`
thesan Jan 19, 2024
2c31c9c
Move validators mocks to a separate file
thesan Jan 19, 2024
c5ca1e1
Use the reward average to calculate the APR
thesan Jan 22, 2024
5f29c70
Apply the "do not show again" box decision
thesan Jan 22, 2024
0f49aaa
Fix the toggle appearance
thesan Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 6 additions & 61 deletions packages/ui/src/app/App.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
RegisterBackendMemberDocument,
} from '@/memberships/queries/__generated__/backend.generated'
import { Membership, member } from '@/mocks/data/members'
import { validators } from '@/mocks/data/validators'
import { Container, getButtonByText, joy, selectFromDropdown, withinModal } from '@/mocks/helpers'
import { MocksParameters } from '@/mocks/providers'

Expand Down Expand Up @@ -125,69 +126,13 @@ export default {
council: { stage: { stage: { isIdle: true }, changedAt: 123 } },
referendum: { stage: {} },
staking: {
bonded: {
multi: [
'j4RLnWh3DWgc9u4CMprqxfBhq3kthXhvZDmnpjEtETFVm446D',
'j4RbTjvPyaufVVoxVGk5vEKHma1k7j5ZAQCaAL9qMKQWKAswW',
'j4Rc8VUXGYAx7FNbVZBFU72rQw3GaCuG2AkrUQWnWTh5SpemP',
'j4Rh1cHtZFAQYGh7Y8RZwoXbkAPtZN46FmuYpKNiR3P2Dc2oz',
'j4RjraznxDKae1aGL2L2xzXPSf8qCjFbjuw9sPWkoiy1UqWCa',
'j4RuqkJ2Xqf3NTVRYBUqgbatKVZ31mbK59fWnq4ZzfZvhbhbN',
'j4RxTMa1QVucodYPfQGA2JrHxZP944dfJ8qdDDYKU4QbJCWNP',
'j4Rxkb1w9yB6WXroB2npKjRJJxwxbD8JjSQwMZFB31cf5aZAJ',
'j4RyLBbSUBvipuQLkjLyUGeFWEzmrnfYdpteDa2gYNoM13qEg',
'j4ShWRXxTG4K5Q5H7KXmdWN8HnaaLwppqM7GdiSwAy3eTLsJt',
'j4WfB3TD4tFgrJpCmUi8P3wPp3EocyC5At9ZM2YUpmKGJ1FWM',
],
},
validators: {
entries: [
[
{ args: ['5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy'] },
{ commission: 0.1 * 10 ** 9, blocked: false },
],
[
{ args: ['j4Rc8VUXGYAx7FNbVZBFU72rQw3GaCuG2AkrUQWnWTh5SpemP'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4Rh1cHtZFAQYGh7Y8RZwoXbkAPtZN46FmuYpKNiR3P2Dc2oz'] },
{ commission: 0.15 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RjraznxDKae1aGL2L2xzXPSf8qCjFbjuw9sPWkoiy1UqWCa'] },
{ commission: 0.2 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RuqkJ2Xqf3NTVRYBUqgbatKVZ31mbK59fWnq4ZzfZvhbhbN'] },
{ commission: 0.01 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RxTMa1QVucodYPfQGA2JrHxZP944dfJ8qdDDYKU4QbJCWNP'] },
{ commission: 0.03 * 10 ** 9, blocked: false },
],
[
{ args: ['j4Rxkb1w9yB6WXroB2npKjRJJxwxbD8JjSQwMZFB31cf5aZAJ'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RyLBbSUBvipuQLkjLyUGeFWEzmrnfYdpteDa2gYNoM13qEg'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4ShWRXxTG4K5Q5H7KXmdWN8HnaaLwppqM7GdiSwAy3eTLsJt'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4WfB3TD4tFgrJpCmUi8P3wPp3EocyC5At9ZM2YUpmKGJ1FWM'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
],
entries: Object.entries(validators).map(([address, { commission }]) => [
{ args: [address] },
{ commission, blocked: false },
]),
},
bonded: { multi: Object.keys(validators) },
},
},

Expand Down
67 changes: 6 additions & 61 deletions packages/ui/src/app/pages/Profile/MyMemberships.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
GetMembersWithDetailsDocument,
} from '@/memberships/queries'
import { Membership, member } from '@/mocks/data/members'
import { validators } from '@/mocks/data/validators'
import { Container, getButtonByText, joy, selectFromDropdown, withinModal } from '@/mocks/helpers'
import { MocksParameters } from '@/mocks/providers'

Expand Down Expand Up @@ -71,69 +72,13 @@ export default {
members: { membershipPrice: joy(20) },
membershipWorkingGroup: { budget: joy(166666_66) },
staking: {
bonded: {
multi: [
'j4RLnWh3DWgc9u4CMprqxfBhq3kthXhvZDmnpjEtETFVm446D',
'j4RbTjvPyaufVVoxVGk5vEKHma1k7j5ZAQCaAL9qMKQWKAswW',
'j4Rc8VUXGYAx7FNbVZBFU72rQw3GaCuG2AkrUQWnWTh5SpemP',
'j4Rh1cHtZFAQYGh7Y8RZwoXbkAPtZN46FmuYpKNiR3P2Dc2oz',
'j4RjraznxDKae1aGL2L2xzXPSf8qCjFbjuw9sPWkoiy1UqWCa',
'j4RuqkJ2Xqf3NTVRYBUqgbatKVZ31mbK59fWnq4ZzfZvhbhbN',
'j4RxTMa1QVucodYPfQGA2JrHxZP944dfJ8qdDDYKU4QbJCWNP',
'j4Rxkb1w9yB6WXroB2npKjRJJxwxbD8JjSQwMZFB31cf5aZAJ',
'j4RyLBbSUBvipuQLkjLyUGeFWEzmrnfYdpteDa2gYNoM13qEg',
'j4ShWRXxTG4K5Q5H7KXmdWN8HnaaLwppqM7GdiSwAy3eTLsJt',
'j4WfB3TD4tFgrJpCmUi8P3wPp3EocyC5At9ZM2YUpmKGJ1FWM',
],
},
validators: {
entries: [
[
{ args: ['j4RLnWh3DWgc9u4CMprqxfBhq3kthXhvZDmnpjEtETFVm446D'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RbTjvPyaufVVoxVGk5vEKHma1k7j5ZAQCaAL9qMKQWKAswW'] },
{ commission: 0.1 * 10 ** 9, blocked: false },
],
[
{ args: ['j4Rc8VUXGYAx7FNbVZBFU72rQw3GaCuG2AkrUQWnWTh5SpemP'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4Rh1cHtZFAQYGh7Y8RZwoXbkAPtZN46FmuYpKNiR3P2Dc2oz'] },
{ commission: 0.15 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RjraznxDKae1aGL2L2xzXPSf8qCjFbjuw9sPWkoiy1UqWCa'] },
{ commission: 0.2 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RuqkJ2Xqf3NTVRYBUqgbatKVZ31mbK59fWnq4ZzfZvhbhbN'] },
{ commission: 0.01 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RxTMa1QVucodYPfQGA2JrHxZP944dfJ8qdDDYKU4QbJCWNP'] },
{ commission: 0.03 * 10 ** 9, blocked: false },
],
[
{ args: ['j4Rxkb1w9yB6WXroB2npKjRJJxwxbD8JjSQwMZFB31cf5aZAJ'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4RyLBbSUBvipuQLkjLyUGeFWEzmrnfYdpteDa2gYNoM13qEg'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4ShWRXxTG4K5Q5H7KXmdWN8HnaaLwppqM7GdiSwAy3eTLsJt'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
[
{ args: ['j4WfB3TD4tFgrJpCmUi8P3wPp3EocyC5At9ZM2YUpmKGJ1FWM'] },
{ commission: 0.05 * 10 ** 9, blocked: false },
],
],
entries: Object.entries(validators).map(([address, { commission }]) => [
{ args: [address] },
{ commission, blocked: false },
]),
},
bonded: { multi: Object.keys(validators) },
},
},
derive: {
Expand Down
Loading