fix: Fix for history icons (#2680)

Co-authored-by: Dimple <[email protected]>
fylein · Jan 19, 2024 · 8b13a36 · 8b13a36
1 parent 4b7102d
commit 8b13a36
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 11 deletions.
diff --git a/src/app/core/services/status.service.ts b/src/app/core/services/status.service.ts
@@ -136,13 +136,13 @@ export class StatusService {
       case lowerCaseComment.indexOf('unflagged') > -1:
         statusCategory = {
           category: 'Unflagged',
-          icon: 'flag',
+          icon: 'flag-outline',
         };
         break;
       case lowerCaseComment.indexOf('flagged') > -1:
         statusCategory = {
           category: 'Flagged',
-          icon: 'flag',
+          icon: 'flag-fill',
         };
         break;
       case lowerCaseComment.indexOf('additional approvers are not present') > -1:

diff --git a/src/app/core/test-data/status.service.spec.data.ts b/src/app/core/test-data/status.service.spec.data.ts
@@ -942,7 +942,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [
     isOthersComment: true,
     st: {
       category: 'Flagged',
-      icon: 'flag',
+      icon: 'flag-fill',
     },
   },
   {
@@ -962,7 +962,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [
     isOthersComment: true,
     st: {
       category: 'Unflagged',
-      icon: 'flag',
+      icon: 'flag-outline',
     },
   },
   {
@@ -2097,7 +2097,7 @@ export const systemCommentsWithSt: ExtendedStatus[] = [
     show_dt: true,
     st: {
       category: 'Flagged',
-      icon: 'flag',
+      icon: 'flag-fill',
     },
   },
 ];
diff --git a/src/app/fyle/my-expenses-v2/my-expenses-v2.page.html b/src/app/fyle/my-expenses-v2/my-expenses-v2.page.html
@@ -73,7 +73,7 @@
     </ng-container>
     <ion-buttons mode="md" slot="end">
       <ion-button *ngIf="isMergeAllowed" (click)="mergeExpenses()">
-        <ion-icon src="../../../assets/svg/merge.svg"></ion-icon>
+        <ion-icon class="my-expenses--merge-icon" src="../../../assets/svg/merge.svg"></ion-icon>
       </ion-button>
       <ion-button (click)="openDeleteExpensesPopover()" [disabled]="isDisabled">
         <ion-icon src="../../../assets/svg/bin.svg"></ion-icon>

diff --git a/src/app/fyle/my-expenses-v2/my-expenses-v2.page.scss b/src/app/fyle/my-expenses-v2/my-expenses-v2.page.scss
@@ -322,4 +322,8 @@
       opacity: 0.8;
     }
   }
+
+  &--merge-icon {
+    color: $brand-primary;
+  }
 }
diff --git a/src/app/fyle/my-expenses/my-expenses.page.html b/src/app/fyle/my-expenses/my-expenses.page.html
@@ -73,7 +73,7 @@
     </ng-container>
     <ion-buttons mode="md" slot="end">
       <ion-button *ngIf="isMergeAllowed" (click)="mergeExpenses()">
-        <ion-icon src="../../../assets/svg/merge.svg"></ion-icon>
+        <ion-icon class="my-expenses--merge-icon" src="../../../assets/svg/merge.svg"></ion-icon>
       </ion-button>
       <ion-button
         (click)="openDeleteExpensesPopover()"

diff --git a/src/app/fyle/my-expenses/my-expenses.page.scss b/src/app/fyle/my-expenses/my-expenses.page.scss
@@ -322,4 +322,8 @@
       opacity: 0.8;
     }
   }
+
+  &--merge-icon {
+    color: $brand-primary;
+  }
 }
diff --git a/src/app/shared/components/comments-history/audit-history/audit-history.component.html b/src/app/shared/components/comments-history/audit-history/audit-history.component.html
@@ -12,8 +12,8 @@
             'audit-history--merge': estatus.st.icon === 'merge',
             'audit-history--success': estatus.st.icon === 'check-square-fill',
             'icon--alert-warning': estatus.st.icon === 'warning-fill',
-            'icon--flagged': estatus.st.category === 'Flagged',
-            'icon--unflagged': estatus.st.category === 'Unflagged',
+            'audit-history--flagged': estatus.st.category === 'Flagged',
+            'audit-history--unflagged': estatus.st.category === 'Unflagged',
             'audit-history--card-filled': estatus.st.category === ('Card Transaction Matched' || 'Expense Matched')
           }"
         ></mat-icon>

diff --git a/src/app/shared/components/comments-history/audit-history/audit-history.component.scss b/src/app/shared/components/comments-history/audit-history/audit-history.component.scss
@@ -79,4 +79,12 @@
   &--card-filled {
     color: $green;
   }
+
+  &--flagged {
+    color: $red;
+  }
+
+  &--unflagged {
+    color: $grey-light;
+  }
 }
diff --git a/src/app/shared/icon/icon.module.ts b/src/app/shared/icon/icon.module.ts
@@ -44,13 +44,16 @@ export class IconModule {
     'danger-fill.svg',
     'dashboard.svg',
     'duplicate.svg',
+    'edit.svg',
     'envelope.svg',
     'fyle-logo-dark.svg',
     'fyle-logo-light.svg',
     'file-lightning-indicator.svg',
     'file-pdf.svg',
     'filter-applied.svg',
     'filter.svg',
+    'flag-fill.svg',
+    'flag-outline.svg',
     'flash-off.svg',
     'flash-on.svg',
     'gear.svg',

diff --git a/src/assets/svg/merge.svg b/src/assets/svg/merge.svg