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

WV-4 Indicate primary email/phone number can't be deleted TEAM REVIEW #3867

Merged
merged 1 commit into from
Mar 27, 2024
Merged

WV-4 Indicate primary email/phone number can't be deleted TEAM REVIEW #3867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 27 additions & 3 deletions src/js/components/Settings/VoterEmailAddressEntry.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ import { FirstRowPhoneOrEmail, SecondRowPhoneOrEmail, TrashCan } from '../Style/
import { ButtonContainerHorizontal } from '../Welcome/sectionStyles';
import SettingsVerifySecretCode from '../../common/components/Settings/SettingsVerifySecretCode';
import { validateEmail } from '../../utils/regex-checks';
import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
import Tooltip from 'react-bootstrap/Tooltip';


const OpenExternalWebSite = React.lazy(() => import(/* webpackChunkName: 'OpenExternalWebSite' */ '../../common/components/Widgets/OpenExternalWebSite'));

Expand Down Expand Up @@ -528,9 +531,30 @@ class VoterEmailAddressEntry extends Component {
</FirstRowPhoneOrEmail>
<SecondRowPhoneOrEmail>
{isPrimaryEmailAddress ? (
<span>
Primary
</span>
<div key={`${voterEmailAddressFromList.email_we_vote_id}-internal`}>
<span>
Primary
<span style={{ paddingRight: '112px' }}>&nbsp;</span>
</span>
<OverlayTrigger
placement="right"
overlay={(
<Tooltip id="tooltip-top">
Cannot remove primary email. Please add another primary email before removing this one.
</Tooltip>
)}
>
<TrashCan>
<span
// className="u-gray-darker"
style={{ color: '#757575' }}

>
<Delete />
</span>
</TrashCan>
</OverlayTrigger>
</div>
) : (
<div key={`${voterEmailAddressFromList.email_we_vote_id}-internal`}>
<span
Expand Down
43 changes: 34 additions & 9 deletions src/js/components/Settings/VoterPhoneVerificationEntry.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { FirstRowPhoneOrEmail, SecondRowPhoneOrEmail, TrashCan } from '../Style/
import { ButtonContainerHorizontal } from '../Welcome/sectionStyles';
import SettingsVerifySecretCode from '../../common/components/Settings/SettingsVerifySecretCode';
// import { validatePhoneOrEmail } from '../../utils/regex-checks';
import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
import Tooltip from 'react-bootstrap/Tooltip';

const OpenExternalWebSite = React.lazy(() => import(/* webpackChunkName: 'OpenExternalWebSite' */ '../../common/components/Widgets/OpenExternalWebSite'));

Expand Down Expand Up @@ -558,36 +560,59 @@ class VoterPhoneVerificationEntry extends Component {
);

let allowRemoveSMSPhoneNumber;
let emailOwnershipIsVerified;
let smsOwnershipIsVerified;
let isPrimarySMSPhoneNumber;

// ///////////////////////////////////
// LIST OF VERIFIED SMS PHONE NUMBERS
let verifiedSMSFound = false;
const verifiedSMSListHtml = smsPhoneNumberList.map((voterSMSPhoneNumberFromList) => {
emailOwnershipIsVerified = !!voterSMSPhoneNumberFromList.sms_ownership_is_verified;
smsOwnershipIsVerified = !!voterSMSPhoneNumberFromList.sms_ownership_is_verified;

if (emailOwnershipIsVerified) {
if (smsOwnershipIsVerified) {
verifiedSMSFound = true;
allowRemoveSMSPhoneNumber = voterSMSPhoneNumberFromList.primary_sms_phone_number !== true;
isPrimarySMSPhoneNumber = voterSMSPhoneNumberFromList.primary_sms_phone_number === true;
return (
<div key={voterSMSPhoneNumberFromList.sms_we_vote_id}>
<FirstRowPhoneOrEmail>
{voterSMSPhoneNumberFromList.normalized_sms_phone_number}
<span className="u-no-break">{voterSMSPhoneNumberFromList.normalized_sms_phone_number}</span>
</FirstRowPhoneOrEmail>
<SecondRowPhoneOrEmail>
{isPrimarySMSPhoneNumber ? (
<span>
Primary
</span>
<div key={`${voterSMSPhoneNumberFromList.sms_we_vote_id}-internal`}>
<span>
Primary
<span style={{ paddingRight: '112px' }}>&nbsp;</span>
</span>
<OverlayTrigger
placement="right"
overlay={(
<Tooltip id="tooltip-top">
Cannot remove primary phone number. Please add another primary number before removing this one.
</Tooltip>
)}
>
<TrashCan>
<span
// className="u-gray-mid"
style={{ color: '#757575' }}

>
<Delete />
</span>
</TrashCan>
</OverlayTrigger>

</div>
) : (
<div key={`${voterSMSPhoneNumberFromList.sms_we_vote_id}-internal`}>
<span
className="u-link-color u-cursor--pointer"
onClick={() => this.setAsPrimarySMSPhoneNumber.bind(this, voterSMSPhoneNumberFromList.sms_we_vote_id)}
>
Make Primary
<span style={{ paddingRight: '65px' }}>&nbsp;</span>
</span>
{allowRemoveSMSPhoneNumber && (
<TrashCan
Expand All @@ -611,8 +636,8 @@ class VoterPhoneVerificationEntry extends Component {
// LIST OF SMS PHONE NUMBERS TO VERIFY
let unverifiedSMSFound = false;
const toVerifySMSListHtml = smsPhoneNumberList.map((voterSMSPhoneNumberFromList) => {
emailOwnershipIsVerified = !!voterSMSPhoneNumberFromList.sms_ownership_is_verified;
if (!emailOwnershipIsVerified) {
smsOwnershipIsVerified = !!voterSMSPhoneNumberFromList.sms_ownership_is_verified;
if (!smsOwnershipIsVerified) {
unverifiedSMSFound = true;
allowRemoveSMSPhoneNumber = !voterSMSPhoneNumberFromList.primary_sms_phone_number;
isPrimarySMSPhoneNumber = !!voterSMSPhoneNumberFromList.primary_sms_phone_number;
Expand Down
Loading