Skip to content

Fixed UI bug with org logo on My Device page #34084

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

Merged
merged 2 commits into from
Oct 14, 2025
Merged

Fixed UI bug with org logo on My Device page #34084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30c6908
Fixed UI bug with org logo on My Device page
juan-fdz-hawa Oct 10, 2025
6b389d0
Removed not needed import
juan-fdz-hawa Oct 14, 2025
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
1 change: 1 addition & 0 deletions changes/33136-custom-organization-logo-bug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Changed display logic for the organization logo component on the My Device page to prevent flickering.
7 changes: 5 additions & 2 deletions frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import PoliciesCard from "../cards/Policies";
import InfoModal from "./InfoModal";
import { getErrorMessage, hasRemainingSetupSteps } from "./helpers";

import FleetIcon from "../../../../../assets/images/[email protected]";
import PolicyDetailsModal from "../cards/Policies/HostPoliciesTable/PolicyDetailsModal";
import AutoEnrollMdmModal from "./AutoEnrollMdmModal";
import ManualEnrollMdmModal from "./ManualEnrollMdmModal";
Expand Down Expand Up @@ -749,7 +748,11 @@ const DeviceUserPage = ({
<li className="site-nav-item dup-org-logo" key="dup-org-logo">
<div className="site-nav-item__logo-wrapper">
<div className="site-nav-item__logo">
<OrgLogoIcon className="logo" src={orgLogoURL || FleetIcon} />
{isLoadingHost ? (
<Spinner />
) : (
<OrgLogoIcon className="logo" src={orgLogoURL} />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we not want to still back to FleetIcon if there's no logo URL?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fine, if no src is provided then the component goes through its onError handler which sets the source to a default fleet logo ([email protected]).

)}
</div>
</div>
</li>
Expand Down
Loading