From 2b9a6ce0d521b1ee9d975e7be0612e694d61f533 Mon Sep 17 00:00:00 2001 From: Dimple K H <31147415+Dimple16@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:03:26 +0530 Subject: [PATCH] feat: Standardize icons - Milestone-14 - Final PR with clean up (#2669) --- src/app/auth/switch-org/switch-org.page.html | 6 +- .../auth/switch-org/switch-org.page.spec.ts | 2 +- .../mock-data/action-sheet-options.data.ts | 20 +-- src/app/core/models/task-icon.enum.ts | 2 +- .../snackbar-properties.service.spec.ts | 2 +- .../services/snackbar-properties.service.ts | 2 +- src/app/core/services/status.service.ts | 16 +-- .../test-data/status.service.spec.data.ts | 20 +-- .../add-edit-advance-request.page.html | 4 +- ...fy-currency-choose-currency.component.html | 4 +- .../add-edit-expense-2.spec.ts | 2 +- .../add-edit-expense.page.html | 8 +- .../suggested-duplicates.component.html | 2 +- .../suggested-duplicates.component.spec.ts | 2 +- .../add-edit-mileage.page.html | 6 +- .../add-edit-per-diem.page.html | 6 +- src/app/fyle/dashboard/dashboard.page.ts | 8 +- .../tasks-card/tasks-card.component.html | 2 +- .../tasks-card/tasks-card.component.scss | 2 +- .../add-corporate-card.component.html | 2 +- .../card-added/card-added.component.html | 2 +- .../manage-corporate-cards.page.spec.ts | 2 +- .../manage-corporate-cards.page.ts | 22 ++-- .../my-create-report.page.html | 2 +- .../add-txn-to-report-dialog.component.html | 2 +- .../my-expenses-v2/my-expenses-v2.page.html | 10 +- .../my-expenses-v2/my-expenses-v2.page.ts | 8 +- .../add-txn-to-report-dialog.component.html | 2 +- .../fyle/my-expenses/my-expenses.page.html | 10 +- src/app/fyle/my-expenses/my-expenses.page.ts | 8 +- .../fyle/my-profile/my-profile.page.spec.ts | 4 +- src/app/fyle/my-profile/my-profile.page.ts | 2 +- .../select-currency.component.html | 6 +- .../update-mobile-number.component.html | 2 +- src/app/fyle/my-reports/my-reports.page.html | 6 +- .../my-view-advance-request.page.html | 2 +- .../add-expenses-to-report.component.html | 4 +- .../edit-report-name-popover.component.html | 2 +- .../my-view-report/my-view-report.page.html | 7 +- .../my-view-report.page.spec.ts | 6 +- .../share-report/share-report.component.html | 4 +- .../expense-preview.component.html | 4 +- .../personal-cards/personal-cards.page.html | 6 +- .../personal-cards.page.spec.ts | 4 +- .../split-expense/split-expense.page.html | 6 +- .../fyle/team-reports/team-reports.page.html | 6 +- .../fyle/view-expense/view-expense.page.html | 41 +++--- .../view-expense/view-expense.page.spec.ts | 4 +- .../fyle/view-expense/view-expense.page.ts | 4 +- .../fyle/view-mileage/view-mileage.page.html | 12 +- .../view-per-diem/view-per-diem.page.html | 17 +-- .../view-team-advance-request.page.html | 2 +- .../view-team-report.page.html | 7 +- .../view-team-report.page.spec.ts | 2 +- .../delete-button-component.html | 2 +- .../crop-receipt/crop-receipt.component.html | 2 +- .../receipt-preview.component.html | 4 +- .../audit-history.component.html | 4 +- .../audit-history.component.scss | 8 ++ .../view-comment/view-comment.component.html | 4 +- .../create-new-report.component.html | 4 +- .../create-new-report.component.html | 4 +- .../dependent-field-modal.component.html | 6 +- .../expenses-card.component.html | 4 +- .../expenses-card.component.scss | 2 +- .../expenses-card.component.spec.ts | 14 +- .../expenses-card.component.ts | 8 +- .../expenses-card.component.html | 4 +- .../expenses-card.component.scss | 2 +- .../expenses-card.component.spec.ts | 14 +- .../expenses-card/expenses-card.component.ts | 8 +- .../components/footer/footer.component.scss | 1 - .../fy-add-to-report-modal.component.html | 8 +- .../fy-alert-info.component.html | 2 +- .../add-approvers-popover.component.html | 2 +- .../approver-dialog.component.html | 6 +- ...y-critical-policy-violation.component.html | 4 +- ...fy-currency-choose-currency.component.html | 4 +- .../fy-currency-exchange-rate.component.html | 2 +- .../fy-currency/fy-currency.component.html | 2 +- .../fy-delete-dialog.component.html | 2 +- .../fy-filter-pills.component.html | 2 +- .../fy-input-popover.component.html | 2 +- .../fy-location-modal.component.html | 2 +- .../fy-multiselect-modal.component.html | 6 +- .../fy-policy-violation.component.html | 4 +- .../fy-popover/fy-popover.component.html | 2 +- .../fy-select-project-modal.component.html | 6 +- .../fy-select-vendor-modal.component.html | 6 +- .../fy-select-modal.component.html | 6 +- .../fy-statistic/fy-statistic.component.scss | 2 +- .../fy-userlist-modal.component.html | 6 +- .../fy-view-attachment.component.html | 4 +- .../fy-view-report-info.component.html | 4 +- .../popup-with-bullets.component.spec.ts | 4 +- .../popup-with-bullets.component.ts | 2 +- .../route-selector-modal.component.html | 6 +- ...it-expense-policy-violation.component.html | 2 +- .../toast-message.component.spec.ts | 2 +- ...saction-status-info-popover.component.html | 4 +- .../virtual-select-modal.component.html | 6 +- src/app/shared/icon/icon.module.ts | 121 +++++++++--------- src/assets/svg/bin.svg | 3 + src/assets/svg/calendar.svg | 22 ++-- src/assets/svg/check-circle-outline.svg | 4 + src/assets/svg/check.svg | 3 + src/assets/svg/{fy-clear.svg => clear.svg} | 0 src/assets/svg/close.svg | 5 - src/assets/svg/cross.svg | 4 + src/assets/svg/danger-fill.svg | 3 + src/assets/svg/delete.svg | 9 -- src/assets/svg/error-filled.svg | 8 -- src/assets/svg/error.svg | 3 - src/assets/svg/expense.svg | 4 + src/assets/svg/filter.svg | 2 +- src/assets/svg/flash.svg | 6 +- src/assets/svg/fy-calendar.svg | 12 -- src/assets/svg/fy-camera.svg | 3 - src/assets/svg/fy-close.svg | 4 - src/assets/svg/fy-delete.svg | 3 - src/assets/svg/fy-expense.svg | 6 - src/assets/svg/fy-home-solid.svg | 3 - src/assets/svg/fy-home.svg | 3 - src/assets/svg/fy-info.svg | 3 - src/assets/svg/fy-matched.svg | 3 - src/assets/svg/fy-merge.svg | 4 - src/assets/svg/fy-search.svg | 4 - src/assets/svg/fy-unmatched.svg | 3 - src/assets/svg/info-circle-fill.svg | 2 +- ...fy-info-gradient.svg => info-gradient.svg} | 0 src/assets/svg/information.svg | 3 - src/assets/svg/merge.svg | 4 + .../svg/{fy-rectangle.svg => notch.svg} | 0 src/assets/svg/search.svg | 5 +- src/assets/svg/success-tick.svg | 3 - src/assets/svg/tick-circle-outline-white.svg | 4 - src/assets/svg/tick-circle-outline.svg | 4 - src/assets/svg/tick-square-filled.svg | 3 - src/assets/svg/tick.svg | 3 - src/assets/svg/warning.svg | 3 - src/global.scss | 6 +- 141 files changed, 374 insertions(+), 465 deletions(-) create mode 100644 src/assets/svg/bin.svg create mode 100644 src/assets/svg/check-circle-outline.svg create mode 100644 src/assets/svg/check.svg rename src/assets/svg/{fy-clear.svg => clear.svg} (100%) delete mode 100644 src/assets/svg/close.svg create mode 100644 src/assets/svg/cross.svg create mode 100644 src/assets/svg/danger-fill.svg delete mode 100644 src/assets/svg/delete.svg delete mode 100644 src/assets/svg/error-filled.svg delete mode 100644 src/assets/svg/error.svg create mode 100644 src/assets/svg/expense.svg delete mode 100644 src/assets/svg/fy-calendar.svg delete mode 100644 src/assets/svg/fy-camera.svg delete mode 100644 src/assets/svg/fy-close.svg delete mode 100644 src/assets/svg/fy-delete.svg delete mode 100644 src/assets/svg/fy-expense.svg delete mode 100644 src/assets/svg/fy-home-solid.svg delete mode 100644 src/assets/svg/fy-home.svg delete mode 100644 src/assets/svg/fy-info.svg delete mode 100644 src/assets/svg/fy-matched.svg delete mode 100644 src/assets/svg/fy-merge.svg delete mode 100644 src/assets/svg/fy-search.svg delete mode 100644 src/assets/svg/fy-unmatched.svg rename src/assets/svg/{fy-info-gradient.svg => info-gradient.svg} (100%) delete mode 100755 src/assets/svg/information.svg create mode 100644 src/assets/svg/merge.svg rename src/assets/svg/{fy-rectangle.svg => notch.svg} (100%) delete mode 100644 src/assets/svg/success-tick.svg delete mode 100644 src/assets/svg/tick-circle-outline-white.svg delete mode 100644 src/assets/svg/tick-circle-outline.svg delete mode 100644 src/assets/svg/tick-square-filled.svg delete mode 100644 src/assets/svg/tick.svg delete mode 100644 src/assets/svg/warning.svg diff --git a/src/app/auth/switch-org/switch-org.page.html b/src/app/auth/switch-org/switch-org.page.html index 945f4afcd2..dc2695b093 100644 --- a/src/app/auth/switch-org/switch-org.page.html +++ b/src/app/auth/switch-org/switch-org.page.html @@ -50,7 +50,7 @@ @@ -65,7 +65,7 @@ - + diff --git a/src/app/auth/switch-org/switch-org.page.spec.ts b/src/app/auth/switch-org/switch-org.page.spec.ts index f3b999f3cd..db21405848 100644 --- a/src/app/auth/switch-org/switch-org.page.spec.ts +++ b/src/app/auth/switch-org/switch-org.page.spec.ts @@ -410,7 +410,7 @@ describe('SwitchOrgPage', () => { const msg = 'message'; const props = { data: { - icon: 'tick-square-filled', + icon: 'check-square-fill', showCloseButton: true, message: msg, }, diff --git a/src/app/core/mock-data/action-sheet-options.data.ts b/src/app/core/mock-data/action-sheet-options.data.ts index 83b59a0295..f79420c9ba 100644 --- a/src/app/core/mock-data/action-sheet-options.data.ts +++ b/src/app/core/mock-data/action-sheet-options.data.ts @@ -24,24 +24,24 @@ export const expectedActionSheetButtonRes = [ { text: 'Capture Receipt', icon: 'assets/svg/camera.svg', - cssClass: 'camera', + cssClass: 'capture-receipt', handler: undefined, }, { text: 'Add Manually', - icon: 'assets/svg/fy-expense.svg', + icon: 'assets/svg/expense.svg', cssClass: 'capture-receipt', handler: undefined, }, { text: 'Add Mileage', icon: 'assets/svg/mileage.svg', - cssClass: 'mileage', + cssClass: 'capture-receipt', handler: undefined, }, { text: 'Add Per Diem', - icon: 'assets/svg/fy-calendar.svg', + icon: 'assets/svg/calendar.svg', cssClass: 'capture-receipt', handler: undefined, }, @@ -51,19 +51,19 @@ export const expectedActionSheetButtonsWithMileage = [ { text: 'Capture Receipt', icon: 'assets/svg/camera.svg', - cssClass: 'camera', + cssClass: 'capture-receipt', handler: undefined, }, { text: 'Add Manually', - icon: 'assets/svg/fy-expense.svg', + icon: 'assets/svg/expense.svg', cssClass: 'capture-receipt', handler: undefined, }, { text: 'Add Mileage', icon: 'assets/svg/mileage.svg', - cssClass: 'mileage', + cssClass: 'capture-receipt', handler: undefined, }, ]; @@ -72,18 +72,18 @@ export const expectedActionSheetButtonsWithPerDiem = [ { text: 'Capture Receipt', icon: 'assets/svg/camera.svg', - cssClass: 'camera', + cssClass: 'capture-receipt', handler: undefined, }, { text: 'Add Manually', - icon: 'assets/svg/fy-expense.svg', + icon: 'assets/svg/expense.svg', cssClass: 'capture-receipt', handler: undefined, }, { text: 'Add Per Diem', - icon: 'assets/svg/fy-calendar.svg', + icon: 'assets/svg/calendar.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 index c324178df2..01d92297aa 100644 --- 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 = 'fy-expense', + REPORT = 'expense', WARNING = 'warning-outline', ADVANCE = 'wallet', MOBILE = 'phone', diff --git a/src/app/core/services/snackbar-properties.service.spec.ts b/src/app/core/services/snackbar-properties.service.spec.ts index 7017a7e278..e18c42a969 100644 --- a/src/app/core/services/snackbar-properties.service.spec.ts +++ b/src/app/core/services/snackbar-properties.service.spec.ts @@ -19,7 +19,7 @@ describe('SnackbarPropertiesService', () => { //act const properties = service.setSnackbarProperties('success', { message: 'Success message' }); //assert - expect(properties.data.icon).toEqual('tick-square-filled'); + expect(properties.data.icon).toEqual('check-square-fill'); }); it('should return the correct icon for a failure toast message', () => { diff --git a/src/app/core/services/snackbar-properties.service.ts b/src/app/core/services/snackbar-properties.service.ts index a1a33c05ed..27711b171b 100644 --- a/src/app/core/services/snackbar-properties.service.ts +++ b/src/app/core/services/snackbar-properties.service.ts @@ -22,7 +22,7 @@ export class SnackbarPropertiesService { ): SnackbarProperties { if (!snackbarIcon) { if (toastMessageType === 'success') { - snackbarIcon = 'tick-square-filled'; + snackbarIcon = 'check-square-fill'; } else if (toastMessageType === 'failure') { snackbarIcon = 'warning-fill'; } diff --git a/src/app/core/services/status.service.ts b/src/app/core/services/status.service.ts index d3bd06cb3d..2112455731 100644 --- a/src/app/core/services/status.service.ts +++ b/src/app/core/services/status.service.ts @@ -45,20 +45,20 @@ export class StatusService { case lowerCaseComment.indexOf('automatically merged') > -1: statusCategory = { category: 'Expense automatically merged', - icon: 'fy-merge', + icon: 'merge', }; break; case /(merged (\d+) expenses)/.test(lowerCaseComment): const regexMatch = lowerCaseComment.match(/merged (\d+) expenses/); statusCategory = { category: regexMatch[1] + ' expenses merged to this expense', - icon: 'fy-merge', + icon: 'merge', }; break; case lowerCaseComment.indexOf('merged') > -1: statusCategory = { category: 'Expense merged', - icon: 'fy-merge', + icon: 'merge', }; break; case lowerCaseComment.indexOf('created') > -1 && lowerCaseComment.indexOf('reversal') > -1: @@ -118,7 +118,7 @@ export class StatusService { case lowerCaseComment.indexOf('removed from the report') > -1: statusCategory = { category: 'Expense removed', - icon: 'fy-delete', + icon: 'bin', }; break; case lowerCaseComment.indexOf('name was changed from') > -1: @@ -154,7 +154,7 @@ export class StatusService { case lowerCaseComment.indexOf('verified') > -1: statusCategory = { category: 'Verified', - icon: 'success-tick', + icon: 'check-square-fill', }; break; case lowerCaseComment.indexOf('approver_inquiry') > -1: @@ -172,7 +172,7 @@ export class StatusService { case lowerCaseComment.indexOf('approved') > -1: statusCategory = { category: type + ' Approved', - icon: 'success-tick', + icon: 'check-square-fill', }; break; case lowerCaseComment.indexOf('payment_processing') > -1: @@ -184,7 +184,7 @@ export class StatusService { case lowerCaseComment.indexOf('to paid') > -1: statusCategory = { category: 'Paid', - icon: 'success-tick', + icon: 'check-square-fill', }; break; case lowerCaseComment.indexOf('expense issues') > -1: @@ -196,7 +196,7 @@ export class StatusService { case lowerCaseComment.indexOf('policies ran successfully') > -1: statusCategory = { category: 'Policies Ran Successfully', - icon: 'success-tick', + icon: 'check-square-fill', }; break; case lowerCaseComment.indexOf('auto-matched by') > -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 index d76c277d5b..ad59cb1887 100644 --- a/src/app/core/test-data/status.service.spec.data.ts +++ b/src/app/core/test-data/status.service.spec.data.ts @@ -782,7 +782,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [ isOthersComment: true, st: { category: 'Expense automatically merged', - icon: 'fy-merge', + icon: 'merge', }, }, { @@ -802,7 +802,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [ isOthersComment: true, st: { category: '2 expenses merged to this expense', - icon: 'fy-merge', + icon: 'merge', }, }, { @@ -822,7 +822,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [ isOthersComment: true, st: { category: 'Expense merged', - icon: 'fy-merge', + icon: 'merge', }, }, { @@ -902,7 +902,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [ isOthersComment: true, st: { category: 'Expense removed', - icon: 'fy-delete', + icon: 'bin', }, }, { @@ -1002,7 +1002,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [ isOthersComment: true, st: { category: 'Verified', - icon: 'success-tick', + icon: 'check-square-fill', }, }, { @@ -1062,7 +1062,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [ isOthersComment: true, st: { category: 'reports Approved', - icon: 'success-tick', + icon: 'check-square-fill', }, }, { @@ -1102,7 +1102,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [ isOthersComment: true, st: { category: 'Paid', - icon: 'success-tick', + icon: 'check-square-fill', }, }, { @@ -1162,7 +1162,7 @@ export const updateReponseWithFlattenedEStatus: ExtendedStatus[] = [ isOthersComment: true, st: { category: 'Policies Ran Successfully', - icon: 'success-tick', + icon: 'check-square-fill', }, }, { @@ -1700,7 +1700,7 @@ export const estatusSample = [ isOthersComment: true, st: { category: 'Expense merged', - icon: 'fy-merge', + icon: 'merge', }, has_details: true, }, @@ -1791,7 +1791,7 @@ export const eStatusWithReimbursible = [ isOthersComment: true, st: { category: 'Expense merged', - icon: 'fy-merge', + icon: 'merge', }, has_details: true, }, diff --git a/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.html b/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.html index 1ce2d21770..3b14243280 100644 --- a/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.html +++ b/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.html @@ -6,7 +6,7 @@ [ngClass]="{'add-edit-advance-request--header-btn-container-sm': isDeviceWidthSmall}" > - + @@ -35,7 +35,7 @@ class="add-edit-advance-request--header-btn-container__btn" (click)="delete()" > - + diff --git a/src/app/fyle/add-edit-advance-request/fy-currency/fy-currency-choose-currency/fy-currency-choose-currency.component.html b/src/app/fyle/add-edit-advance-request/fy-currency/fy-currency-choose-currency/fy-currency-choose-currency.component.html index aa625896d3..f72a4c8e85 100644 --- a/src/app/fyle/add-edit-advance-request/fy-currency/fy-currency-choose-currency/fy-currency-choose-currency.component.html +++ b/src/app/fyle/add-edit-advance-request/fy-currency/fy-currency-choose-currency/fy-currency-choose-currency.component.html @@ -1,12 +1,12 @@ - +
Select Currency
- +
diff --git a/src/app/fyle/add-edit-expense/add-edit-expense-2.spec.ts b/src/app/fyle/add-edit-expense/add-edit-expense-2.spec.ts index bf37a99a37..335cf0b4d8 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense-2.spec.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense-2.spec.ts @@ -1574,7 +1574,7 @@ export function TestCases2(getTestBed) { it('showSnackBarToast(): should show snackbar with relevant properties', () => { const properties = { data: { - icon: 'tick-square-filled', + icon: 'check-square-fill', showCloseButton: true, message: 'Message', }, diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.html b/src/app/fyle/add-edit-expense/add-edit-expense.page.html index 9f3b7966bf..9202ed6b93 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense.page.html +++ b/src/app/fyle/add-edit-expense/add-edit-expense.page.html @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -116,7 +116,7 @@
- +
Claimed amount {{etxn.tx.user_amount | currency: etxn.tx.currency: '' }} was capped to {{etxn.tx.amount | currency: etxn.tx.currency: '' }} due to policy @@ -132,7 +132,7 @@ class="add-edit-expense--split-info-container add-edit-expense--split-info-container__with-border" *ngIf="(!(etxn?.tx?.report_id) && !(reviewList?.length > 1)) && (isCorporateCreditCardEnabled && canRemoveCardExpense)" > - +
If the expense is merged with incorrect card details, click on Options ( - + diff --git a/src/app/fyle/add-edit-expense/suggested-duplicates/suggested-duplicates.component.spec.ts b/src/app/fyle/add-edit-expense/suggested-duplicates/suggested-duplicates.component.spec.ts index 12a65f79db..455cb59e24 100644 --- a/src/app/fyle/add-edit-expense/suggested-duplicates/suggested-duplicates.component.spec.ts +++ b/src/app/fyle/add-edit-expense/suggested-duplicates/suggested-duplicates.component.spec.ts @@ -109,7 +109,7 @@ describe('SuggestedDuplicatesComponent', () => { it('should show success toast message when called', () => { const snackbarProperties = { data: { - icon: 'tick-square-filled', + icon: 'check-square-fill', showCloseButton: true, message: 'Duplicates was successfully dismissed', }, diff --git a/src/app/fyle/add-edit-mileage/add-edit-mileage.page.html b/src/app/fyle/add-edit-mileage/add-edit-mileage.page.html index 9ef3e9c6e1..0b5816d3d9 100644 --- a/src/app/fyle/add-edit-mileage/add-edit-mileage.page.html +++ b/src/app/fyle/add-edit-mileage/add-edit-mileage.page.html @@ -7,7 +7,7 @@ - + - + @@ -67,7 +67,7 @@
- +
Claimed amount {{etxn.tx.user_amount | currency: etxn.tx.currency: 'symbol-narrow'}} was capped to {{etxn.tx.amount | currency: etxn.tx.currency: 'symbol-narrow'}} due to policy diff --git a/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.html b/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.html index 87676eb72e..f4409608ce 100644 --- a/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.html +++ b/src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.html @@ -10,7 +10,7 @@ - + - + @@ -66,7 +66,7 @@
- +
Claimed amount {{etxn.tx.user_amount | currency: etxn.tx.currency: '' }} was capped to {{etxn.tx.amount | currency: etxn.tx.currency: '' }} due to policy diff --git a/src/app/fyle/dashboard/dashboard.page.ts b/src/app/fyle/dashboard/dashboard.page.ts index fdf526b023..6968287936 100644 --- a/src/app/fyle/dashboard/dashboard.page.ts +++ b/src/app/fyle/dashboard/dashboard.page.ts @@ -250,12 +250,12 @@ export class DashboardPage { { text: 'Capture Receipt', icon: 'assets/svg/camera.svg', - cssClass: 'camera', + cssClass: 'capture-receipt', handler: this.actionSheetButtonsHandler('Capture Receipt', 'camera_overlay'), }, { text: 'Add Manually', - icon: 'assets/svg/fy-expense.svg', + icon: 'assets/svg/expense.svg', cssClass: 'capture-receipt', handler: this.actionSheetButtonsHandler('Add Manually', 'add_edit_expense'), }, @@ -265,7 +265,7 @@ export class DashboardPage { that.actionSheetButtons.push({ text: 'Add Mileage', icon: 'assets/svg/mileage.svg', - cssClass: 'mileage', + cssClass: 'capture-receipt', handler: this.actionSheetButtonsHandler('Add Mileage', 'add_edit_mileage'), }); } @@ -273,7 +273,7 @@ export class DashboardPage { if (isPerDiemEnabled) { that.actionSheetButtons.push({ text: 'Add Per Diem', - icon: 'assets/svg/fy-calendar.svg', + icon: 'assets/svg/calendar.svg', cssClass: 'capture-receipt', handler: this.actionSheetButtonsHandler('Add Per Diem', 'add_edit_per_diem'), }); 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 index d2da703b49..87b028b914 100644 --- 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 === 'fy-expense', + 'task--icon__expense': task.icon === 'expense', 'task--icon__advance': task.icon === 'wallet', 'task--icon__mobile': task.icon === 'phone' }" diff --git a/src/app/fyle/dashboard/tasks/tasks-card/tasks-card.component.scss b/src/app/fyle/dashboard/tasks/tasks-card/tasks-card.component.scss index a09d41c428..0c969a8233 100644 --- a/src/app/fyle/dashboard/tasks/tasks-card/tasks-card.component.scss +++ b/src/app/fyle/dashboard/tasks/tasks-card/tasks-card.component.scss @@ -13,7 +13,7 @@ } &__expense { - stroke: $grey-light; + color: $grey-light; font-size: 32px; position: relative; top: -6px; diff --git a/src/app/fyle/manage-corporate-cards/add-corporate-card/add-corporate-card.component.html b/src/app/fyle/manage-corporate-cards/add-corporate-card/add-corporate-card.component.html index 9ebb5bed61..6316484254 100644 --- a/src/app/fyle/manage-corporate-cards/add-corporate-card/add-corporate-card.component.html +++ b/src/app/fyle/manage-corporate-cards/add-corporate-card/add-corporate-card.component.html @@ -3,7 +3,7 @@ Add Corporate Card - + diff --git a/src/app/fyle/manage-corporate-cards/card-added/card-added.component.html b/src/app/fyle/manage-corporate-cards/card-added/card-added.component.html index d2d98ba21d..041b098b27 100644 --- a/src/app/fyle/manage-corporate-cards/card-added/card-added.component.html +++ b/src/app/fyle/manage-corporate-cards/card-added/card-added.component.html @@ -1,6 +1,6 @@
- + Card Added
diff --git a/src/app/fyle/manage-corporate-cards/manage-corporate-cards.page.spec.ts b/src/app/fyle/manage-corporate-cards/manage-corporate-cards.page.spec.ts index f2fc0f88f6..466b3649b7 100644 --- a/src/app/fyle/manage-corporate-cards/manage-corporate-cards.page.spec.ts +++ b/src/app/fyle/manage-corporate-cards/manage-corporate-cards.page.spec.ts @@ -399,7 +399,7 @@ describe('ManageCorporateCardsPage', () => { buttons: [ { text: 'Disconnect', - icon: 'assets/svg/fy-delete.svg', + icon: 'assets/svg/bin.svg', cssClass: 'danger', handler: jasmine.any(Function), }, diff --git a/src/app/fyle/manage-corporate-cards/manage-corporate-cards.page.ts b/src/app/fyle/manage-corporate-cards/manage-corporate-cards.page.ts index 70c665f2d5..b3cf693eb9 100644 --- a/src/app/fyle/manage-corporate-cards/manage-corporate-cards.page.ts +++ b/src/app/fyle/manage-corporate-cards/manage-corporate-cards.page.ts @@ -40,7 +40,7 @@ export class ManageCorporateCardsPage { private orgSettingsService: OrgSettingsService, private orgUserSettingsService: OrgUserSettingsService, private realTimeFeedService: RealTimeFeedService, - private trackingService: TrackingService, + private trackingService: TrackingService ) {} refresh(event: RefresherCustomEvent): void { @@ -56,23 +56,21 @@ export class ManageCorporateCardsPage { ionViewWillEnter(): void { this.corporateCards$ = this.loadCorporateCards$.pipe( - switchMap(() => this.corporateCreditCardExpenseService.getCorporateCards()), + switchMap(() => this.corporateCreditCardExpenseService.getCorporateCards()) ); const orgSettings$ = this.orgSettingsService.get(); const orgUserSettings$ = this.orgUserSettingsService.get(); this.isVisaRTFEnabled$ = orgSettings$.pipe( - map( - (orgSettings) => orgSettings.visa_enrollment_settings.allowed && orgSettings.visa_enrollment_settings.enabled, - ), + map((orgSettings) => orgSettings.visa_enrollment_settings.allowed && orgSettings.visa_enrollment_settings.enabled) ); this.isMastercardRTFEnabled$ = orgSettings$.pipe( map( (orgSettings) => - orgSettings.mastercard_enrollment_settings.allowed && orgSettings.mastercard_enrollment_settings.enabled, - ), + orgSettings.mastercard_enrollment_settings.allowed && orgSettings.mastercard_enrollment_settings.enabled + ) ); this.isYodleeEnabled$ = forkJoin([orgSettings$, orgUserSettings$]).pipe( @@ -80,8 +78,8 @@ export class ManageCorporateCardsPage { ([orgSettings, orgUserSettings]) => orgSettings.bank_data_aggregation_settings.allowed && orgSettings.bank_data_aggregation_settings.enabled && - orgUserSettings.bank_data_aggregation_settings.enabled, - ), + orgUserSettings.bank_data_aggregation_settings.enabled + ) ); } @@ -93,7 +91,7 @@ export class ManageCorporateCardsPage { if (card.is_visa_enrolled || card.is_mastercard_enrolled) { actionSheetButtons.push({ text: 'Disconnect', - icon: 'assets/svg/fy-delete.svg', + icon: 'assets/svg/bin.svg', cssClass: 'danger', handler: () => { this.unenrollCard(card); @@ -120,7 +118,7 @@ export class ManageCorporateCardsPage { } return actionSheetButtons; - }), + }) ); } @@ -157,7 +155,7 @@ export class ManageCorporateCardsPage { if (popoverResponse.data?.success) { this.handleEnrollmentSuccess(); } - }, + } ); } diff --git a/src/app/fyle/my-create-report/my-create-report.page.html b/src/app/fyle/my-create-report/my-create-report.page.html index 6fb9916432..20d0df9dd6 100644 --- a/src/app/fyle/my-create-report/my-create-report.page.html +++ b/src/app/fyle/my-create-report/my-create-report.page.html @@ -3,7 +3,7 @@ - +
diff --git a/src/app/fyle/my-expenses-v2/add-txn-to-report-dialog/add-txn-to-report-dialog.component.html b/src/app/fyle/my-expenses-v2/add-txn-to-report-dialog/add-txn-to-report-dialog.component.html index ff80087c38..f0f87e0172 100644 --- a/src/app/fyle/my-expenses-v2/add-txn-to-report-dialog/add-txn-to-report-dialog.component.html +++ b/src/app/fyle/my-expenses-v2/add-txn-to-report-dialog/add-txn-to-report-dialog.component.html @@ -5,7 +5,7 @@ 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 index 9fb25dcd07..0dc169fd40 100644 --- a/src/app/fyle/my-expenses-v2/my-expenses-v2.page.html +++ b/src/app/fyle/my-expenses-v2/my-expenses-v2.page.html @@ -9,7 +9,7 @@ - + @@ -38,7 +38,7 @@ @@ -264,7 +264,7 @@
- +
diff --git a/src/app/shared/components/expenses-card/expenses-card.component.scss b/src/app/shared/components/expenses-card/expenses-card.component.scss index 6185cda5d0..7dcac9aed0 100644 --- a/src/app/shared/components/expenses-card/expenses-card.component.scss +++ b/src/app/shared/components/expenses-card/expenses-card.component.scss @@ -133,7 +133,7 @@ &--receipt-icon { height: 35px; width: 35px; - stroke: $black-light; + color: $black-light; &__pdf { stroke: none; 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 index f182785fbb..48e66e2c0c 100644 --- a/src/app/shared/components/expenses-card/expenses-card.component.spec.ts +++ b/src/app/shared/components/expenses-card/expenses-card.component.spec.ts @@ -215,14 +215,14 @@ describe('ExpensesCardComponent', () => { expect(component.receiptIcon).toEqual('assets/svg/mileage.svg'); }); - it('should set the receipt icon to fy-calendar when the fyle catergory is per diem', () => { + it('should set the receipt icon to calendar when the fyle catergory is per diem', () => { component.expense = { ...expenseData1, tx_org_category: 'per diem', }; component.getReceipt(); fixture.detectChanges(); - expect(component.receiptIcon).toEqual('assets/svg/fy-calendar.svg'); + expect(component.receiptIcon).toEqual('assets/svg/calendar.svg'); }); it('should set the receipt icon to add-receipt when there are no file ids', () => { @@ -244,7 +244,7 @@ describe('ExpensesCardComponent', () => { }; component.getReceipt(); fixture.detectChanges(); - expect(component.receiptIcon).toEqual('assets/svg/fy-expense.svg'); + expect(component.receiptIcon).toEqual('assets/svg/expense.svg'); }); }); @@ -551,7 +551,7 @@ describe('ExpensesCardComponent', () => { }); describe('setOtherData():', () => { - it('should set icon to fy-matched if the source account type is corporate credit card', () => { + it('should set icon to card if the source account type is corporate credit card', () => { component.expense = { ...expenseData1, source_account_type: 'PERSONAL_CORPORATE_CREDIT_CARD_ACCOUNT', @@ -560,10 +560,10 @@ describe('ExpensesCardComponent', () => { component.setOtherData(); fixture.detectChanges(); - expect(component.paymentModeIcon).toEqual('fy-matched'); + expect(component.paymentModeIcon).toEqual('card'); }); - it('should set icon to fy-unmatched if the source account type is corporate credit card but expense group id is not present', () => { + it('should set icon to card if the source account type is corporate credit card but expense group id is not present', () => { component.expense = { ...expenseData1, source_account_type: 'PERSONAL_CORPORATE_CREDIT_CARD_ACCOUNT', @@ -571,7 +571,7 @@ describe('ExpensesCardComponent', () => { component.setOtherData(); fixture.detectChanges(); - expect(component.paymentModeIcon).toEqual('fy-unmatched'); + expect(component.paymentModeIcon).toEqual('card'); }); it('should set icon to fy-reimbersable if the source account type is not a corporate credit card and if the reimbersement is not skipped', () => { diff --git a/src/app/shared/components/expenses-card/expenses-card.component.ts b/src/app/shared/components/expenses-card/expenses-card.component.ts index 1fafb2827e..6c4ca28ea4 100644 --- a/src/app/shared/components/expenses-card/expenses-card.component.ts +++ b/src/app/shared/components/expenses-card/expenses-card.component.ts @@ -159,12 +159,12 @@ export class ExpensesCardComponent implements OnInit { if (this.expense.tx_org_category && this.expense.tx_org_category?.toLowerCase() === 'mileage') { this.receiptIcon = 'assets/svg/mileage.svg'; } else if (this.expense.tx_org_category && this.expense.tx_org_category?.toLowerCase() === 'per diem') { - this.receiptIcon = 'assets/svg/fy-calendar.svg'; + this.receiptIcon = 'assets/svg/calendar.svg'; } else { if (!this.expense.tx_file_ids) { this.receiptIcon = 'assets/svg/list-plus.svg'; if (this.isFromPotentialDuplicates || this.isFromViewReports) { - this.receiptIcon = 'assets/svg/fy-expense.svg'; + this.receiptIcon = 'assets/svg/expense.svg'; } } else { this.isReceiptPresent = true; @@ -314,9 +314,9 @@ export class ExpensesCardComponent implements OnInit { setOtherData(): void { if (this.expense.source_account_type === AccountType.CCC) { if (this.expense.tx_corporate_credit_card_expense_group_id) { - this.paymentModeIcon = 'fy-matched'; + this.paymentModeIcon = 'card'; } else { - this.paymentModeIcon = 'fy-unmatched'; + this.paymentModeIcon = 'card'; } } else { if (!this.expense.tx_skip_reimbursement) { diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index 90f02cfa5a..bb1849cc5e 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -46,7 +46,6 @@ fill: $black-2; &__primary { fill: $pure-white; - stroke: $pure-white; height: 36px; width: 36px; position: relative; diff --git a/src/app/shared/components/fy-add-to-report/fy-add-to-report-modal/fy-add-to-report-modal.component.html b/src/app/shared/components/fy-add-to-report/fy-add-to-report-modal/fy-add-to-report-modal.component.html index 2b2a3abcfb..afd69fbd4d 100644 --- a/src/app/shared/components/fy-add-to-report/fy-add-to-report-modal/fy-add-to-report-modal.component.html +++ b/src/app/shared/components/fy-add-to-report/fy-add-to-report-modal/fy-add-to-report-modal.component.html @@ -1,12 +1,12 @@ - +
Add To Report
- + @@ -34,7 +34,7 @@ @@ -74,7 +74,7 @@ diff --git a/src/app/shared/components/fy-alert-info/fy-alert-info.component.html b/src/app/shared/components/fy-alert-info/fy-alert-info.component.html index 5b6af84ef0..002306a75e 100644 --- a/src/app/shared/components/fy-alert-info/fy-alert-info.component.html +++ b/src/app/shared/components/fy-alert-info/fy-alert-info.component.html @@ -1,5 +1,5 @@
- + - + Add Approvers diff --git a/src/app/shared/components/fy-approver/add-approvers-popover/approver-dialog/approver-dialog.component.html b/src/app/shared/components/fy-approver/add-approvers-popover/approver-dialog/approver-dialog.component.html index 7dbf1fca73..f45f80746b 100644 --- a/src/app/shared/components/fy-approver/add-approvers-popover/approver-dialog/approver-dialog.component.html +++ b/src/app/shared/components/fy-approver/add-approvers-popover/approver-dialog/approver-dialog.component.html @@ -1,12 +1,12 @@ - +
Select Approvers
- + @@ -34,7 +34,7 @@ *ngIf="!(selectedApproversList?.length > 0)" class="selection-modal--search-icon" matPrefix - svgIcon="fy-search" + svgIcon="search" >
- +
- + Expense Blocked
diff --git a/src/app/shared/components/fy-currency/fy-currency-choose-currency/fy-currency-choose-currency.component.html b/src/app/shared/components/fy-currency/fy-currency-choose-currency/fy-currency-choose-currency.component.html index e51b235691..bbfe07fd56 100644 --- a/src/app/shared/components/fy-currency/fy-currency-choose-currency/fy-currency-choose-currency.component.html +++ b/src/app/shared/components/fy-currency/fy-currency-choose-currency/fy-currency-choose-currency.component.html @@ -1,12 +1,12 @@ - +
Select Currency
- +
diff --git a/src/app/shared/components/fy-currency/fy-currency-exchange-rate/fy-currency-exchange-rate.component.html b/src/app/shared/components/fy-currency/fy-currency-exchange-rate/fy-currency-exchange-rate.component.html index c50a901e41..3f2b79968b 100644 --- a/src/app/shared/components/fy-currency/fy-currency-exchange-rate/fy-currency-exchange-rate.component.html +++ b/src/app/shared/components/fy-currency/fy-currency-exchange-rate/fy-currency-exchange-rate.component.html @@ -1,5 +1,5 @@ - + diff --git a/src/app/shared/components/fy-currency/fy-currency.component.html b/src/app/shared/components/fy-currency/fy-currency.component.html index ffe318af07..dda4cf2f4d 100644 --- a/src/app/shared/components/fy-currency/fy-currency.component.html +++ b/src/app/shared/components/fy-currency/fy-currency.component.html @@ -23,7 +23,7 @@
- +
{{ value.amount | currency : value.currency : 'code' }} at {{ exchangeRate | number : '1.0-6' }} {{ value.currency }} / {{ value.orig_currency }} diff --git a/src/app/shared/components/fy-delete-dialog/fy-delete-dialog.component.html b/src/app/shared/components/fy-delete-dialog/fy-delete-dialog.component.html index 0e8bdc06e3..7442ca00d4 100644 --- a/src/app/shared/components/fy-delete-dialog/fy-delete-dialog.component.html +++ b/src/app/shared/components/fy-delete-dialog/fy-delete-dialog.component.html @@ -14,7 +14,7 @@ - +
diff --git a/src/app/shared/components/fy-filter-pills/fy-filter-pills.component.html b/src/app/shared/components/fy-filter-pills/fy-filter-pills.component.html index 0881493347..5890eaac89 100644 --- a/src/app/shared/components/fy-filter-pills/fy-filter-pills.component.html +++ b/src/app/shared/components/fy-filter-pills/fy-filter-pills.component.html @@ -11,7 +11,7 @@
diff --git a/src/app/shared/components/fy-input-popover/fy-input-popover.component.html b/src/app/shared/components/fy-input-popover/fy-input-popover.component.html index 362d361b0b..7512e3596a 100644 --- a/src/app/shared/components/fy-input-popover/fy-input-popover.component.html +++ b/src/app/shared/components/fy-input-popover/fy-input-popover.component.html @@ -5,7 +5,7 @@ - + diff --git a/src/app/shared/components/fy-location/fy-location-modal/fy-location-modal.component.html b/src/app/shared/components/fy-location/fy-location-modal/fy-location-modal.component.html index a760db2c77..5de31bea10 100644 --- a/src/app/shared/components/fy-location/fy-location-modal/fy-location-modal.component.html +++ b/src/app/shared/components/fy-location/fy-location-modal/fy-location-modal.component.html @@ -27,7 +27,7 @@ mat-icon-button matSuffix > - +
diff --git a/src/app/shared/components/fy-multiselect/fy-multiselect-modal/fy-multiselect-modal.component.html b/src/app/shared/components/fy-multiselect/fy-multiselect-modal/fy-multiselect-modal.component.html index 2f1c79a52e..a2f2439dad 100644 --- a/src/app/shared/components/fy-multiselect/fy-multiselect-modal/fy-multiselect-modal.component.html +++ b/src/app/shared/components/fy-multiselect/fy-multiselect-modal/fy-multiselect-modal.component.html @@ -1,5 +1,5 @@ - +
@@ -8,7 +8,7 @@ - + @@ -36,7 +36,7 @@ *ngIf="!(currentSelections?.length > 0)" class="selection-modal--search-icon" matPrefix - svgIcon="fy-search" + svgIcon="search" > - +
- + Policy Violations Found
diff --git a/src/app/shared/components/fy-popover/fy-popover.component.html b/src/app/shared/components/fy-popover/fy-popover.component.html index 026b3a0a84..460c013be5 100644 --- a/src/app/shared/components/fy-popover/fy-popover.component.html +++ b/src/app/shared/components/fy-popover/fy-popover.component.html @@ -2,7 +2,7 @@ - + diff --git a/src/app/shared/components/fy-select-project/fy-select-modal/fy-select-project-modal.component.html b/src/app/shared/components/fy-select-project/fy-select-modal/fy-select-project-modal.component.html index 251456723e..af8457a9e8 100644 --- a/src/app/shared/components/fy-select-project/fy-select-modal/fy-select-project-modal.component.html +++ b/src/app/shared/components/fy-select-project/fy-select-modal/fy-select-project-modal.component.html @@ -1,18 +1,18 @@ - +
Select {{ label }}
- +
- + - +
Select Merchant
- +
- + - +
@@ -8,13 +8,13 @@ - + - + - +
Select Items
- + @@ -33,7 +33,7 @@ *ngIf="!(currentSelections?.length > 0)" class="selection-modal--search-icon" matPrefix - svgIcon="fy-search" + svgIcon="search" > - + - +
diff --git a/src/app/shared/components/fy-view-report-info/fy-view-report-info.component.html b/src/app/shared/components/fy-view-report-info/fy-view-report-info.component.html index 03ea313207..1a3f3b4467 100644 --- a/src/app/shared/components/fy-view-report-info/fy-view-report-info.component.html +++ b/src/app/shared/components/fy-view-report-info/fy-view-report-info.component.html @@ -1,9 +1,9 @@ - + - + diff --git a/src/app/shared/components/popup-with-bullets/popup-with-bullets.component.spec.ts b/src/app/shared/components/popup-with-bullets/popup-with-bullets.component.spec.ts index 2eab230352..0d60c61374 100644 --- a/src/app/shared/components/popup-with-bullets/popup-with-bullets.component.spec.ts +++ b/src/app/shared/components/popup-with-bullets/popup-with-bullets.component.spec.ts @@ -97,7 +97,7 @@ describe('PopupWithBulletsComponent', () => { const message = 'Phone Number Copied Successfully'; const successToastProperties = { data: { - icon: 'tick-circle-outline-white', + icon: 'check-circle-outline', showCloseButton: true, message, }, @@ -115,7 +115,7 @@ describe('PopupWithBulletsComponent', () => { expect(snackbarProperties.setSnackbarProperties).toHaveBeenCalledOnceWith( 'success', { message }, - 'tick-circle-outline-white' + 'check-circle-outline' ); }); }); diff --git a/src/app/shared/components/popup-with-bullets/popup-with-bullets.component.ts b/src/app/shared/components/popup-with-bullets/popup-with-bullets.component.ts index 0093bdbb52..8dcb9498db 100644 --- a/src/app/shared/components/popup-with-bullets/popup-with-bullets.component.ts +++ b/src/app/shared/components/popup-with-bullets/popup-with-bullets.component.ts @@ -43,7 +43,7 @@ export class PopupWithBulletsComponent { showToastMessage(message: string): void { this.matSnackBar.openFromComponent(ToastMessageComponent, { - ...this.snackbarProperties.setSnackbarProperties('success', { message }, 'tick-circle-outline-white'), + ...this.snackbarProperties.setSnackbarProperties('success', { message }, 'check-circle-outline'), panelClass: 'msb-success', }); } diff --git a/src/app/shared/components/route-selector/route-selector-modal/route-selector-modal.component.html b/src/app/shared/components/route-selector/route-selector-modal/route-selector-modal.component.html index e86d3d85e9..a1a89db62a 100644 --- a/src/app/shared/components/route-selector/route-selector-modal/route-selector-modal.component.html +++ b/src/app/shared/components/route-selector/route-selector-modal/route-selector-modal.component.html @@ -62,11 +62,7 @@ i >= 1 && (i !== mileageLocations.controls.length - 1 || mileageLocations.controls.length === 10) " > - + diff --git a/src/app/shared/components/split-expense-policy-violation/split-expense-policy-violation.component.html b/src/app/shared/components/split-expense-policy-violation/split-expense-policy-violation.component.html index 5655d0ff37..7ab280e3d3 100644 --- a/src/app/shared/components/split-expense-policy-violation/split-expense-policy-violation.component.html +++ b/src/app/shared/components/split-expense-policy-violation/split-expense-policy-violation.component.html @@ -1,5 +1,5 @@ - +
Policy Violation Found
diff --git a/src/app/shared/components/toast-message/toast-message.component.spec.ts b/src/app/shared/components/toast-message/toast-message.component.spec.ts index 4723cf5bfe..6d50b8e11f 100644 --- a/src/app/shared/components/toast-message/toast-message.component.spec.ts +++ b/src/app/shared/components/toast-message/toast-message.component.spec.ts @@ -35,7 +35,7 @@ describe('ToastMessageComponent', () => { it('should display message', () => { const message = 'Test message'; toastMessageComponent.data = { - icon: 'warning', + icon: 'danger-fill', message: 'Test message', redirectionText: null, showCloseButton: false, diff --git a/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.html b/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.html index b092fcf1d7..2f89148a50 100644 --- a/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.html +++ b/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.html @@ -1,5 +1,5 @@ - + - + - +
@@ -8,13 +8,13 @@ - + - + + + diff --git a/src/assets/svg/calendar.svg b/src/assets/svg/calendar.svg index 436a11211e..42a511b222 100644 --- a/src/assets/svg/calendar.svg +++ b/src/assets/svg/calendar.svg @@ -1,12 +1,12 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/assets/svg/check-circle-outline.svg b/src/assets/svg/check-circle-outline.svg new file mode 100644 index 0000000000..347c81dfac --- /dev/null +++ b/src/assets/svg/check-circle-outline.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/check.svg b/src/assets/svg/check.svg new file mode 100644 index 0000000000..de0694d770 --- /dev/null +++ b/src/assets/svg/check.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/fy-clear.svg b/src/assets/svg/clear.svg similarity index 100% rename from src/assets/svg/fy-clear.svg rename to src/assets/svg/clear.svg diff --git a/src/assets/svg/close.svg b/src/assets/svg/close.svg deleted file mode 100644 index 9012648bee..0000000000 --- a/src/assets/svg/close.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/svg/cross.svg b/src/assets/svg/cross.svg new file mode 100644 index 0000000000..4dc858de02 --- /dev/null +++ b/src/assets/svg/cross.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/danger-fill.svg b/src/assets/svg/danger-fill.svg new file mode 100644 index 0000000000..bad676ff2c --- /dev/null +++ b/src/assets/svg/danger-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/svg/delete.svg b/src/assets/svg/delete.svg deleted file mode 100644 index 2497dd3129..0000000000 --- a/src/assets/svg/delete.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/svg/error-filled.svg b/src/assets/svg/error-filled.svg deleted file mode 100644 index 8f351443ba..0000000000 --- a/src/assets/svg/error-filled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/assets/svg/error.svg b/src/assets/svg/error.svg deleted file mode 100644 index 584eca01e4..0000000000 --- a/src/assets/svg/error.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/expense.svg b/src/assets/svg/expense.svg new file mode 100644 index 0000000000..255729937e --- /dev/null +++ b/src/assets/svg/expense.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/filter.svg b/src/assets/svg/filter.svg index ffed802beb..e72d5def6c 100644 --- a/src/assets/svg/filter.svg +++ b/src/assets/svg/filter.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/svg/flash.svg b/src/assets/svg/flash.svg index 1a9123bdaf..b8170e4df1 100644 --- a/src/assets/svg/flash.svg +++ b/src/assets/svg/flash.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/src/assets/svg/fy-calendar.svg b/src/assets/svg/fy-calendar.svg deleted file mode 100644 index ea078efdd3..0000000000 --- a/src/assets/svg/fy-calendar.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/assets/svg/fy-camera.svg b/src/assets/svg/fy-camera.svg deleted file mode 100644 index d10c4d2105..0000000000 --- a/src/assets/svg/fy-camera.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/fy-close.svg b/src/assets/svg/fy-close.svg deleted file mode 100644 index a0c0953c7f..0000000000 --- a/src/assets/svg/fy-close.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/fy-delete.svg b/src/assets/svg/fy-delete.svg deleted file mode 100644 index c1f622c0d7..0000000000 --- a/src/assets/svg/fy-delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/fy-expense.svg b/src/assets/svg/fy-expense.svg deleted file mode 100644 index 93906aff13..0000000000 --- a/src/assets/svg/fy-expense.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/svg/fy-home-solid.svg b/src/assets/svg/fy-home-solid.svg deleted file mode 100644 index 3974e7ad4f..0000000000 --- a/src/assets/svg/fy-home-solid.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/fy-home.svg b/src/assets/svg/fy-home.svg deleted file mode 100644 index 7ab41822fb..0000000000 --- a/src/assets/svg/fy-home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/fy-info.svg b/src/assets/svg/fy-info.svg deleted file mode 100644 index a6b56f2370..0000000000 --- a/src/assets/svg/fy-info.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/fy-matched.svg b/src/assets/svg/fy-matched.svg deleted file mode 100644 index 2bcca0684f..0000000000 --- a/src/assets/svg/fy-matched.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/fy-merge.svg b/src/assets/svg/fy-merge.svg deleted file mode 100644 index 9eab0dd51f..0000000000 --- a/src/assets/svg/fy-merge.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/fy-search.svg b/src/assets/svg/fy-search.svg deleted file mode 100644 index 1631fc7acd..0000000000 --- a/src/assets/svg/fy-search.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/fy-unmatched.svg b/src/assets/svg/fy-unmatched.svg deleted file mode 100644 index 989d0d4f7a..0000000000 --- a/src/assets/svg/fy-unmatched.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/info-circle-fill.svg b/src/assets/svg/info-circle-fill.svg index d005ac5660..54d10d8929 100644 --- a/src/assets/svg/info-circle-fill.svg +++ b/src/assets/svg/info-circle-fill.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/svg/fy-info-gradient.svg b/src/assets/svg/info-gradient.svg similarity index 100% rename from src/assets/svg/fy-info-gradient.svg rename to src/assets/svg/info-gradient.svg diff --git a/src/assets/svg/information.svg b/src/assets/svg/information.svg deleted file mode 100755 index f0aaf72677..0000000000 --- a/src/assets/svg/information.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/merge.svg b/src/assets/svg/merge.svg new file mode 100644 index 0000000000..21077aa341 --- /dev/null +++ b/src/assets/svg/merge.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/fy-rectangle.svg b/src/assets/svg/notch.svg similarity index 100% rename from src/assets/svg/fy-rectangle.svg rename to src/assets/svg/notch.svg diff --git a/src/assets/svg/search.svg b/src/assets/svg/search.svg index 9b3bcd9e38..97a3738aa7 100644 --- a/src/assets/svg/search.svg +++ b/src/assets/svg/search.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/src/assets/svg/success-tick.svg b/src/assets/svg/success-tick.svg deleted file mode 100644 index 074f3c3206..0000000000 --- a/src/assets/svg/success-tick.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/tick-circle-outline-white.svg b/src/assets/svg/tick-circle-outline-white.svg deleted file mode 100644 index 91b073aef5..0000000000 --- a/src/assets/svg/tick-circle-outline-white.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/tick-circle-outline.svg b/src/assets/svg/tick-circle-outline.svg deleted file mode 100644 index c87c4df1cf..0000000000 --- a/src/assets/svg/tick-circle-outline.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/tick-square-filled.svg b/src/assets/svg/tick-square-filled.svg deleted file mode 100644 index 21a520e06e..0000000000 --- a/src/assets/svg/tick-square-filled.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/tick.svg b/src/assets/svg/tick.svg deleted file mode 100644 index bcf084b457..0000000000 --- a/src/assets/svg/tick.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/warning.svg b/src/assets/svg/warning.svg deleted file mode 100644 index 0d3326da96..0000000000 --- a/src/assets/svg/warning.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/global.scss b/src/global.scss index a887ed9d32..57921d43c8 100644 --- a/src/global.scss +++ b/src/global.scss @@ -741,11 +741,7 @@ ref - https://stackoverflow.com/a/31162426 } .capture-receipt { - stroke: $grey-light; - } - - .mileage, - .camera { + fill: $grey-light; stroke: none !important; }