Skip to content

fix modals on profile general tab #2349

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
filipslezaklab merged 1 commit into from
Mar 16, 2026
Merged

fix modals on profile general tab #2349

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
53 changes: 27 additions & 26 deletions web/src/pages/user-profile/UserProfilePage/tabs/ProfileDetailsTab/ProfileDetailsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import './style.scss';
import { Fragment } from 'react/jsx-runtime';
import { m } from '../../../../../paraglide/messages';
import { LayoutGrid } from '../../../../../shared/components/LayoutGrid/LayoutGrid';
import { ChangePasswordModal } from '../../../../../shared/components/modals/ChangePasswordModal/ChangePasswordModal';
Expand All @@ -20,36 +21,36 @@ export const ProfileDetailsTab = () => {
const authorizedApps = useUserProfile((s) => s.user.authorized_apps);

return (
<LayoutGrid id="profile-details">
<div className="left">
<ProfileGeneralCard />
{authorizedApps?.length === 0 && <AuthorizedAppsNoData />}
{isPresent(authorizedApps) && authorizedApps.length > 0 && (
<ProfileAuthorizedApps authorizedApps={authorizedApps} />
)}
</div>
<ProfileAuthCard />
</LayoutGrid>
);
};

const AuthorizedAppsNoData = () => {
return (
<>
<ProfileCard id="apps-no-data">
<SizedBox height={ThemeSpacing.Xl5} />
<EmptyState
icon="apps"
title={m.profile_apps_no_data_title()}
subtitle={m.profile_apps_no_data_subtitle()}
/>
<SizedBox height={ThemeSpacing.Xl5} />
</ProfileCard>
<Fragment>
<LayoutGrid id="profile-details">
<div className="left">
<ProfileGeneralCard />
{authorizedApps?.length === 0 && <AuthorizedAppsNoData />}
{isPresent(authorizedApps) && authorizedApps.length > 0 && (
<ProfileAuthorizedApps authorizedApps={authorizedApps} />
)}
</div>
<ProfileAuthCard />
</LayoutGrid>
<ChangePasswordModal />
<TotpSetupModal />
<RecoveryCodesModal />
<EmailMfaSetupModal />
<WebautnSetupModal />
</>
</Fragment>
);
};

const AuthorizedAppsNoData = () => {
return (
<ProfileCard id="apps-no-data">
<SizedBox height={ThemeSpacing.Xl5} />
<EmptyState
icon="apps"
title={m.profile_apps_no_data_title()}
subtitle={m.profile_apps_no_data_subtitle()}
/>
<SizedBox height={ThemeSpacing.Xl5} />
</ProfileCard>
);
};
Loading