Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging to Develop #5598

Merged
merged 7 commits into from
Jun 24, 2020
Merged

Staging to Develop #5598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fddab3
Merge pull request #5518 from flexion/dev-snapshot-06-16-2020-mh
matthopson Jun 16, 2020
20d5818
Merge pull request #5527 from flexion/dev-snapshot-061720-mh1
matthopson Jun 17, 2020
0fbbd8a
Merge pull request #5577 from flexion/develop
sutt0n Jun 23, 2020
2867bad
5430: added email for primary petitioner per UX review
Jun 23, 2020
f7fc0b8
Merge pull request #5586 from flexion/dev-snapshot-062320-mh1
matthopson Jun 23, 2020
6d6fbc4
Merge pull request #5589 from flexion/5430-email-primary-petitioner-card
sutt0n Jun 23, 2020
ff40001
Merge pull request #5596 from flexion/dev-snapshot-062420-01
matthopson Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion web-client/src/views/CaseDetail/AddressDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ export const AddressDisplay = connect(
constants: state.constants,
contact: props.contact,
nameOverride: props.nameOverride || {},
showEmail: props.showEmail || false,
},
function AddressDisplay({ constants, contact, nameOverride }) {
function AddressDisplay({ constants, contact, nameOverride, showEmail }) {
return (
<>
<p className="margin-top-0 address-name">
Expand Down Expand Up @@ -39,6 +40,9 @@ export const AddressDisplay = connect(
{contact.phone && (
<span className="address-line margin-top-1">{contact.phone}</span>
)}
{contact.email && showEmail && (
<span className="address-line">{contact.email}</span>
)}
</p>
</>
);
Expand Down
1 change: 1 addition & 0 deletions web-client/src/views/CaseDetail/PetitionerInformation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ const PetitionerInformation = connect(
formattedCaseDetail.showCaseTitleForPrimary &&
formattedCaseDetail.caseTitle
}
showEmail={true}
/>
</address>
{formattedCaseDetail.contactPrimary.serviceIndicator && (
Expand Down