From 40dc5336e68f9e0fa7b205f96ad76a79813315f0 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Wed, 17 Aug 2022 10:29:58 +0300
Subject: [PATCH 1/2] UI: Fixed revert in 2FA login form, not show Resend code
 button

---
 .../login/pages/login/two-factor-auth-login.component.ts       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/modules/login/pages/login/two-factor-auth-login.component.ts b/ui-ngx/src/app/modules/login/pages/login/two-factor-auth-login.component.ts
index 2a98f0b530..dfedf674a3 100644
--- a/ui-ngx/src/app/modules/login/pages/login/two-factor-auth-login.component.ts
+++ b/ui-ngx/src/app/modules/login/pages/login/two-factor-auth-login.component.ts
@@ -187,8 +187,7 @@ export class TwoFactorAuthLoginComponent extends PageComponent implements OnInit
 
   cancelLogin() {
     if (this.prevProvider) {
-      this.selectedProvider = this.prevProvider;
-      this.prevProvider = null;
+      this.selectProvider(this.prevProvider);
     } else {
       this.authService.logout();
     }

From a260fd6fd60dffffc634f05bd90e9eca7d02a81f Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Wed, 17 Aug 2022 10:32:55 +0300
Subject: [PATCH 2/2] UI: Improvement 2FA admin settings form

---
 .../home/pages/admin/two-factor-auth-settings.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.html
index e8d64ae68b..d658de9589 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.html
@@ -40,8 +40,8 @@
                       <mat-slide-toggle
                         (click)="toggleExtensionPanel($event, i, provider.get('enable').value)"
                         formControlName="enable">
+                        {{ twoFactorAuthProvidersData.get(provider.value.providerType).name | translate }}
                       </mat-slide-toggle>
-                      {{ twoFactorAuthProvidersData.get(provider.value.providerType).name | translate }}
                     </mat-panel-title>
                   </mat-expansion-panel-header>