fix: Fix for recent icons related changes (#2673)

Co-authored-by: Dimple <dimple.kh@fyle.in>
fylein · Jan 18, 2024 · 4b7102d · 4b7102d
1 parent 41b41db
commit 4b7102d
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 23 deletions.
diff --git a/src/app/core/mock-data/action-sheet-options.data.ts b/src/app/core/mock-data/action-sheet-options.data.ts
@@ -29,7 +29,7 @@ export const expectedActionSheetButtonRes = [
   },
   {
     text: 'Add Manually',
-    icon: 'assets/svg/expense.svg',
+    icon: 'assets/svg/list.svg',
     cssClass: 'capture-receipt',
     handler: undefined,
   },
@@ -56,7 +56,7 @@ export const expectedActionSheetButtonsWithMileage = [
   },
   {
     text: 'Add Manually',
-    icon: 'assets/svg/expense.svg',
+    icon: 'assets/svg/list.svg',
     cssClass: 'capture-receipt',
     handler: undefined,
   },
@@ -77,7 +77,7 @@ export const expectedActionSheetButtonsWithPerDiem = [
   },
   {
     text: 'Add Manually',
-    icon: 'assets/svg/expense.svg',
+    icon: 'assets/svg/list.svg',
     cssClass: 'capture-receipt',
     handler: undefined,
   },

diff --git a/src/app/core/models/task-icon.enum.ts b/src/app/core/models/task-icon.enum.ts
@@ -1,5 +1,5 @@
 export enum TaskIcon {
-  REPORT = 'expense',
+  REPORT = 'list',
   WARNING = 'warning-outline',
   ADVANCE = 'wallet',
   MOBILE = 'phone',

diff --git a/src/app/fyle/dashboard/dashboard.page.ts b/src/app/fyle/dashboard/dashboard.page.ts
@@ -255,7 +255,7 @@ export class DashboardPage {
       },
       {
         text: 'Add Manually',
-        icon: 'assets/svg/expense.svg',
+        icon: 'assets/svg/list.svg',
         cssClass: 'capture-receipt',
         handler: this.actionSheetButtonsHandler('Add Manually', 'add_edit_expense'),
       },

diff --git a/src/app/fyle/dashboard/tasks/tasks-card/tasks-card.component.html b/src/app/fyle/dashboard/tasks/tasks-card/tasks-card.component.html
@@ -9,7 +9,7 @@
                 class="task--icon"
                 [ngClass]="{
                   'task--icon__warning': task.icon === 'warning-outline',
-                  'task--icon__expense': task.icon === 'expense',
+                  'task--icon__expense': task.icon === 'list',
                   'task--icon__advance': task.icon === 'wallet',
                   'task--icon__mobile': task.icon === 'phone'
                 }"

diff --git a/src/app/fyle/my-expenses-v2/add-expense-popover/add-expense-popover.component.html b/src/app/fyle/my-expenses-v2/add-expense-popover/add-expense-popover.component.html
@@ -13,7 +13,7 @@
     <div>
       <img
         class="add-expense-popover-internal--icon"
-        src="../../../../assets/svg/create-expense.svg"
+        src="../../../../assets/svg/create-list.svg"
         alt="createExpense"
       />
     </div>

diff --git a/src/app/fyle/my-expenses-v2/my-expenses-v2.page.ts b/src/app/fyle/my-expenses-v2/my-expenses-v2.page.ts
@@ -379,7 +379,7 @@ export class MyExpensesV2Page implements OnInit {
       },
       {
         text: 'Add Manually',
-        icon: 'assets/svg/expense.svg',
+        icon: 'assets/svg/list.svg',
         cssClass: 'capture-receipt',
         handler: this.actionSheetButtonsHandler('Add Expense', 'add_edit_expense'),
       },

diff --git a/src/app/fyle/my-expenses/my-expenses.page.ts b/src/app/fyle/my-expenses/my-expenses.page.ts
@@ -358,7 +358,7 @@ export class MyExpensesPage implements OnInit {
       },
       {
         text: 'Add Manually',
-        icon: 'assets/svg/expense.svg',
+        icon: 'assets/svg/list.svg',
         cssClass: 'capture-receipt',
         handler: this.actionSheetButtonsHandler('Add Expense', 'add_edit_expense'),
       },

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
@@ -44,7 +44,7 @@
   }
 
   &--success {
-    fill: $green !important;
+    color: $green !important;
   }
 
   &--timestamp {

diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.html b/src/app/shared/components/expenses-card-v2/expenses-card.component.html
@@ -103,7 +103,7 @@
             <ion-icon
               class="expenses-card--receipt-icon"
               *ngIf="!expense.file_ids?.length"
-              [src]="'../../../../assets/svg/expense.svg'"
+              [src]="'../../../../assets/svg/list.svg'"
             ></ion-icon>
           </div>
         </ng-template>

diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.spec.ts b/src/app/shared/components/expenses-card-v2/expenses-card.component.spec.ts
@@ -254,7 +254,7 @@ describe('ExpensesCardComponent', () => {
       };
       component.getReceipt();
       fixture.detectChanges();
-      expect(component.receiptIcon).toEqual('assets/svg/expense.svg');
+      expect(component.receiptIcon).toEqual('assets/svg/list.svg');
     });
 
     it('should set isReceiptPresent to true if not a mileage or per diem expense and file ids present', () => {

diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.ts b/src/app/shared/components/expenses-card-v2/expenses-card.component.ts
@@ -170,7 +170,7 @@ export class ExpensesCardComponent implements OnInit {
       if (!this.expense.file_ids?.length) {
         this.receiptIcon = 'assets/svg/list-plus.svg';
         if (this.isFromPotentialDuplicates || this.isFromViewReports) {
-          this.receiptIcon = 'assets/svg/expense.svg';
+          this.receiptIcon = 'assets/svg/list.svg';
         }
       } else {
         this.isReceiptPresent = true;

diff --git a/src/app/shared/components/expenses-card/expenses-card.component.html b/src/app/shared/components/expenses-card/expenses-card.component.html
@@ -103,7 +103,7 @@
             <ion-icon
               class="expenses-card--receipt-icon"
               *ngIf="!expense.tx_dataUrls?.length"
-              [src]="'../../../../assets/svg/expense.svg'"
+              [src]="'../../../../assets/svg/list.svg'"
             ></ion-icon>
           </div>
         </ng-template>

diff --git a/src/app/shared/components/expenses-card/expenses-card.component.spec.ts b/src/app/shared/components/expenses-card/expenses-card.component.spec.ts
@@ -244,7 +244,7 @@ describe('ExpensesCardComponent', () => {
       };
       component.getReceipt();
       fixture.detectChanges();
-      expect(component.receiptIcon).toEqual('assets/svg/expense.svg');
+      expect(component.receiptIcon).toEqual('assets/svg/list.svg');
     });
   });
 

diff --git a/src/app/shared/components/expenses-card/expenses-card.component.ts b/src/app/shared/components/expenses-card/expenses-card.component.ts
@@ -164,7 +164,7 @@ export class ExpensesCardComponent implements OnInit {
       if (!this.expense.tx_file_ids) {
         this.receiptIcon = 'assets/svg/list-plus.svg';
         if (this.isFromPotentialDuplicates || this.isFromViewReports) {
-          this.receiptIcon = 'assets/svg/expense.svg';
+          this.receiptIcon = 'assets/svg/list.svg';
         }
       } else {
         this.isReceiptPresent = true;

diff --git a/src/app/shared/components/fy-filters/fy-filters.component.scss b/src/app/shared/components/fy-filters/fy-filters.component.scss
@@ -49,7 +49,7 @@
   &--radio {
     font-size: 20px;
     margin-right: 16px;
-    fill: $black;
+    color: $black;
     min-width: 20px;
   }
 

diff --git a/src/app/shared/icon/icon.module.ts b/src/app/shared/icon/icon.module.ts
@@ -40,11 +40,11 @@ export class IconModule {
     'clear.svg',
     'clock.svg',
     'crop.svg',
+    'cross.svg',
     'danger-fill.svg',
     'dashboard.svg',
     'duplicate.svg',
     'envelope.svg',
-    'expense.svg',
     'fyle-logo-dark.svg',
     'fyle-logo-light.svg',
     'file-lightning-indicator.svg',

diff --git a/src/assets/svg/check-square-fill.svg b/src/assets/svg/check-square-fill.svg
diff --git a/src/assets/svg/expense.svg b/src/assets/svg/expense.svg