Merge branch 'master' into FYLE-86cxkwzq3

Author: arjunaj5

.github/workflows/lint.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    types: [opened, synchronize, edited]
+    types: [opened, synchronize]
 
 jobs:
   run-linters:

.github/workflows/main.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [master]
   pull_request:
-    types: [opened, synchronize, edited]
+    types: [opened, synchronize]
 
 jobs:
   build:

.github/workflows/stats.yml

@@ -257,6 +257,7 @@ export class SignInPage implements OnInit {
           this.fg.reset();
           this.router.navigate(['/', 'auth', 'switch_org', { choose: true }]);
         },
+        error: (err: HttpErrorResponse) => this.handleError(err),
       });
   }
 

.github/workflows/unit-tests.yml

@@ -7,10 +7,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { RouterAuthService } from 'src/app/core/services/router-auth.service';
 import { AuthService } from 'src/app/core/services/auth.service';
 import { TrackingService } from 'src/app/core/services/tracking.service';
-import { of, throwError } from 'rxjs';
+import { of } from 'rxjs';
 import { apiEouRes } from 'src/app/core/mock-data/extended-org-user.data';
-import { getElementBySelector, getTextContent } from 'src/app/core/dom-helpers';
-import { VerifyPageState } from './verify.enum';
 import { UserEventService } from 'src/app/core/services/user-event.service';
 
 describe('VerifyPage', () => {
@@ -25,7 +23,7 @@ describe('VerifyPage', () => {
   beforeEach(waitForAsync(() => {
     const routerSpy = jasmine.createSpyObj('Router', ['navigate']);
     const routerAuthServiceSpy = jasmine.createSpyObj('RouterAuthService', ['emailVerify']);
-    const authServiceSpy = jasmine.createSpyObj('AuthService', ['newRefreshToken']);
+    const authServiceSpy = jasmine.createSpyObj('AuthService', ['refreshEou']);
     const trackingServiceSpy = jasmine.createSpyObj('TrackingService', ['emailVerified', 'onSignin']);
     const userEventServiceSpy = jasmine.createSpyObj('UserEventService', ['logout']);
 
@@ -81,7 +79,7 @@ describe('VerifyPage', () => {
     it('should navigate to switch_org route when verification is successful', () => {
       const mockResponse = { refresh_token: 'xyz123' };
       routerAuthService.emailVerify.and.returnValue(of(mockResponse));
-      authService.newRefreshToken.and.returnValue(of(apiEouRes));
+      authService.refreshEou.and.returnValue(of(apiEouRes));
       fixture.detectChanges();
       expect(trackingService.emailVerified).toHaveBeenCalledTimes(1);
       expect(trackingService.onSignin).toHaveBeenCalledOnceWith('[email protected]');

src/app/auth/sign-in/sign-in.page.ts

@@ -26,7 +26,7 @@ export class VerifyPage implements OnInit {
     this.routerAuthService
       .emailVerify(verificationCode)
       .pipe(
-        switchMap((resp) => this.authService.newRefreshToken(resp.refresh_token)),
+        switchMap(() => this.authService.refreshEou()),
         tap((eou) => {
           this.trackingService.emailVerified();
           this.trackingService.onSignin(eou.us.email);

src/app/auth/verify/verify.page.spec.ts

@@ -24,7 +24,7 @@ export const actionSheetOptionsData = deepFreeze([
 ]);
 export const expectedActionSheetButtonRes = deepFreeze([
   {
-    text: 'Capture Receipt',
+    text: 'Capture receipt',
     icon: 'assets/svg/camera.svg',
     cssClass: 'capture-receipt',
     handler: undefined,
@@ -51,7 +51,7 @@ export const expectedActionSheetButtonRes = deepFreeze([
 
 export const expectedActionSheetButtonsWithMileage = deepFreeze([
   {
-    text: 'Capture Receipt',
+    text: 'Capture receipt',
     icon: 'assets/svg/camera.svg',
     cssClass: 'capture-receipt',
     handler: undefined,
@@ -72,7 +72,7 @@ export const expectedActionSheetButtonsWithMileage = deepFreeze([
 
 export const expectedActionSheetButtonsWithPerDiem = deepFreeze([
   {
-    text: 'Capture Receipt',
+    text: 'Capture receipt',
     icon: 'assets/svg/camera.svg',
     cssClass: 'capture-receipt',
     handler: undefined,

src/app/auth/verify/verify.page.ts

@@ -24,23 +24,23 @@ export const filterOptions: FilterOptions<string>[] = deepFreeze([
     ],
   },
   {
-    name: 'Sort By',
+    name: 'Sort by',
     optionType: FilterOptionType.singleselect,
     options: [
       {
-        label: 'Created At - New to Old',
+        label: 'Created date - New to Old',
         value: SortingValue.creationDateAsc,
       },
       {
-        label: 'Created At - Old to New',
+        label: 'Created date - Old to New',
         value: SortingValue.creationDateDesc,
       },
       {
-        label: 'Approved At - New to Old',
+        label: 'Approved date - New to Old',
         value: SortingValue.approvalDateAsc,
       },
       {
-        label: 'Approved At - Old to New',
+        label: 'Approved date - Old to New',
         value: SortingValue.approvalDateDesc,
       },
       {
@@ -151,7 +151,7 @@ export const filterOptions2: FilterOptions<string>[] = deepFreeze([
     ],
   },
   {
-    name: 'Sort By',
+    name: 'Sort by',
     optionType: FilterOptionType.singleselect,
     options: [
       {
@@ -278,7 +278,7 @@ export const filterOptions3: FilterOptions<string>[] = deepFreeze([
     ],
   },
   {
-    name: 'Sort By',
+    name: 'Sort by',
     optionType: FilterOptionType.singleselect,
     options: [
       {

src/app/core/mock-data/action-sheet-options.data.ts

@@ -75,7 +75,7 @@ export const expectedFilterPill1: FilterPill[] = deepFreeze([
     value: 'Per Diem, Mileage',
   },
   {
-    label: 'Sort By',
+    label: 'Sort by',
     type: 'sort',
     value: 'category - a to z',
   },
@@ -98,7 +98,7 @@ export const expectedFilterPill2: FilterPill[] = deepFreeze([
     value: 'yes',
   },
   {
-    label: 'Sort By',
+    label: 'Sort by',
     type: 'sort',
     value: 'category - a to z',
   },
@@ -142,7 +142,7 @@ export const typeFilterPill: FilterPill = deepFreeze({
 });
 
 export const sortFilterPill: FilterPill = deepFreeze({
-  label: 'Sort By',
+  label: 'Sort by',
   type: 'sort',
   value: 'category - a to z',
 });
@@ -170,31 +170,31 @@ export const filterTypeMappings: FilterPill[] = deepFreeze([
 
 export const sortByDescFilterPill: FilterPill[] = deepFreeze([
   {
-    label: 'Sort By',
+    label: 'Sort by',
     type: 'sort',
     value: 'amount - high to low',
   },
 ]);
 
 export const sortByAscFilterPill: FilterPill[] = deepFreeze([
   {
-    label: 'Sort By',
+    label: 'Sort by',
     type: 'sort',
     value: 'amount - low to high',
   },
 ]);
 
 export const sortByDateAscFilterPill: FilterPill[] = deepFreeze([
   {
-    label: 'Sort By',
+    label: 'Sort by',
     type: 'sort',
     value: 'date - old to new',
   },
 ]);
 
 export const sortByDateDescFilterPill: FilterPill[] = deepFreeze([
   {
-    label: 'Sort By',
+    label: 'Sort by',
     type: 'sort',
     value: 'date - new to old',
   },