diff --git a/src/app/core/services/status.service.ts b/src/app/core/services/status.service.ts index 2112455731..2b2bd29791 100644 --- 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 index ad59cb1887..79b77c275c 100644 --- 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 index 0dc169fd40..1e2a7754c4 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 @@ -73,7 +73,7 @@ - + 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 index 48399ec77e..e375ac68e8 100644 --- 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 index 2a561c2009..da40ddc2db 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.html +++ b/src/app/fyle/my-expenses/my-expenses.page.html @@ -73,7 +73,7 @@ - + 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 index be90a2f47f..c4c500da12 100644 --- 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 index 36271762c6..81cb26b9d1 100644 --- a/src/app/shared/icon/icon.module.ts +++ b/src/app/shared/icon/icon.module.ts @@ -44,6 +44,7 @@ export class IconModule { 'danger-fill.svg', 'dashboard.svg', 'duplicate.svg', + 'edit.svg', 'envelope.svg', 'fyle-logo-dark.svg', 'fyle-logo-light.svg', @@ -51,6 +52,8 @@ export class IconModule { '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 index 21077aa341..2086936091 100644 --- a/src/assets/svg/merge.svg +++ b/src/assets/svg/merge.svg @@ -1,4 +1,4 @@ - - + +