Skip to content

Commit 4143045

Browse files
authored
Merge pull request #1903 from tekdi/release-1.11.0
Release 1.11.0 to admin prod
2 parents c4e4503 + ffc8268 commit 4143045

File tree

55 files changed

+5538
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+5538
-149
lines changed

apps/admin-app-repo/src/pages/login.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ const LoginPage = () => {
534534
roleName: string
535535
) => {
536536
setSwitchDialogOpen(false);
537+
setLoading(true)
537538

538539
// Set the state values
539540
setTenantId(tenantId);
@@ -573,6 +574,7 @@ const LoginPage = () => {
573574
}
574575

575576
await fetchUserDetail();
577+
setLoading(false)
576578
};
577579

578580
const fetchTenantInfo = async () => {
@@ -726,7 +728,7 @@ const LoginPage = () => {
726728
alignItems={'center'}
727729
justifyContent={'center'}
728730
zIndex={99}
729-
// sx={{ margin: '5px 10px 25px', }}
731+
// sx={{ margin: '5px 10px 25px', }}
730732
>
731733
<Box
732734
sx={{
@@ -848,9 +850,8 @@ const LoginPage = () => {
848850
logEvent({
849851
action: 'remember-me-button-clicked',
850852
category: 'Login Page',
851-
label: `Remember Me ${
852-
rememberMe ? 'Checked' : 'Unchecked'
853-
}`,
853+
label: `Remember Me ${rememberMe ? 'Checked' : 'Unchecked'
854+
}`,
854855
});
855856
}}
856857
sx={{
751 KB
Loading
69.6 KB
Loading
5.47 MB
Loading
27.1 KB
Loading
70 KB
Loading
81.9 KB
Loading
44.3 KB
Loading
68.1 KB
Loading
183 KB
Loading

0 commit comments

Comments
 (0)