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

View File

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

View File

@ -204,8 +204,7 @@ class Profile extends React.Component<Props, State> {
}
}
private openContributionModal = (c: UserContribution) =>
this.setState({ activeContribution: c });
private openContributionModal = (c: UserContribution) => this.setState({ activeContribution: c });
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}>
<UserRow
user={c.user}
extra={
<>
+<UnitDisplay value={toZat(c.amount)} symbol="ZEC" />
</>
}
extra={<>+<UnitDisplay value={toZat(c.amount)} symbol="ZEC" /></>}
/>
</div>
);
content = (
<>
<div className="ProposalContributors-block">
<h3 className="ProposalContributors-block-title">Latest contributors</h3>
{contributions.latest.map(makeContributionRow)}
</div>
<div className="ProposalContributors-block">
<h3 className="ProposalContributors-block-title">Top contributors</h3>
{contributions.top.map(makeContributionRow)}
</div>
</>
);
)
content = <>
<div className="ProposalContributors-block">
<h3 className="ProposalContributors-block-title">Latest contributors</h3>
{contributions.latest.map(makeContributionRow)}
</div>
<div className="ProposalContributors-block">
<h3 className="ProposalContributors-block-title">Top contributors</h3>
{contributions.top.map(makeContributionRow)}
</div>
</>;
} else {
content = (
<Placeholder
@ -87,16 +81,18 @@ class ProposalContributors extends React.Component<Props> {
);
}
} else if (fetchContributionsError) {
content = (
<Placeholder title="Something went wrong" subtitle={fetchContributionsError} />
);
content = <Placeholder title="Something went wrong" subtitle={fetchContributionsError} />;
} else {
content = <Loader />;
}
return <div className="ProposalContributors">{content}</div>;
return (
<div className="ProposalContributors">
{content}
</div>
);
}
}
};
export default connect(
(state: AppState, ownProps: OwnProps) => ({

View File

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

View File

@ -142,8 +142,7 @@ export class ProposalDetail extends React.Component<Props, State> {
blurb: (
<>
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
publish.
Visit your <Link to="/profile?tab=pending">profile's pending tab</Link> to publish.
</>
),
type: 'success',
@ -152,8 +151,7 @@ export class ProposalDetail extends React.Component<Props, State> {
blurb: (
<>
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
information.
<Link to="/profile?tab=pending">profile's pending tab</Link> for more information.
</>
),
type: 'error',
@ -198,7 +196,11 @@ export class ProposalDetail extends React.Component<Props, State> {
['is-expanded']: isBodyExpanded,
})}
>
{proposal ? <Markdown source={proposal.content} /> : <Loader />}
{proposal ? (
<Markdown source={proposal.content} />
) : (
<Loader />
)}
</div>
{showExpand && (
<button

View File

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