Skip to content

Commit 42159ab

Browse files
Merge branch 'qa' into develop
2 parents 7026d25 + 2b5bc1f commit 42159ab

File tree

5 files changed

+29
-12
lines changed

5 files changed

+29
-12
lines changed

.circleci/config.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ workflows:
7575
filters:
7676
branches:
7777
only:
78-
# - develop
79-
- qa
78+
- develop
8079

8180
# Production builds are exectuted only on tagged commits to the
8281
# master branch.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@
120120
"node": "10.22.1",
121121
"npm": "6.14.6"
122122
}
123-
}
123+
}

src/routes/Review/components/ReviewTable/index.jsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,13 @@ const ReviewTable = ({ formData, enableEdit = true }) => {
156156
>
157157
<p styleName="stepLabel">
158158
{step.label}
159+
{/*
160+
TODO: temporariliy hiding this link until PROD-2083 is complete
159161
{enableEdit && (
160162
<Link styleName="link" to={redirectUrl}>
161163
edit
162164
</Link>
163-
)}
165+
)} */}
164166
</p>
165167
<div
166168
styleName={classNames("icon", step.isOpen ? "open" : null)}

src/routes/ThankYou/index.jsx

+17-7
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import Button from "components/Button";
33
import LoadingSpinner from "components/LoadingSpinner";
44
import Page from "components/Page";
55
import PageContent from "components/PageContent";
6-
import PageDivider from "components/PageDivider";
76
import PageH2 from "components/PageElements/PageH2";
8-
import { BUTTON_SIZE, MAX_COMPLETED_STEP, webWorkTypes } from "constants/";
7+
import { BUTTON_SIZE, MAX_COMPLETED_STEP } from "constants/";
98
import React, { useEffect, useState } from "react";
109
import { useDispatch, connect } from "react-redux";
1110
import "./styles.module.scss";
@@ -41,11 +40,22 @@ const ThankYou = () => {
4140
<div styleName="container">
4241
<div styleName="content">
4342
<PageH2>THANK YOU</PageH2>
44-
<p>
45-
Your payment has been processed successfully. You will now be
46-
taken to your work Dashboard where you can manage the work
47-
you’ve submitted.
48-
</p>
43+
44+
<div styleName='content-container'>
45+
46+
<p>
47+
Your payment has been processed successfully.
48+
</p>
49+
50+
<p>
51+
You can now go to the Dashboard to manage the work you've submitted.
52+
</p>
53+
54+
<p>
55+
If your changes do not appear immediately, please reload the page.
56+
</p>
57+
58+
</div>
4959

5060
<div styleName="btn">
5161
<Button size={BUTTON_SIZE.MEDIUM} onClick={onDone}>

src/routes/ThankYou/styles.module.scss

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
text-align: center;
77

88
.content {
9-
max-width: 439px;
109
color: $black;
1110
font-size: 16px;
1211
line-height: 26px;
12+
13+
.content-container {
14+
15+
p {
16+
padding: 24px;
17+
}
18+
}
1319
}
1420

1521
.btn {

0 commit comments

Comments
 (0)