From de8c9243c40e2b126455ebb09e71eae92afa2826 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 25 Aug 2025 21:41:54 +0200
Subject: [PATCH] Move support to customize X-ray rules from experimental to
 general availability

---
 .../access-table/access-table.component.html  | 10 ++++--
 .../access-table/access-table.component.ts    |  8 +++--
 .../app/components/rule/rule.component.html   | 16 +++++++--
 .../src/app/components/rule/rule.component.ts |  4 +++
 .../portfolio/x-ray/x-ray-page.component.html | 36 +++++--------------
 5 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/apps/client/src/app/components/access-table/access-table.component.html b/apps/client/src/app/components/access-table/access-table.component.html
index 44aee1644..be374db9c 100644
--- a/apps/client/src/app/components/access-table/access-table.component.html
+++ b/apps/client/src/app/components/access-table/access-table.component.html
@@ -67,12 +67,18 @@
         <mat-menu #transactionMenu="matMenu" xPosition="before">
           @if (element.type === 'PUBLIC') {
             <button mat-menu-item (click)="onCopyUrlToClipboard(element.id)">
-              <ng-container i18n>Copy link to clipboard</ng-container>
+              <span class="align-items-center d-flex">
+                <ion-icon class="mr-2" name="copy-outline" />
+                <span i18n>Copy link to clipboard</span>
+              </span>
             </button>
             <hr class="my-0" />
           }
           <button mat-menu-item (click)="onDeleteAccess(element.id)">
-            <ng-container i18n>Revoke</ng-container>
+            <span class="align-items-center d-flex">
+              <ion-icon class="mr-2" name="remove-circle-outline" />
+              <span i18n>Revoke</span>
+            </span>
           </button>
         </mat-menu>
       </td>
diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.ts
index c94f86df1..9f32be650 100644
--- a/apps/client/src/app/components/access-table/access-table.component.ts
+++ b/apps/client/src/app/components/access-table/access-table.component.ts
@@ -22,10 +22,12 @@ import { RouterModule } from '@angular/router';
 import { IonIcon } from '@ionic/angular/standalone';
 import { addIcons } from 'ionicons';
 import {
+  copyOutline,
   ellipsisHorizontal,
   linkOutline,
   lockClosedOutline,
-  lockOpenOutline
+  lockOpenOutline,
+  removeCircleOutline
 } from 'ionicons/icons';
 import ms from 'ms';
 
@@ -62,10 +64,12 @@ export class GfAccessTableComponent implements OnChanges {
     private snackBar: MatSnackBar
   ) {
     addIcons({
+      copyOutline,
       ellipsisHorizontal,
       linkOutline,
       lockClosedOutline,
-      lockOpenOutline
+      lockOpenOutline,
+      removeCircleOutline
     });
   }
 
diff --git a/apps/client/src/app/components/rule/rule.component.html b/apps/client/src/app/components/rule/rule.component.html
index 7cea512e3..239beb733 100644
--- a/apps/client/src/app/components/rule/rule.component.html
+++ b/apps/client/src/app/components/rule/rule.component.html
@@ -64,14 +64,24 @@
           <mat-menu #rulesMenu="matMenu" xPosition="before">
             @if (rule?.isActive && rule?.configuration) {
               <button mat-menu-item (click)="onCustomizeRule(rule)">
-                <ng-container i18n>Customize</ng-container>...
+                <span class="align-items-center d-flex">
+                  <ion-icon class="mr-2" name="options-outline" />
+                  <span><ng-container i18n>Customize</ng-container>...</span>
+                </span>
               </button>
+              <hr class="my-0" />
             }
             <button mat-menu-item (click)="onUpdateRule(rule)">
               @if (rule?.isActive) {
-                <ng-container i18n>Deactivate</ng-container>
+                <span class="align-items-center d-flex">
+                  <ion-icon class="mr-2" name="remove-circle-outline" />
+                  <span i18n>Deactivate</span>
+                </span>
               } @else {
-                <ng-container i18n>Activate</ng-container>
+                <span class="align-items-center d-flex">
+                  <ion-icon class="mr-2" name="add-circle-outline" />
+                  <span i18n>Activate</span>
+                </span>
               }
             </button>
           </mat-menu>
diff --git a/apps/client/src/app/components/rule/rule.component.ts b/apps/client/src/app/components/rule/rule.component.ts
index 4ea7d0ec6..624338915 100644
--- a/apps/client/src/app/components/rule/rule.component.ts
+++ b/apps/client/src/app/components/rule/rule.component.ts
@@ -16,8 +16,10 @@ import {
 import { MatDialog } from '@angular/material/dialog';
 import { addIcons } from 'ionicons';
 import {
+  addCircleOutline,
   checkmarkCircleOutline,
   ellipsisHorizontal,
+  optionsOutline,
   removeCircleOutline,
   warningOutline
 } from 'ionicons/icons';
@@ -50,8 +52,10 @@ export class RuleComponent implements OnInit {
     private dialog: MatDialog
   ) {
     addIcons({
+      addCircleOutline,
       checkmarkCircleOutline,
       ellipsisHorizontal,
+      optionsOutline,
       removeCircleOutline,
       warningOutline
     });
diff --git a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html
index e309fbaea..ce55c4fff 100644
--- a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html
+++ b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html
@@ -73,9 +73,7 @@
         </h4>
         <gf-rules
           [hasPermissionToUpdateUserSettings]="
-            !hasImpersonationId &&
-            hasPermissionToUpdateUserSettings &&
-            user?.settings?.isExperimentalFeatures
+            !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
           [isLoading]="isLoading"
           [rules]="liquidityRules"
@@ -97,9 +95,7 @@
         </h4>
         <gf-rules
           [hasPermissionToUpdateUserSettings]="
-            !hasImpersonationId &&
-            hasPermissionToUpdateUserSettings &&
-            user?.settings?.isExperimentalFeatures
+            !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
           [isLoading]="isLoading"
           [rules]="emergencyFundRules"
@@ -121,9 +117,7 @@
         </h4>
         <gf-rules
           [hasPermissionToUpdateUserSettings]="
-            !hasImpersonationId &&
-            hasPermissionToUpdateUserSettings &&
-            user?.settings?.isExperimentalFeatures
+            !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
           [isLoading]="isLoading"
           [rules]="currencyClusterRiskRules"
@@ -145,9 +139,7 @@
         </h4>
         <gf-rules
           [hasPermissionToUpdateUserSettings]="
-            !hasImpersonationId &&
-            hasPermissionToUpdateUserSettings &&
-            user?.settings?.isExperimentalFeatures
+            !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
           [isLoading]="isLoading"
           [rules]="assetClassClusterRiskRules"
@@ -169,9 +161,7 @@
         </h4>
         <gf-rules
           [hasPermissionToUpdateUserSettings]="
-            !hasImpersonationId &&
-            hasPermissionToUpdateUserSettings &&
-            user?.settings?.isExperimentalFeatures
+            !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
           [isLoading]="isLoading"
           [rules]="accountClusterRiskRules"
@@ -193,9 +183,7 @@
         </h4>
         <gf-rules
           [hasPermissionToUpdateUserSettings]="
-            !hasImpersonationId &&
-            hasPermissionToUpdateUserSettings &&
-            user?.settings?.isExperimentalFeatures
+            !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
           [isLoading]="isLoading"
           [rules]="economicMarketClusterRiskRules"
@@ -217,9 +205,7 @@
         </h4>
         <gf-rules
           [hasPermissionToUpdateUserSettings]="
-            !hasImpersonationId &&
-            hasPermissionToUpdateUserSettings &&
-            user?.settings?.isExperimentalFeatures
+            !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
           [isLoading]="isLoading"
           [rules]="regionalMarketClusterRiskRules"
@@ -241,9 +227,7 @@
         </h4>
         <gf-rules
           [hasPermissionToUpdateUserSettings]="
-            !hasImpersonationId &&
-            hasPermissionToUpdateUserSettings &&
-            user?.settings?.isExperimentalFeatures
+            !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
           [isLoading]="isLoading"
           [rules]="feeRules"
@@ -256,9 +240,7 @@
           <h4 class="m-0" i18n>Inactive</h4>
           <gf-rules
             [hasPermissionToUpdateUserSettings]="
-              !hasImpersonationId &&
-              hasPermissionToUpdateUserSettings &&
-              user?.settings?.isExperimentalFeatures
+              !hasImpersonationId && hasPermissionToUpdateUserSettings
             "
             [isLoading]="isLoading"
             [rules]="inactiveRules"