diff --git a/src/app/auth/disabled/disabled.page.html b/src/app/auth/disabled/disabled.page.html index 6c94fb92aa..25c4b2f96c 100644 --- a/src/app/auth/disabled/disabled.page.html +++ b/src/app/auth/disabled/disabled.page.html @@ -25,7 +25,7 @@

Account disabled

>
- Back to Sign In + Back to sign in
diff --git a/src/app/auth/new-password/new-password.page.html b/src/app/auth/new-password/new-password.page.html index f0d762fc01..e4955fc821 100644 --- a/src/app/auth/new-password/new-password.page.html +++ b/src/app/auth/new-password/new-password.page.html @@ -7,7 +7,7 @@ (click)="redirectToSignIn()" >
-
Reset Password
+
Reset password
@@ -101,7 +101,7 @@
- Back to Sign In + Back to sign in
diff --git a/src/app/auth/new-password/new-password.page.scss b/src/app/auth/new-password/new-password.page.scss index 4e019f5da8..4341395b5c 100644 --- a/src/app/auth/new-password/new-password.page.scss +++ b/src/app/auth/new-password/new-password.page.scss @@ -19,6 +19,8 @@ &__error { color: $red; font-size: 12px; + display: flex; + align-items: center; } &__text { @@ -75,6 +77,7 @@ position: relative; margin-bottom: 24px; color: $black; + font-weight: 500; } &__save { diff --git a/src/app/auth/pending-verification/pending-verification.page.html b/src/app/auth/pending-verification/pending-verification.page.html index e64f4377fe..317f9d0cad 100644 --- a/src/app/auth/pending-verification/pending-verification.page.html +++ b/src/app/auth/pending-verification/pending-verification.page.html @@ -16,7 +16,7 @@
-
Registered Email
+
Registered email
Send invite @@ -84,7 +87,7 @@

Invitation link sent

[src]="'/assets/svg/arrow-left.svg'" slot="icon-only" > - Back to Sign In + Back to sign in diff --git a/src/app/auth/pending-verification/pending-verification.page.scss b/src/app/auth/pending-verification/pending-verification.page.scss index c3629205b6..18f0553f15 100644 --- a/src/app/auth/pending-verification/pending-verification.page.scss +++ b/src/app/auth/pending-verification/pending-verification.page.scss @@ -45,6 +45,7 @@ margin: 0 0 10px; position: relative; margin-bottom: 8px; + font-weight: 500; } &__disabled { @@ -62,6 +63,9 @@ &__error-message { color: $red; + font-size: 12px; + display: flex; + align-items: center; } &__input-container { diff --git a/src/app/auth/reset-password/reset-password.page.html b/src/app/auth/reset-password/reset-password.page.html index bbb507518b..2a3722c334 100644 --- a/src/app/auth/reset-password/reset-password.page.html +++ b/src/app/auth/reset-password/reset-password.page.html @@ -8,7 +8,7 @@ (click)="onGotoSignInClick()" >
-
Forgot Password
+
Forgot password
Please enter your registered email address to receive instructions for resetting your password
@@ -25,7 +25,7 @@ class="forgot-password__input-container__input" />
- Please enter a valid email. + Enter an email address.
@@ -85,7 +85,7 @@

Check your email

[src]="'/assets/svg/arrow-left.svg'" slot="icon-only" > - Back to Sign In + Back to sign in diff --git a/src/app/auth/reset-password/reset-password.page.scss b/src/app/auth/reset-password/reset-password.page.scss index fabbac38e1..1e73b237ee 100644 --- a/src/app/auth/reset-password/reset-password.page.scss +++ b/src/app/auth/reset-password/reset-password.page.scss @@ -17,7 +17,8 @@ font-size: 20px; margin: 0 0 10px; position: relative; - margin-bottom: 24px; + margin-bottom: 6px; + font-weight: 500; } &__disabled { @@ -34,6 +35,8 @@ &__error-message { color: $red; + display: flex; + align-items: center; } &__input-container { diff --git a/src/app/auth/reset-password/reset-password.page.spec.ts b/src/app/auth/reset-password/reset-password.page.spec.ts index 4485fe9812..931329254f 100644 --- a/src/app/auth/reset-password/reset-password.page.spec.ts +++ b/src/app/auth/reset-password/reset-password.page.spec.ts @@ -110,7 +110,7 @@ describe('ResetPasswordPage', () => { fixture.detectChanges(); const errorElement = getElementRef(fixture, '.forgot-password__error-message'); - expect(errorElement.nativeElement.textContent).toContain('Please enter a valid email.'); + expect(errorElement.nativeElement.textContent).toContain(' Enter an email address. '); }); it('should call sendResetLink with correct email when button is clicked', () => { diff --git a/src/app/auth/reset-password/reset-password.page.ts b/src/app/auth/reset-password/reset-password.page.ts index 56124928e4..17f7740976 100644 --- a/src/app/auth/reset-password/reset-password.page.ts +++ b/src/app/auth/reset-password/reset-password.page.ts @@ -59,7 +59,18 @@ export class ResetPasswordPage { }) ) .subscribe({ - next: () => (this.currentPageState = PageState.success), + next: () => { + this.currentPageState = PageState.success; + if (this.isEmailSentOnce) { + const toastMessageData = { + message: ' Password recovery email sent successfully.', + }; + this.matSnackBar.openFromComponent(ToastMessageComponent, { + ...this.snackbarProperties.setSnackbarProperties('success', toastMessageData), + panelClass: ['msb-success'], + }); + } + }, error: (err: { status: number }) => this.handleError(err), }); } diff --git a/src/app/auth/verify/verify.page.scss b/src/app/auth/verify/verify.page.scss index 6a21b379b0..f99d8b9b08 100644 --- a/src/app/auth/verify/verify.page.scss +++ b/src/app/auth/verify/verify.page.scss @@ -25,10 +25,13 @@ justify-content: center; &__verifying-loader { - @include loader; &__icon { + @include loader; fill: $brand-primary; + height: 40px; + width: 40px; } + &__text { margin-top: 8px; color: $black; diff --git a/src/app/core/services/loader.service.spec.ts b/src/app/core/services/loader.service.spec.ts index 69abf7aac9..77aba8167a 100644 --- a/src/app/core/services/loader.service.spec.ts +++ b/src/app/core/services/loader.service.spec.ts @@ -37,7 +37,7 @@ describe('LoaderService', () => { message, duration, spinner: 'crescent', - cssClass: '', + cssClass: 'intermediate-loader', }); expect(loadingElementSpy.present).toHaveBeenCalledTimes(1); })); diff --git a/src/app/core/services/loader.service.ts b/src/app/core/services/loader.service.ts index e8bd7d1ce6..b81ce4717d 100644 --- a/src/app/core/services/loader.service.ts +++ b/src/app/core/services/loader.service.ts @@ -13,7 +13,7 @@ export class LoaderService { message, duration, spinner: customLoaderUrl ? null : 'crescent', - cssClass: customLoaderUrl ? 'custom-loading' : '', + cssClass: customLoaderUrl ? 'custom-loading' : 'intermediate-loader', }); if (customLoaderUrl) { diff --git a/src/app/post-verification/invited-user/invited-user.page.html b/src/app/post-verification/invited-user/invited-user.page.html index 30a38f766f..37410feda5 100644 --- a/src/app/post-verification/invited-user/invited-user.page.html +++ b/src/app/post-verification/invited-user/invited-user.page.html @@ -15,7 +15,7 @@ class="invited-user__text invited-user__text-block" [ngClass]="{'invited-user__text__invalid': fg.controls.fullName.touched && !fg.controls.fullName.valid}" > -
Full Name
+
Full name
@@ -72,7 +72,7 @@ class="invited-user__text invited-user__text-block" [ngClass]="{'invited-user__text__invalid': fg.controls.confirmPassword.touched && !fg.controls.confirmPassword.valid}" > -
Confirm Password
+
Confirm password
@@ -100,7 +100,7 @@ Password cannot be empty
Passwords do not match diff --git a/src/app/post-verification/invited-user/invited-user.page.scss b/src/app/post-verification/invited-user/invited-user.page.scss index 4ed41a982b..9fc661579a 100644 --- a/src/app/post-verification/invited-user/invited-user.page.scss +++ b/src/app/post-verification/invited-user/invited-user.page.scss @@ -19,6 +19,8 @@ &__error { color: $red; font-size: 12px; + display: flex; + align-items: center; } &__text { @@ -76,6 +78,7 @@ position: relative; margin-bottom: 24px; color: $black; + font-weight: 500; } &__save { diff --git a/src/app/post-verification/invited-user/invited-user.page.ts b/src/app/post-verification/invited-user/invited-user.page.ts index 39e57aad9b..c81885eb4c 100644 --- a/src/app/post-verification/invited-user/invited-user.page.ts +++ b/src/app/post-verification/invited-user/invited-user.page.ts @@ -94,7 +94,7 @@ export class InvitedUserPage implements OnInit { this.isLoading = true; this.fg.markAllAsTouched(); if (this.fg.valid) { - from(this.loaderService.showLoader()) + from(this.loaderService.showLoader('Signing in...')) .pipe( switchMap(() => this.eou$), switchMap((eou) => {