neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify unbonding display (#3551)

Browse Source 
* Simplify unbonding display

* Less allocations
This commit is contained in:
Jaco Greeff 2020-08-27 22:55:42 +02:00 committed by GitHub
parent 414d6b7a50
commit 58b9833c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/react-components/src/StakingUnbonding.tsx
View File

@ -5,11 +5,11 @@
import { DeriveSessionProgress, DeriveStakingAccount, DeriveUnlocking } from '@polkadot/api-derive/types';
import BN from 'bn.js';
import React from 'react';
import React, { useMemo } from 'react';
import styled from 'styled-components';
import { useApi, useCall } from '@polkadot/react-hooks';
import { BlockToTime, FormatBalance } from '@polkadot/react-query';
import { BN_ZERO, formatBalance, formatNumber } from '@polkadot/util';
import { BN_ONE, BN_ZERO, formatBalance, formatNumber } from '@polkadot/util';
import Icon from './Icon';
import Tooltip from './Tooltip';
@ -22,9 +22,9 @@ interface Props {
function remainingBlocks (remainingEras: BN, { eraLength, eraProgress }: DeriveSessionProgress): BN {
return remainingEras
.subn(1)
.mul(eraLength)
.add(eraLength.sub(eraProgress));
.sub(BN_ONE)
.imul(eraLength)
.iadd(eraLength.sub(eraProgress));
}
function StakingUnbonding ({ className = '', stakingInfo }: Props): React.ReactElement<Props> | null {
@ -32,19 +32,27 @@ function StakingUnbonding ({ className = '', stakingInfo }: Props): React.ReactE
const progress = useCall<DeriveSessionProgress>(api.derive.session.progress);
const { t } = useTranslation();
if (!stakingInfo?.unlocking || !progress) {
const [mapped, total] = useMemo(
(): [[DeriveUnlocking, BN][], BN] => {
if (!stakingInfo || !progress) {
return [[], BN_ZERO];
}
const mapped = (stakingInfo?.unlocking || [])
.filter(({ remainingEras, value }) => value.gt(BN_ZERO) && remainingEras.gt(BN_ZERO))
.map((unlock): [DeriveUnlocking, BN] => [unlock, remainingBlocks(unlock.remainingEras, progress)]);
const total = mapped.reduce((total, [{ value }]) => total.iadd(value), new BN(0));
return [mapped, total];
},
[progress, stakingInfo]
);
if (!stakingInfo || !mapped.length) {
return null;
}
const filtered = stakingInfo.unlocking.filter(({ remainingEras, value }) => value.gtn(0) && remainingEras.gtn(0));
if (!filtered.length) {
return null;
}
const mapped = filtered.map((unlock): [DeriveUnlocking, BN] => [unlock, remainingBlocks(unlock.remainingEras, progress)]);
const total = mapped.reduce((total, [{ value }]) => total.add(value), BN_ZERO);
const trigger = `${stakingInfo.accountId.toHex()}-unlocking-trigger`;
const trigger = `${stakingInfo.accountId.toString()}-unlocking-trigger`;
return (
<div className={className}>