Change 'reject' to 'request changes' (#72)
This commit is contained in:
parent
db49fbc7e1
commit
13d762b011
|
@ -43,8 +43,8 @@ export default [
|
|||
},
|
||||
{
|
||||
id: 'proposal_rejected',
|
||||
title: 'Proposal rejected',
|
||||
description: 'Sent when an admin rejects your submitted proposal',
|
||||
title: 'Proposal changes requested',
|
||||
description: 'Sent when an admin requests changes for your submitted proposal',
|
||||
},
|
||||
{
|
||||
id: 'proposal_contribution',
|
||||
|
|
|
@ -221,11 +221,11 @@ class ProposalDetailNaked extends React.Component<Props, State> {
|
|||
<Alert
|
||||
showIcon
|
||||
type="error"
|
||||
message="Rejected"
|
||||
message="Changes requested"
|
||||
description={
|
||||
<div>
|
||||
<p>
|
||||
This proposal has been rejected. The team will be able to re-submit it for
|
||||
This proposal has changes requested. The team will be able to re-submit it for
|
||||
approval should they desire to do so.
|
||||
</p>
|
||||
<b>Reason:</b>
|
||||
|
@ -547,7 +547,7 @@ class ProposalDetailNaked extends React.Component<Props, State> {
|
|||
|
||||
private handleReject = async (reason: string) => {
|
||||
await store.approveProposal(false, false, reason);
|
||||
message.info('Proposal rejected');
|
||||
message.info('Proposal changes requested');
|
||||
};
|
||||
|
||||
private handlePaidMilestone = async () => {
|
||||
|
|
|
@ -77,14 +77,14 @@ export const PROPOSAL_STATUSES: Array<StatusSoT<PROPOSAL_STATUS>> = [
|
|||
id: PROPOSAL_STATUS.PENDING,
|
||||
tagDisplay: 'Awaiting Approval',
|
||||
tagColor: '#ffaa00',
|
||||
hint: 'User is waiting for admin to approve or reject this Proposal.',
|
||||
hint: 'User is waiting for admin to approve or request changes to this Proposal.',
|
||||
},
|
||||
{
|
||||
id: PROPOSAL_STATUS.REJECTED,
|
||||
tagDisplay: 'Approval Rejected',
|
||||
tagDisplay: 'Changes Requested',
|
||||
tagColor: '#eb4118',
|
||||
hint:
|
||||
'Admin has rejected this proposal. User may adjust it and resubmit for approval.',
|
||||
'Admin has requested changes for this proposal. User may adjust it and resubmit for approval.',
|
||||
},
|
||||
{
|
||||
id: PROPOSAL_STATUS.STAKING,
|
||||
|
|
|
@ -77,9 +77,9 @@ def proposal_approved(email_args):
|
|||
|
||||
def proposal_rejected(email_args):
|
||||
return {
|
||||
'subject': 'Your proposal has been rejected',
|
||||
'title': 'Your proposal has been rejected',
|
||||
'preview': '{} has been rejected'.format(email_args['proposal'].title),
|
||||
'subject': 'Your proposal has changes requested',
|
||||
'title': 'Your proposal has changes requested',
|
||||
'preview': '{} has changes requested'.format(email_args['proposal'].title),
|
||||
'subscription': EmailSubscription.MY_PROPOSAL_APPROVAL
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<p style="margin: 0;">
|
||||
Your proposal has unfortunately been rejected. You're free to modify it
|
||||
Your proposal has changes requested. You're free to modify it
|
||||
and try submitting again.
|
||||
</p>
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Your proposal has unfortunately been rejected. You're free to modify it
|
||||
Your proposal has changes requested. You're free to modify it
|
||||
and try submitting again.
|
||||
|
||||
{% if args.admin_note %}
|
||||
|
|
|
@ -120,7 +120,7 @@ class DraftList extends React.Component<Props, State> {
|
|||
title={
|
||||
<>
|
||||
{d.title || <em>Untitled proposal</em>}
|
||||
{d.status === STATUS.REJECTED && <em> (rejected)</em>}
|
||||
{d.status === STATUS.REJECTED && <em> (changes requested)</em>}
|
||||
</>
|
||||
}
|
||||
description={d.brief || <em>No description</em>}
|
||||
|
|
|
@ -54,10 +54,10 @@ class ProfilePending extends React.Component<Props, State> {
|
|||
},
|
||||
[STATUS.REJECTED]: {
|
||||
color: 'red',
|
||||
tag: 'Rejected',
|
||||
tag: 'Changes requested',
|
||||
blurb: (
|
||||
<>
|
||||
<div>This proposal was rejected for the following reason:</div>
|
||||
<div>This proposal has changes requested:</div>
|
||||
<q>{rejectReason}</q>
|
||||
<div>You may edit this proposal and re-submit it for approval.</div>
|
||||
</>
|
||||
|
|
|
@ -149,8 +149,8 @@ export class ProposalDetail extends React.Component<Props, State> {
|
|||
[STATUS.REJECTED]: {
|
||||
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
|
||||
Your proposal has changes requested and is only visible to the team. Visit
|
||||
your <Link to="/profile?tab=pending">profile's pending tab</Link> for more
|
||||
information.
|
||||
</>
|
||||
),
|
||||
|
|
|
@ -48,7 +48,7 @@ export const EMAIL_SUBSCRIPTIONS: { [key in ESKey]: EmailSubscriptionInfo } = {
|
|||
|
||||
// MY PROPOSAL
|
||||
myProposalApproval: {
|
||||
description: 'is approved or rejected',
|
||||
description: 'is approved or has changes requested',
|
||||
category: EMAIL_SUBSCRIPTION_CATEGORY.PROPOSAL,
|
||||
value: false,
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue