Merge pull request #500 from rahulramakrishnan3/release-3.0.0

BUG fix : 1338
ELEVATE-Project · May 23, 2024 · 763eb35 · 763eb35
2 parents a57907b + b5596ab
commit 763eb35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/app/modules/auth/otp/otp.page.html b/src/app/modules/auth/otp/otp.page.html
@@ -15,7 +15,7 @@
       </section>
       <section>
         <div class="d-flex flex-justify-center flex-align-items-center">
-          <ion-button [ngClass]="{'my-10': true, 'disabled': !recaptchaResolved , 'onboard-button':true}" [disabled]="!recaptchaResolved"
+          <ion-button [ngClass]="{'my-10': true, 'disabled': !recaptchaResolved && !enableGeneratetOtp, 'onboard-button':true}" [disabled]="!recaptchaResolved && !enableGeneratetOtp"
             (click)="onSubmitGenerateOtp()" shape="round">
             {{'GENERATE_OTP'|translate}}
           </ion-button>

diff --git a/src/app/modules/auth/otp/otp.page.ts b/src/app/modules/auth/otp/otp.page.ts
@@ -49,6 +49,7 @@ export class OtpPage implements OnInit {
   captchaToken:any="";
   recaptchaResolved: boolean = this.siteKey ? false : true;
   showOtp:any = false;
+  enableGeneratetOtp: boolean = false;
 
 
   constructor(private router: Router, private profileService: ProfileService,private location: Location, private activatedRoute: ActivatedRoute, private localStorage: LocalStorageService, private translateService: TranslateService, private authService: AuthService, private toast: ToastService, private menuCtrl: MenuController, private nav: NavController) {
@@ -119,7 +120,8 @@ export class OtpPage implements OnInit {
   async resendOtp() {
     this.enableResendOtp = false;
     this.showOtp = false;
-    this.recaptchaResolved = false
+    this.recaptchaResolved = false;
+    this.enableGeneratetOtp = this.siteKey ? false : true;
   }
 
   async onSubmitGenerateOtp(){

diff --git a/src/app/shared/components/generic-profile-header/generic-profile-header.component.ts b/src/app/shared/components/generic-profile-header/generic-profile-header.component.ts
@@ -20,15 +20,13 @@ export class GenericProfileHeaderComponent implements OnInit {
   labels = ["CHECK_OUT_MENTOR","PROFILE_ON_MENTORED_EXPLORE_THE_SESSIONS"];
 
   public isMobile:any;
-  user: any;
   roles: any;
 
   constructor(private router:Router,private localStorage:LocalStorageService, private profileService: ProfileService, private utilService:UtilService,private toast: ToastService, private translateService: TranslateService,) {
     this.isMobile = utilService.isMobile()
    }
 
   async ngOnInit() {
-    this.user = await this.localStorage.getLocalData(localKeys.USER_DETAILS)
     this.roles = this.headerData.user_roles;
   }
 
@@ -39,7 +37,7 @@ export class GenericProfileHeaderComponent implements OnInit {
         break;
 
       case 'role':
-        if(this.user?.about != null){
+        if(this.headerData?.about != null){
           this.router.navigate([`/${CommonRoutes.MENTOR_QUESTIONNAIRE}`]);   
         } else{
           this.profileService.upDateProfilePopup()