Merge remote-tracking branch 'nexora/uate' into merge-uate-into-dev

# Conflicts:
#	src/app/core/shell/shell.component.html
#	src/app/tasks/tasks-routing.module.ts
#	src/environments/.env.ts

src/app/tasks/tasks-routing.module.ts

@@ -28,6 +28,7 @@ import { RejectedAccountComponent } from './checker-inbox-and-tasks-tabs/rejecte
 import { TerminatedAccountComponent } from './checker-inbox-and-tasks-tabs/terminated-account/terminated-account.component';
 import { PendingSavingsProductsComponent } from './checker-inbox-and-tasks-tabs/pending-savings-products/pending-savings-products.component';
 import { ChequebookRequestsComponent } from './checker-inbox-and-tasks-tabs/chequebook-requests/chequebook-requests.component';
+import { PendingSavingsAccountEditsComponent } from './checker-inbox-and-tasks-tabs/pending-savings-account-edits/pending-savings-account-edits.component';
 import { ViewCheckerInboxComponent } from './view-checker-inbox/view-checker-inbox.component';
 
 /** Custom Resolvers */
@@ -43,6 +44,8 @@ import { GetPendingAccounts } from './common-resolvers/getPendingAccounts.resolv
 import { GetRejectedAccounts } from './common-resolvers/getRejectedAccounts.resolver';
 import { GetTerminatedAccounts } from './common-resolvers/getTerminatedAccounts.resolver';
 import { GetPendingSavingsProducts } from './common-resolvers/getPendingSavingsProducts.resolver';
+import { GetPendingSavingsAccountEdits } from './common-resolvers/getPendingSavingsAccountEdits.resolver';
+import { GetPendingCurrentAccountEdits } from './common-resolvers/getPendingCurrentAccountEdits.resolver';
 
 /** Tasks Routes */
 const routes: Routes = [
@@ -126,6 +129,19 @@ const routes: Routes = [
             pendingSavingsProductsData: GetPendingSavingsProducts
           }
         },
+        {
+          path: 'pending-savings-account-edits',
+          component: PendingSavingsAccountEditsComponent,
+          data: { title: 'Pending Account Edits' },
+          resolve: {
+            pendingSavingsAccountEditsData: GetPendingSavingsAccountEdits,
+            pendingCurrentAccountEditsData: GetPendingCurrentAccountEdits
+          }
+        },
+        {
+          path: 'pending-current-account-edits',
+          redirectTo: 'pending-savings-account-edits'
+        },
         {
           path: 'withdrawal-requests',
           component: WithdrawalRequestsComponent,
@@ -203,7 +219,9 @@ const routes: Routes = [
     GetPendingAccounts,
     GetRejectedAccounts,
     GetTerminatedAccounts,
-    GetPendingSavingsProducts
+    GetPendingSavingsProducts,
+    GetPendingSavingsAccountEdits,
+    GetPendingCurrentAccountEdits
   ]
 })
 export class TasksRoutingModule {}