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

Prevent showing email when username and email are same in the my account user profile dropdown #6408

Merged
merged 5 commits into from
Jul 5, 2024
Merged

Prevent showing email when username and email are same in the my account user profile dropdown #6408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15279c9
Added a condition to prevent showing email when username and email ar…
ashanthamara Jun 5, 2024
e29c3ca
Added changeset
ashanthamara Jun 5, 2024
79d8961
Fix eslint issue
ashanthamara Jun 5, 2024
83e476a
Fix eslint issue
ashanthamara Jun 5, 2024
c8de1eb
Update .changeset/friendly-dingos-accept.md
ashanthamara Jun 5, 2024
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
5 changes: 5 additions & 0 deletions .changeset/friendly-dingos-accept.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@wso2is/myaccount": patch
---

Prevent showing email when username and email are same
13 changes: 12 additions & 1 deletion apps/myaccount/src/components/shared/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,17 @@ export const Header: FunctionComponent<HeaderPropsInterface> = (
return "";
};

const resolveEmail = (): string => {
let email: string = profileInfo?.email ?? profileInfo?.emails[profileInfo.emails.length - 1];

if (email === resolveUsername()) {
// When both the username and email are the same, the email is not shown.
email = "";
}

return email;
};

return (
<OxygenHeader
className="is-header"
Expand Down Expand Up @@ -396,7 +407,7 @@ export const Header: FunctionComponent<HeaderPropsInterface> = (
title: theme?.images?.myAccountLogo?.title ?? config.ui.appName
} }
user={ {
email: profileInfo?.email ?? profileInfo?.emails[profileInfo.emails.length - 1],
email: resolveEmail(),
image: profileInfo?.profileUrl,
name: resolveUsername()
} }
Expand Down
Loading