Undo errouneous reformats

This commit is contained in:
Daniel Ternyak 2019-01-27 16:17:09 -06:00
parent c3370076be
commit 01d61fce9f
No known key found for this signature in database
GPG Key ID: DF212D2DC5D0E245
7 changed files with 64 additions and 54 deletions

View File

@ -49,7 +49,9 @@ export default class PaymentInfo extends React.Component<Props, State> {
Thank you for contributing! Just send using whichever method works best for you, Thank you for contributing! Just send using whichever method works best for you,
and we'll let you know when your contribution has been confirmed. Need help and we'll let you know when your contribution has been confirmed. Need help
sending? sending?
{/* TODO: Help / FAQ page for sending */} <a>Click here</a>. {/* TODO: Help / FAQ page for sending */}
{' '}
<a>Click here</a>.
</p> </p>
<Radio.Group <Radio.Group
@ -57,12 +59,18 @@ export default class PaymentInfo extends React.Component<Props, State> {
onChange={this.handleChangeSendType} onChange={this.handleChangeSendType}
value={sendType} value={sendType}
> >
<Radio.Button value="sprout">Z Address (Private)</Radio.Button> <Radio.Button value="sprout">
<Radio.Button value="transparent">T Address (Public)</Radio.Button> Z Address (Private)
</Radio.Button>
<Radio.Button value="transparent">
T Address (Public)
</Radio.Button>
</Radio.Group> </Radio.Group>
<div className="PaymentInfo-uri"> <div className="PaymentInfo-uri">
<div className={classnames('PaymentInfo-uri-qr', !uri && 'is-loading')}> <div className={
classnames('PaymentInfo-uri-qr', !uri && 'is-loading')
}>
<span style={{ opacity: uri ? 1 : 0 }}> <span style={{ opacity: uri ? 1 : 0 }}>
<QRCode value={uri || ''} /> <QRCode value={uri || ''} />
</span> </span>
@ -115,29 +123,33 @@ interface CopyInputProps {
isTextarea?: boolean; isTextarea?: boolean;
} }
const CopyInput: React.SFC<CopyInputProps> = ({ const CopyInput: React.SFC<CopyInputProps> = ({ label, value, help, className, isTextarea }) => (
label,
value,
help,
className,
isTextarea,
}) => (
<Form.Item <Form.Item
className={classnames('CopyInput', className, isTextarea && 'is-textarea')} className={classnames(
'CopyInput',
className,
isTextarea && 'is-textarea',
)}
label={label} label={label}
help={help} help={help}
> >
{isTextarea ? ( {isTextarea ? (
<> <>
<Input.TextArea value={value} readOnly rows={3} /> <Input.TextArea value={value} readOnly rows={3} />
<CopyToClipboard text={value || ''} onCopy={() => message.success('Copied!', 2)}> <CopyToClipboard
text={value || ''}
onCopy={() => message.success('Copied!', 2)}
>
<Button icon="copy" /> <Button icon="copy" />
</CopyToClipboard> </CopyToClipboard>
</> </>
) : ( ) : (
<> <>
<Input value={value} readOnly /> <Input value={value} readOnly />
<CopyToClipboard text={value || ''} onCopy={() => message.success('Copied!', 2)}> <CopyToClipboard
text={value || ''}
onCopy={() => message.success('Copied!', 2)}
>
<Button icon="copy" /> <Button icon="copy" />
</CopyToClipboard> </CopyToClipboard>
</> </>

View File

@ -43,8 +43,8 @@ class CreateFinal extends React.Component<Props> {
<Icon type="check-circle" /> <Icon type="check-circle" />
<div className="CreateFinal-message-text"> <div className="CreateFinal-message-text">
Your proposal has been submitted! Check your{' '} Your proposal has been submitted! Check your{' '}
<Link to={`/profile?tab=pending`}>profile's pending proposals tab</Link> to <Link to={`/profile?tab=pending`}>profile's pending proposals tab</Link>
check its status. {' '}to check its status.
</div> </div>
{/* TODO - remove or rework depending on design choices */} {/* TODO - remove or rework depending on design choices */}
{/* <div className="CreateFinal-message-text"> {/* <div className="CreateFinal-message-text">

View File

@ -204,8 +204,7 @@ class Profile extends React.Component<Props, State> {
} }
} }
private openContributionModal = (c: UserContribution) => private openContributionModal = (c: UserContribution) => this.setState({ activeContribution: c });
this.setState({ activeContribution: c });
private closeContributionModal = () => this.setState({ activeContribution: null }); private closeContributionModal = () => this.setState({ activeContribution: null });
} }

View File

@ -54,26 +54,20 @@ class ProposalContributors extends React.Component<Props> {
<div className="ProposalContributors-block-contributor" key={c.id}> <div className="ProposalContributors-block-contributor" key={c.id}>
<UserRow <UserRow
user={c.user} user={c.user}
extra={ extra={<>+<UnitDisplay value={toZat(c.amount)} symbol="ZEC" /></>}
<>
+<UnitDisplay value={toZat(c.amount)} symbol="ZEC" />
</>
}
/> />
</div> </div>
); )
content = ( content = <>
<> <div className="ProposalContributors-block">
<div className="ProposalContributors-block"> <h3 className="ProposalContributors-block-title">Latest contributors</h3>
<h3 className="ProposalContributors-block-title">Latest contributors</h3> {contributions.latest.map(makeContributionRow)}
{contributions.latest.map(makeContributionRow)} </div>
</div> <div className="ProposalContributors-block">
<div className="ProposalContributors-block"> <h3 className="ProposalContributors-block-title">Top contributors</h3>
<h3 className="ProposalContributors-block-title">Top contributors</h3> {contributions.top.map(makeContributionRow)}
{contributions.top.map(makeContributionRow)} </div>
</div> </>;
</>
);
} else { } else {
content = ( content = (
<Placeholder <Placeholder
@ -87,16 +81,18 @@ class ProposalContributors extends React.Component<Props> {
); );
} }
} else if (fetchContributionsError) { } else if (fetchContributionsError) {
content = ( content = <Placeholder title="Something went wrong" subtitle={fetchContributionsError} />;
<Placeholder title="Something went wrong" subtitle={fetchContributionsError} />
);
} else { } else {
content = <Loader />; content = <Loader />;
} }
return <div className="ProposalContributors">{content}</div>; return (
<div className="ProposalContributors">
{content}
</div>
);
} }
} };
export default connect( export default connect(
(state: AppState, ownProps: OwnProps) => ({ (state: AppState, ownProps: OwnProps) => ({

View File

@ -122,8 +122,8 @@ class ProposalMilestones extends React.Component<Props, State> {
The team was awarded <strong>{reward}</strong>{' '} The team was awarded <strong>{reward}</strong>{' '}
{milestone.isImmediatePayout {milestone.isImmediatePayout
? 'as an initial payout' ? 'as an initial payout'
: // TODO: Add property for payout date on milestones // TODO: Add property for payout date on milestones
`on ${moment().format('MMM Do, YYYY')}`} : `on ${moment().format('MMM Do, YYYY')}`}
. .
</span> </span>
} }
@ -151,8 +151,9 @@ class ProposalMilestones extends React.Component<Props, State> {
<span> <span>
Payout for this milestone was rejected on{' '} Payout for this milestone was rejected on{' '}
{/* TODO: add property for payout rejection date on milestones */} {/* TODO: add property for payout rejection date on milestones */}
{moment().format('MMM Do, YYYY')}.{isTrustee ? ' You ' : ' The team '}{' '} {moment().format('MMM Do, YYYY')}.
can request another review for payout at any time. {isTrustee ? ' You ' : ' The team '} can request another
review for payout at any time.
</span> </span>
} }
style={alertStyle} style={alertStyle}

View File

@ -142,8 +142,7 @@ export class ProposalDetail extends React.Component<Props, State> {
blurb: ( blurb: (
<> <>
Your proposal has been approved! It is currently only visible to the team. Your proposal has been approved! It is currently only visible to the team.
Visit your <Link to="/profile?tab=pending">profile's pending tab</Link> to Visit your <Link to="/profile?tab=pending">profile's pending tab</Link> to publish.
publish.
</> </>
), ),
type: 'success', type: 'success',
@ -152,8 +151,7 @@ export class ProposalDetail extends React.Component<Props, State> {
blurb: ( blurb: (
<> <>
Your proposal was rejected and is only visible to the team. Visit your{' '} Your proposal was rejected and is only visible to the team. Visit your{' '}
<Link to="/profile?tab=pending">profile's pending tab</Link> for more <Link to="/profile?tab=pending">profile's pending tab</Link> for more information.
information.
</> </>
), ),
type: 'error', type: 'error',
@ -198,7 +196,11 @@ export class ProposalDetail extends React.Component<Props, State> {
['is-expanded']: isBodyExpanded, ['is-expanded']: isBodyExpanded,
})} })}
> >
{proposal ? <Markdown source={proposal.content} /> : <Loader />} {proposal ? (
<Markdown source={proposal.content} />
) : (
<Loader />
)}
</div> </div>
{showExpand && ( {showExpand && (
<button <button

View File

@ -28,7 +28,7 @@ class VerifyEmail extends React.Component<RouteComponentProps, State> {
this.setState({ this.setState({
hasVerified: true, hasVerified: true,
isVerifying: false, isVerifying: false,
}); })
}) })
.catch(err => { .catch(err => {
this.setState({ this.setState({
@ -41,7 +41,7 @@ class VerifyEmail extends React.Component<RouteComponentProps, State> {
error: ` error: `
Missing code parameter from email. Missing code parameter from email.
Make sure you copied the full link. Make sure you copied the full link.
`, `
}); });
} }
} }
@ -63,7 +63,7 @@ class VerifyEmail extends React.Component<RouteComponentProps, State> {
</Link> </Link>
</div> </div>
); );
if (hasVerified) { if (hasVerified) {
return ( return (
<Result <Result
@ -88,4 +88,4 @@ class VerifyEmail extends React.Component<RouteComponentProps, State> {
} }
} }
export default withRouter(VerifyEmail); export default withRouter(VerifyEmail);