From 1387a34c1df90f0e304cdfa73c07d3f9ddc83416 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 29 Mar 2019 12:35:22 +0100 Subject: [PATCH] Adjust support with Option --- packages/ui-reactive/src/TimePeriod.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/ui-reactive/src/TimePeriod.tsx b/packages/ui-reactive/src/TimePeriod.tsx index ba23ab8f68..317f392122 100644 --- a/packages/ui-reactive/src/TimePeriod.tsx +++ b/packages/ui-reactive/src/TimePeriod.tsx @@ -5,21 +5,29 @@ import { BareProps, CallProps } from '@polkadot/ui-api/types'; import React from 'react'; -import { Moment } from '@polkadot/types'; +import { Moment, Option } from '@polkadot/types'; import { withCalls } from '@polkadot/ui-api'; import { formatNumber } from '@polkadot/ui-util'; type Props = BareProps & CallProps & { children?: React.ReactNode, label?: string, - timestamp_blockPeriod?: Moment, // support for previous + timestamp_blockPeriod?: Moment | Option, // support for previous timestamp_minimumPeriod?: Moment // support for new version }; class TimePeriod extends React.PureComponent { render () { const { children, className, label = '', style, timestamp_blockPeriod, timestamp_minimumPeriod } = this.props; - const period = timestamp_minimumPeriod || timestamp_blockPeriod; + const period = timestamp_minimumPeriod || ( + timestamp_blockPeriod + ? ( + (timestamp_blockPeriod as Moment).toNumber + ? (timestamp_blockPeriod as Moment) + : (timestamp_blockPeriod as Option).unwrapOr(null) + ) + : null + ); return (