status-im
/
gasless-democracy
mirror of https://github.com/status-im/gasless-democracy.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

setNetwork only once connected 

fix vote date formatting
This commit is contained in:
Barry Gitarts 2020-08-03 12:01:43 -04:00
parent 65150bbcfb
commit e281f9c3d0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dapp/src/components/Header.tsx
View File

@ -22,7 +22,7 @@ function Header({account, isStatus, enableEthereum}: HeaderProps) {
const [network, sNetwork] = useState() const [network, sNetwork] = useState()
useEffect(() => { useEffect(() => {
setNetwork(sNetwork) if (account) setNetwork(sNetwork)
}, [account]) }, [account])
return ( return (

6
dapp/src/components/ListPolls.tsx
View File

@ -101,9 +101,9 @@ function TableCards({ polls }: ITableCard) {
return ( return (
<Fragment> <Fragment>
{polls.map((poll, i) => { {polls.map((poll, i) => {
const { pollInfo, messageId, formattedEndDate, sigMsg } = poll const { pollInfo, formattedEndDate, sigMsg } = poll
if (!formattedEndDate || !formattedEndDate.plainText) return if (!formattedEndDate || !formattedEndDate.plainText) return
const { plainText } = formattedEndDate const { plainText, daysRemaining } = formattedEndDate
if (!pollInfo) return if (!pollInfo) return
const { title, description } = pollInfo const { title, description } = pollInfo
const cellStyling = isOdd(i) ? classnames(cardText) : classnames(cardText, cellColor) const cellStyling = isOdd(i) ? classnames(cardText) : classnames(cardText, cellColor)
@ -115,7 +115,7 @@ function TableCards({ polls }: ITableCard) {
<Typography className={classnames(cellStyling, classes.cardSubTitle)}>{description}</Typography> <Typography className={classnames(cellStyling, classes.cardSubTitle)}>{description}</Typography>
<Typography className={lightText}>{plainText}</Typography> <Typography className={lightText}>{plainText}</Typography>
<Link to={pollUrl} className={classnames(cellStyling, classes.link)}> <Link to={pollUrl} className={classnames(cellStyling, classes.link)}>
<Typography className={classnames(cellStyling, classes.voteNow)}>Vote now</Typography> <Typography className={classnames(cellStyling, classes.voteNow)}>{daysRemaining ? 'Vote now' : 'Vote results'}</Typography>
</Link> </Link>
</Fragment> </Fragment>
) )

2
dapp/src/utils/dates.ts
View File

@ -15,7 +15,7 @@ export const timeRemaining = (date: Date | string | null): string => {
const totalHours = hoursDiff(dateStr) const totalHours = hoursDiff(dateStr)
const remainder = totalHours % 24 const remainder = totalHours % 24
const days = Math.floor(totalHours / 24) const days = Math.floor(totalHours / 24)
const str = totalHours > 0 ? `${days} days and ${remainder} hours until vote ends` : `Vote ended ${Math.abs(days)} ago` const str = totalHours > 0 ? `${days} days and ${remainder} hours until vote ends` : `Vote ended ${Math.abs(days)} days ago`
return str return str
} }