Fix: UI issues (#1846)

* fix: loading spinner alignment corrected * fix: auth app deletion link is shown while deletion is not allowed
teamhanko · Oct 22, 2024 · 9e10bdd · 9e10bdd
1 parent c7bfd92
commit 9e10bdd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/frontend/elements/src/components/accordion/ManageAuthAppDropdown.tsx b/frontend/elements/src/components/accordion/ManageAuthAppDropdown.tsx
@@ -15,6 +15,7 @@ interface Props {
   onDelete: (event: Event) => Promise<void>;
   onConnect: (event: Event) => Promise<void>;
   authAppSetUp: boolean;
+  allowDeletion: boolean;
 }
 
 const ManageAuthAppDropdown = ({
@@ -23,6 +24,7 @@ const ManageAuthAppDropdown = ({
   onDelete,
   onConnect,
   authAppSetUp,
+  allowDeletion,
 }: Props) => {
   const { t } = useContext(TranslateContext);
 
@@ -65,6 +67,7 @@ const ManageAuthAppDropdown = ({
         <br />
         {authAppSetUp ? (
           <Link
+            hidden={!allowDeletion}
             uiAction={"auth-app-remove"}
             onClick={(event: Event) => onDelete(event)}
             loadingSpinnerPosition={"right"}

diff --git a/frontend/elements/src/pages/CreateSecurityKeyPage.tsx b/frontend/elements/src/pages/CreateSecurityKeyPage.tsx
@@ -59,7 +59,7 @@ const CreateSecurityKeyPage = (props: Props) => {
         <Link
           uiAction={"back"}
           onClick={onBackClick}
-          loadingSpinnerPosition={"left"}
+          loadingSpinnerPosition={"right"}
           hidden={!flowState.actions.back?.(null)}
         >
           {t("labels.back")}

diff --git a/frontend/elements/src/pages/LoginMethodChooser.tsx b/frontend/elements/src/pages/LoginMethodChooser.tsx
@@ -88,7 +88,6 @@ const LoginMethodChooserPage = (props: Props) => {
         >
           {t("labels.back")}
         </Link>
-        <span hidden />
       </Footer>
     </Fragment>
   );

diff --git a/frontend/elements/src/pages/ProfilePage.tsx b/frontend/elements/src/pages/ProfilePage.tsx
@@ -383,6 +383,7 @@ const ProfilePage = (props: Props) => {
             <ManageAuthAppDropdown
               onConnect={onAuthAppSetUp}
               onDelete={onAuthAppRemove}
+              allowDeletion={!!flowState.actions.otp_secret_delete?.(null)}
               authAppSetUp={flowState.payload.user.mfa_config?.auth_app_set_up}
               checkedItemID={checkedItemID}
               setCheckedItemID={setCheckedItemID}

diff --git a/frontend/elements/src/pages/RegisterPasskeyPage.tsx b/frontend/elements/src/pages/RegisterPasskeyPage.tsx
@@ -70,15 +70,15 @@ const RegisterPasskeyPage = (props: Props) => {
         <Link
           uiAction={"back"}
           onClick={onBackClick}
-          loadingSpinnerPosition={"left"}
+          loadingSpinnerPosition={"right"}
           hidden={!flowState.actions.back?.(null)}
         >
           {t("labels.back")}
         </Link>
         <Link
           uiAction={"skip"}
           onClick={onSkipClick}
-          loadingSpinnerPosition={"right"}
+          loadingSpinnerPosition={"left"}
           hidden={!flowState.actions.skip?.(null)}
         >
           {t("labels.skip")}