diff --git a/packages/page-referenda/src/Referenda/RefOngoing.tsx b/packages/page-referenda/src/Referenda/RefOngoing.tsx index e91ea6a0f1..6e14466df9 100644 --- a/packages/page-referenda/src/Referenda/RefOngoing.tsx +++ b/packages/page-referenda/src/Referenda/RefOngoing.tsx @@ -42,17 +42,17 @@ function expandOngoing (info: Referendum['info'], track?: PalletReferendaTrackIn const { deciding, submitted } = ongoing; if (deciding.isSome) { - const d = deciding.unwrap(); + const { confirming, since } = deciding.unwrap(); - if (d.confirming.isSome) { - // we are confirming (it details the actual end-block) - confirmEnd = d.confirming.unwrap(); // .add(track.confirmPeriod); + if (confirming.isSome) { + // we are confirming with the specific end block + confirmEnd = confirming.unwrap(); } else { - // we are still deciding - decideEnd = d.since.add(track.decisionPeriod); + // we are still deciding, start + length + decideEnd = since.add(track.decisionPeriod); } } else { - // we are still preparing + // we are still preparing, start + length prepareEnd = submitted.add(track.preparePeriod); } } diff --git a/packages/page-staking/src/Actions/useInactives.ts b/packages/page-staking/src/Actions/useInactives.ts index aca93038dc..11f146417e 100644 --- a/packages/page-staking/src/Actions/useInactives.ts +++ b/packages/page-staking/src/Actions/useInactives.ts @@ -31,7 +31,9 @@ function extractState (api: ApiPromise, stashId: string, slashes: Option