From ffa5771d6a7e2aa50fff0385c319609af27924e6 Mon Sep 17 00:00:00 2001 From: SahilK-027 Date: Mon, 9 Dec 2024 11:33:16 +0530 Subject: [PATCH 01/10] Milestone 1: Expense view display exact amount --- .../fyle/my-expenses/my-expenses.page.html | 2 +- .../fyle/my-expenses/my-expenses.page.scss | 3 +- .../expenses-card.component.html | 98 ++++++++++++------- .../expenses-card.component.scss | 57 ++++++----- src/global.scss | 6 +- 5 files changed, 102 insertions(+), 64 deletions(-) diff --git a/src/app/fyle/my-expenses/my-expenses.page.html b/src/app/fyle/my-expenses/my-expenses.page.html index f143074361..a65952fc56 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.html +++ b/src/app/fyle/my-expenses/my-expenses.page.html @@ -68,7 +68,7 @@ {{allExpensesStats?.count}} {{(allExpensesStats?.count > 1) ? 'expenses' : 'expense'}} - ({{(allExpensesStats.amount || 0) | humanizeCurrency: homeCurrency }}) + ({{ { value: allExpensesStats.amount || 0, currencyCode: homeCurrency } | exactCurrency }}) diff --git a/src/app/fyle/my-expenses/my-expenses.page.scss b/src/app/fyle/my-expenses/my-expenses.page.scss index a39f99ab64..d4171b39b7 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.scss +++ b/src/app/fyle/my-expenses/my-expenses.page.scss @@ -39,10 +39,11 @@ &--multiselect-title { padding-left: 12px; padding-right: 0px; + font-size: 18px; } &--multiselect-amount { - font-size: 16px; + font-size: 14px; font-weight: 400; } 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 index 5c765c803f..ffe45ae69b 100644 --- a/src/app/shared/components/expenses-card-v2/expenses-card.component.html +++ b/src/app/shared/components/expenses-card-v2/expenses-card.component.html @@ -22,13 +22,15 @@
+
+
@@ -51,6 +53,7 @@
+
+ +
@@ -134,6 +141,7 @@ + @@ -165,8 +173,10 @@ +
+
+
-
- {{ expenseFields?.project_id[0]?.field_name }}: - {{ expense?.project?.display_name ? expense?.project?.display_name : 'Unspecified' }} + + +
+
+ + {{ (expense.currency | currencySymbol : 'wide') || (homeCurrency | currencySymbol : 'wide') }} + + + + {{ { value: expense.amount, currencyCode: expense.currency, skipSymbol: true } | exactCurrency }} + + + {{ { value: expense.amount, currencyCode: homeCurrency, skipSymbol: true } | exactCurrency }} + + + +
+ +
+ ({{ expense.foreign_amount | humanizeCurrency : expense.foreign_currency }} at + {{ expense.amount / expense.foreign_amount | currency : expense.currency : 'code' }})
+ +
-
Expense information
-
missing
-
-
-
- - {{ (expense.currency | currencySymbol : 'wide') || (homeCurrency | currencySymbol : 'wide') }} - +
Expense information missing
- - - {{ expense.amount | humanizeCurrency : expense.currency : true }} - - - {{ expense.amount | humanizeCurrency : homeCurrency : true }} - - - -
+ +
+
+ + {{ (expense.currency | currencySymbol : 'wide') || (homeCurrency | currencySymbol : 'wide') }} + -
- ({{ expense.foreign_amount | humanizeCurrency : expense.foreign_currency }} at - {{ expense.amount / expense.foreign_amount | currency : expense.currency : 'code' }}) + + + {{ expense.amount | humanizeCurrency : expense.currency : true }} + + + {{ expense.amount | humanizeCurrency : homeCurrency : true }} + + + +
+ +
+ ({{ expense.foreign_amount | humanizeCurrency : expense.foreign_currency }} at + {{ expense.amount / expense.foreign_amount | currency : expense.currency : 'code' }}) +
+
-
+ +
+
{{ expense.state | expenseState | titlecase }} diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss index 532908672d..4473e2ad41 100644 --- a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss +++ b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss @@ -2,7 +2,7 @@ .expenses-card { &--date { - color: $grey-light; + color: $black-light; font-size: 14px; padding: 12px 0 12px 12px; background-color: $white; @@ -27,6 +27,13 @@ width: 100%; overflow: hidden; text-overflow: ellipsis; + padding: 4px 0; + } + + &--vertical-dotted-border { + border-left: 2px dashed $border-tertiary; + height: auto; + margin: 0 8px; } &--checkbox-container { @@ -104,35 +111,38 @@ &--receipt-container { background-color: $light-grey; border-radius: 8px; - height: 74px; padding: 20px; - min-width: 74px; + height: 72px; + width: 56px; + justify-content: center; + align-items: center; } &--receipt-image-container { background-color: $light-grey; border-radius: 8px; - height: 74px; - min-width: 75px; + height: 72px; + width: 56px; display: flex; justify-content: center; align-items: center; } &--receipt-image { - height: 70px; - width: 80px; + height: auto; + max-width: 56px; } &--with-image { background-size: cover; background-repeat: no-repeat; background-position: center; + width: 56px; } &--receipt-icon { - height: 35px; - width: 35px; + height: 20px; + width: 20px; color: $black-light; &__pdf { @@ -146,20 +156,21 @@ } &--receipt-thumbnail { - height: 74px; + height: 72px; margin-left: auto; margin-right: auto; } &--category-vendor-project-container { - padding: 3px 20px 4px 11px; width: 100%; overflow: hidden; text-overflow: ellipsis; + display: flex; + flex-direction: column; + &__align-vertical-center { display: flex; flex-direction: column; - justify-content: center; } &__error { @@ -177,13 +188,13 @@ &--category { color: $black; - font-size: 16px; + font-size: 14px; font-weight: 500; line-height: 1.3; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - max-width: 126px; + max-width: 164px; } &--icons { @@ -222,7 +233,7 @@ } &--vendor { - color: $blue-black; + color: $dark-grey; font-size: 14px; line-height: 1.2; margin-top: 2px; @@ -254,22 +265,25 @@ flex-direction: column; } - &--currency-amount-container { - width: 100%; - white-space: nowrap; + &--currency-amount-exchange-rate-container { + display: flex; + align-items: center; + gap: 4px; + margin-top: 10px; + flex-wrap: wrap; } &--currency { - color: $black-light; + color: $black; font-weight: 500; - font-size: 16px; + font-size: 14px; line-height: 1.25; margin-right: 1px; } &--amount { color: $black; - font-size: 20px; + font-size: 16px; line-height: 1.3; margin-right: 6px; font-weight: 500; @@ -304,7 +318,6 @@ } &--state-container { - margin-top: 4px; align-self: flex-end; &__center { diff --git a/src/global.scss b/src/global.scss index 6ca6647cbe..a7f6763b64 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1384,11 +1384,11 @@ ion-toggle.toggle-checked::before { border: 1px solid $brand-primary; border-radius: 14px; color: $brand-primary; - font-size: 12px; + font-size: 10px; font-weight: 500; display: inline-block; - line-height: 1; - padding: 5px 12px; + line-height: 18px; + padding: 2px 10px; text-align: center; text-transform: uppercase; From d7648e17d52fa5d071ebc49441a9465b808bd1f6 Mon Sep 17 00:00:00 2001 From: SahilK-027 Date: Mon, 9 Dec 2024 11:52:40 +0530 Subject: [PATCH 02/10] minor --- .../components/expenses-card-v2/expenses-card.component.html | 2 +- .../components/expenses-card-v2/expenses-card.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index ffe45ae69b..d61b3dfbf4 100644 --- a/src/app/shared/components/expenses-card-v2/expenses-card.component.html +++ b/src/app/shared/components/expenses-card-v2/expenses-card.component.html @@ -235,7 +235,7 @@
-
+
({{ expense.foreign_amount | humanizeCurrency : expense.foreign_currency }} at {{ expense.amount / expense.foreign_amount | currency : expense.currency : 'code' }})
diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss index 4473e2ad41..27aaeabd67 100644 --- a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss +++ b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss @@ -39,7 +39,7 @@ &--checkbox-container { margin-top: auto; margin-bottom: auto; - margin-right: 16px; + margin-right: 8px; } &--checkbox { From f6b7ea69766fc7133ce8a31e5237445ecb9d0bc5 Mon Sep 17 00:00:00 2001 From: SK027 Date: Mon, 9 Dec 2024 17:22:47 +0530 Subject: [PATCH 03/10] feat: Update my Expense list view to use new shimmers (#3314) --- src/app/fyle/my-expenses/my-expenses.page.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/fyle/my-expenses/my-expenses.page.html b/src/app/fyle/my-expenses/my-expenses.page.html index a65952fc56..2351d1f98e 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.html +++ b/src/app/fyle/my-expenses/my-expenses.page.html @@ -114,6 +114,7 @@ @@ -205,6 +206,7 @@ From 8533be3014509da597b549ca745c5b6341dda40c Mon Sep 17 00:00:00 2001 From: SK027 Date: Tue, 10 Dec 2024 12:58:08 +0530 Subject: [PATCH 04/10] feat: Update create-new-report amount section (#3315) --- .../create-new-report.component.html | 8 ++-- .../create-new-report.component.scss | 37 +++++++++++++------ .../create-new-report.component.spec.ts | 5 ++- src/assets/svg/notch.svg | 4 +- src/global.scss | 4 +- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/app/shared/components/create-new-report-v2/create-new-report.component.html b/src/app/shared/components/create-new-report-v2/create-new-report.component.html index 2777b65f82..b5b3b0cea0 100644 --- a/src/app/shared/components/create-new-report-v2/create-new-report.component.html +++ b/src/app/shared/components/create-new-report-v2/create-new-report.component.html @@ -5,8 +5,10 @@
Create new report
- {{ selectedElements.length }} {{ selectedElements.length > 1 ? 'Expenses' : 'Expense' }} - - {{ selectedTotalAmount || 0 | humanizeCurrency : homeCurrency }} + {{ selectedElements.length }} {{ selectedElements.length > 1 ? 'expenses' : 'expense' }} +
+
+ {{ { value: selectedTotalAmount || 0, currencyCode: homeCurrency } | exactCurrency }}
@@ -40,7 +42,7 @@
Please enter report name.
-
EXPENSES
+
Expenses
{ 'create', ]); const humanizeCurrencyPipeSpy = jasmine.createSpyObj('HumanizeCurrency', ['transform']); + const exactCurrencyPipeSpy = jasmine.createSpyObj('ExactCurrency', ['transform']); const fyCurrencyPipeSpy = jasmine.createSpyObj('FyCurrencyPipe', ['transform']); TestBed.configureTestingModule({ - declarations: [CreateNewReportComponent, HumanizeCurrencyPipe, FyCurrencyPipe], + declarations: [CreateNewReportComponent, HumanizeCurrencyPipe, ExactCurrencyPipe, FyCurrencyPipe], imports: [ IonicModule.forRoot(), MatIconModule, @@ -59,6 +61,7 @@ describe('CreateNewReportComponent', () => { { provide: CurrencyService, useValue: currencyService }, { provide: ExpenseFieldsService, useValue: expenseFieldsService }, { provide: HumanizeCurrencyPipe, useValue: humanizeCurrencyPipeSpy }, + { provide: ExactCurrencyPipe, useValue: exactCurrencyPipeSpy }, { provide: FyCurrencyPipe, useValue: fyCurrencyPipeSpy }, { provide: SpenderReportsService, useValue: spenderReportsService }, ], diff --git a/src/assets/svg/notch.svg b/src/assets/svg/notch.svg index cb688eb262..83b64c0fe1 100755 --- a/src/assets/svg/notch.svg +++ b/src/assets/svg/notch.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index 000e1d26b3..91ab40e86e 100644 --- a/src/global.scss +++ b/src/global.scss @@ -523,9 +523,9 @@ mat-checkbox { } .mat-checkbox-label { - margin-left: 10px !important; font-size: 14px; - color: $black; + font-weight: 400; + color: $blue-black; } } From e13ab12bb2bdc75ea9b76e6bce3e3d920f646f0f Mon Sep 17 00:00:00 2001 From: SK027 Date: Tue, 10 Dec 2024 15:52:02 +0530 Subject: [PATCH 05/10] fix: Update smaller screen size design for header (#3320) --- src/app/fyle/my-expenses/my-expenses.page.html | 6 +++--- src/app/fyle/my-expenses/my-expenses.page.scss | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/fyle/my-expenses/my-expenses.page.html b/src/app/fyle/my-expenses/my-expenses.page.html index 2351d1f98e..2dfc48aa02 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.html +++ b/src/app/fyle/my-expenses/my-expenses.page.html @@ -65,12 +65,12 @@ - - {{allExpensesStats?.count}} {{(allExpensesStats?.count > 1) ? 'expenses' : 'expense'}} +
+ {{allExpensesStats?.count}} {{(allExpensesStats?.count > 1) ? 'expenses' : 'expense'}} ({{ { value: allExpensesStats.amount || 0, currencyCode: homeCurrency } | exactCurrency }}) - +
diff --git a/src/app/fyle/my-expenses/my-expenses.page.scss b/src/app/fyle/my-expenses/my-expenses.page.scss index d4171b39b7..d76436656a 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.scss +++ b/src/app/fyle/my-expenses/my-expenses.page.scss @@ -37,9 +37,13 @@ } &--multiselect-title { - padding-left: 12px; - padding-right: 0px; + display: flex; + align-items: center; + flex-wrap: wrap; + color: $blue-black; + padding: 20px 0px 20px 12px; font-size: 18px; + gap: 4px; } &--multiselect-amount { From cb5be41e3d31a27e3ef291fd8fd3925358efec56 Mon Sep 17 00:00:00 2001 From: SK027 Date: Tue, 10 Dec 2024 17:40:14 +0530 Subject: [PATCH 06/10] feat: Add to expenses to report section (Use Exact Amount) (#3322) --- .../add-txn-to-report-dialog.component.html | 20 ++++++++----- .../add-txn-to-report-dialog.component.scss | 29 ++++++++++++++----- ...add-txn-to-report-dialog.component.spec.ts | 2 ++ .../fyle/my-expenses/my-expenses.page.scss | 11 ++++--- src/global.scss | 2 +- 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.html b/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.html index 8da31cda7a..3c2512f8e2 100644 --- a/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.html +++ b/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.html @@ -1,5 +1,6 @@
+ @@ -9,7 +10,7 @@ class="report-list--header--row-icon" > - Add to Report + Add to Report
- - + + + + +
{{ report.purpose }}
{{ report.num_expenses }} Expense{{ report.num_expenses > 1 ? 's' : '' }}
- -
{{ reportCurrencySymbol }} - {{ - report.amount || 0 | humanizeCurrency : report.currency : true - }} + + {{ { value: report.amount || 0, currencyCode: report.currency, skipSymbol: true } | exactCurrency }} +
+ +
{{ report.state | reportState : data.isNewReportsFlowEnabled | snakeCaseToSpaceCase | titlecase }} diff --git a/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.scss b/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.scss index 54c7dc3ebe..52a94908a5 100644 --- a/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.scss +++ b/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.scss @@ -3,16 +3,21 @@ $reports_sent_back_color: #da1e28; .report-list { &--header { - font-size: 24px; + font-size: 18px; line-height: 1.3; color: $black; - margin-bottom: 24px; font-weight: 500; + border-bottom: 1px solid $grey; &--row-icon-container { display: flex; align-items: center; justify-content: center; + font-size: 20px; + } + + &--handle-bar-icon { + margin: 0 0 2px 0; } } @@ -20,8 +25,13 @@ $reports_sent_back_color: #da1e28; margin-top: 10px; } + &--list-icon { + width: 16px; + height: 16px; + } + &--currency-amount-container { - margin-bottom: 4px; + margin: 10px 0 4px 0; } &--currency { @@ -34,7 +44,7 @@ $reports_sent_back_color: #da1e28; &--amount { color: $black; - font-size: 20px; + font-size: 16px; line-height: 1.3; font-weight: 500; } @@ -42,19 +52,24 @@ $reports_sent_back_color: #da1e28; &--purpose { font-weight: 500; color: $black; - font-size: 18px; + font-size: 14px; line-height: 1.3; } &--count { - color: $blue-black; + color: $dark-grey; + font-size: 12px; line-height: 1.3; margin-top: 2px; } + &--report-card { + padding-top: 6px; + } + &--divider { border-bottom: 1px solid $grey-lighter; - margin-bottom: 14px; + margin-bottom: 6px; } &--state { diff --git a/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.spec.ts b/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.spec.ts index 0ea0386428..ae603ad8a6 100644 --- a/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.spec.ts +++ b/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.spec.ts @@ -15,6 +15,7 @@ import { ReportState } from 'src/app/shared/pipes/report-state.pipe'; import { SnakeCaseToSpaceCase } from 'src/app/shared/pipes/snake-case-to-space-case.pipe'; import { AddTxnToReportDialogComponent } from './add-txn-to-report-dialog.component'; import { expectedReportsSinglePage } from 'src/app/core/mock-data/platform-report.data'; +import { ExactCurrencyPipe } from 'src/app/shared/pipes/exact-currency.pipe'; describe('AddTxnToReportDialogComponent', () => { let component: AddTxnToReportDialogComponent; @@ -32,6 +33,7 @@ describe('AddTxnToReportDialogComponent', () => { AddTxnToReportDialogComponent, FyZeroStateComponent, HumanizeCurrencyPipe, + ExactCurrencyPipe, ReportState, SnakeCaseToSpaceCase, ], diff --git a/src/app/fyle/my-expenses/my-expenses.page.scss b/src/app/fyle/my-expenses/my-expenses.page.scss index d76436656a..094157dc93 100644 --- a/src/app/fyle/my-expenses/my-expenses.page.scss +++ b/src/app/fyle/my-expenses/my-expenses.page.scss @@ -294,8 +294,9 @@ &--footer-conatiner { display: flex; justify-content: space-around; - padding: 14px 36px; + padding: 16px; position: fixed; + gap: 16px; bottom: 0; width: 100%; background-color: $pure-white; @@ -312,10 +313,13 @@ height: auto; background-color: transparent; color: $black; - font-size: 16px; + font-size: 14px; line-height: 1.25; + border: 1px solid $grey; + border-radius: 4px; + &__disabled { - opacity: 0.2; + opacity: 0.6; } } @@ -326,7 +330,6 @@ font-size: 14px; line-height: 1.3; border-radius: 4px; - width: 100%; &__disabled { opacity: 0.8; diff --git a/src/global.scss b/src/global.scss index 91ab40e86e..3e228c8341 100644 --- a/src/global.scss +++ b/src/global.scss @@ -87,7 +87,7 @@ ion-popover.error-popover { } .mat-bottom-sheet-1 { - padding: 24px 16px !important; + padding: 16px 12px 12px 12px !important; border-radius: 16px 16px 0px 0px !important; } From 3bb9dbfb1ca4f571104b8156b98dbad40dc27215 Mon Sep 17 00:00:00 2001 From: SK027 Date: Tue, 10 Dec 2024 18:37:40 +0530 Subject: [PATCH 07/10] feat: Expense card section (small screens) (#3323) --- .../expenses-card-v2/expenses-card.component.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss index 27aaeabd67..6b346ef508 100644 --- a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss +++ b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss @@ -182,7 +182,6 @@ } &--category-icon-container { - max-width: 170px; width: 100%; } @@ -195,14 +194,16 @@ overflow: hidden; text-overflow: ellipsis; max-width: 164px; + padding-right: 4px; } &--icons { display: flex; align-items: center; + padding-right: 4px; + gap: 4px; &__policy-violated-icon { - margin-left: 4px; width: 16px; height: 16px; color: $red; @@ -210,7 +211,6 @@ } &__split-icon { - margin-left: 4px; width: 16px; height: 16px; color: $brand-primary-light; @@ -219,7 +219,6 @@ &__duplicate-icon { width: 16px; height: 16px; - margin-left: 4px; color: $dark-yellow; } } From 6fbb7b69fc6607665df55e4639ca84105158f22a Mon Sep 17 00:00:00 2001 From: SahilK-027 Date: Thu, 12 Dec 2024 11:42:07 +0530 Subject: [PATCH 08/10] minor --- src/global.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/global.scss b/src/global.scss index 3e228c8341..ca9f8278cf 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1391,6 +1391,7 @@ ion-toggle.toggle-checked::before { padding: 2px 10px; text-align: center; text-transform: uppercase; + white-space: nowrap; //get state keys for generating state class @each $state in map-keys($states) { From b4211e980aa3b6dcca5eb785ef5f0dbafb2d5ddc Mon Sep 17 00:00:00 2001 From: SahilK-027 Date: Fri, 13 Dec 2024 12:39:35 +0530 Subject: [PATCH 09/10] minor --- .../expenses-card-v2/expenses-card.component.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss index 6b346ef508..ee3ae5eb83 100644 --- a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss +++ b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss @@ -193,7 +193,7 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - max-width: 164px; + max-width: 80%; padding-right: 4px; } @@ -233,7 +233,7 @@ &--vendor { color: $dark-grey; - font-size: 14px; + font-size: 12px; line-height: 1.2; margin-top: 2px; white-space: nowrap; @@ -275,7 +275,7 @@ &--currency { color: $black; font-weight: 500; - font-size: 14px; + font-size: 16px; line-height: 1.25; margin-right: 1px; } From e23e22ce3d7df8fde5d53247fb6cccdf3e06c2fd Mon Sep 17 00:00:00 2001 From: SahilK-027 Date: Fri, 13 Dec 2024 12:45:04 +0530 Subject: [PATCH 10/10] minor font-size change --- .../add-txn-to-report-dialog.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.scss b/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.scss index 52a94908a5..24234fd847 100644 --- a/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.scss +++ b/src/app/fyle/my-expenses/add-txn-to-report-dialog/add-txn-to-report-dialog.component.scss @@ -37,7 +37,7 @@ $reports_sent_back_color: #da1e28; &--currency { color: $black-light; font-weight: 500; - font-size: 14px; + font-size: 16px; line-height: 1.3; margin-right: 2px; }