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/savings/savings-account-view/savings-account-view.component.ts

@@ -122,6 +122,7 @@ export class SavingsAccountViewComponent implements OnInit {
     'Add Charge': 'admin',
     'Apply Annual Fees': 'admin',
     'Modify Application': 'admin',
+    'Edit Nominee & Features': 'admin',
     'Assign Staff': 'admin',
     'Unassign Staff': 'admin',
     Approve: 'admin',
@@ -156,6 +157,7 @@ export class SavingsAccountViewComponent implements OnInit {
     'Add Charge': 'plus-circle',
     'Apply Annual Fees': 'receipt',
     'Modify Application': 'edit',
+    'Edit Nominee & Features': 'edit',
     'Assign Staff': 'user-plus',
     'Unassign Staff': 'user-slash',
     Approve: 'check-circle',
@@ -311,6 +313,9 @@ export class SavingsAccountViewComponent implements OnInit {
       case 'Modify Application':
         this.router.navigate(['edit'], { relativeTo: this.route });
         break;
+      case 'Edit Nominee & Features':
+        this.router.navigate(['edit-nominee-features'], { relativeTo: this.route });
+        break;
       case 'Delete':
         this.deleteSavingsAccount();
         break;

src/app/savings/savings-account-view/savings-buttons.config.ts

@@ -161,6 +161,10 @@ export class SavingsButtonsConfiguration {
     switch (status) {
       case 'Active':
         this.optionArray = [
+          {
+            name: 'Edit Nominee & Features',
+            taskPermissionName: 'SUBMITEDIT_SAVINGSACCOUNT'
+          },
           {
             name: 'Post Interest',
             taskPermissionName: 'POSTINTEREST_SAVINGSACCOUNT'