Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/display values in base currency on mobile (#796)

Thomas Kaulfa7919627851
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0110e088fe..3cd272a95f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Display the value in base currency in the accounts table on mobile
+- Display the value in base currency in the activities table on mobile
- Renamed `orders` to `activities` in import and export functionality
- Harmonized the algebraic sign of `currentGrossPerformancePercent` and `currentNetPerformancePercent` with `currentGrossPerformance` and `currentNetPerformance`
- Improved the pricing page
diff --git a/apps/client/src/app/components/accounts-table/accounts-table.component.html b/apps/client/src/app/components/accounts-table/accounts-table.component.html
index 51ad3e58dd..5e8fcdba91 100644
--- a/apps/client/src/app/components/accounts-table/accounts-table.component.html
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.html
@@ -78,10 +78,19 @@
</ng-container>
<ng-container matColumnDef="balance">
- <th *matHeaderCellDef class="px-1 text-right" i18n mat-header-cell>
+ <th
+ *matHeaderCellDef
+ class="d-none d-lg-table-cell px-1 text-right"
+ i18n
+ mat-header-cell
+ >
Cash Balance
</th>
- <td *matCellDef="let element" class="px-1 text-right" mat-cell>
+ <td
+ *matCellDef="let element"
+ class="d-none d-lg-table-cell px-1 text-right"
+ mat-cell
+ >
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
@@ -89,7 +98,11 @@
[value]="element.balance"
></gf-value>
</td>
- <td *matFooterCellDef class="px-1 text-right" mat-footer-cell>
+ <td
+ *matFooterCellDef
+ class="d-none d-lg-table-cell px-1 text-right"
+ mat-footer-cell
+ >
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
@@ -100,10 +113,19 @@
</ng-container>
<ng-container matColumnDef="value">
- <th *matHeaderCellDef class="px-1 text-right" i18n mat-header-cell>
+ <th
+ *matHeaderCellDef
+ class="d-none d-lg-table-cell px-1 text-right"
+ i18n
+ mat-header-cell
+ >
Value
</th>
- <td *matCellDef="let element" class="px-1 text-right" mat-cell>
+ <td
+ *matCellDef="let element"
+ class="d-none d-lg-table-cell px-1 text-right"
+ mat-cell
+ >
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
@@ -111,7 +133,46 @@
[value]="element.value"
></gf-value>
</td>
- <td *matFooterCellDef class="px-1 text-right" mat-footer-cell>
+ <td
+ *matFooterCellDef
+ class="d-none d-lg-table-cell px-1 text-right"
+ mat-footer-cell
+ >
+ <gf-value
+ class="d-inline-block justify-content-end"
+ [isCurrency]="true"
+ [locale]="locale"
+ [value]="totalValueInBaseCurrency"
+ ></gf-value>
+ </td>
+ </ng-container>
+
+ <ng-container matColumnDef="valueInBaseCurrency">
+ <th
+ *matHeaderCellDef
+ class="d-lg-none d-xl-none px-1 text-right"
+ i18n
+ mat-header-cell
+ >
+ Value
+ </th>
+ <td
+ *matCellDef="let element"
+ class="d-lg-none d-xl-none px-1 text-right"
+ mat-cell
+ >
+ <gf-value
+ class="d-inline-block justify-content-end"
+ [isCurrency]="true"
+ [locale]="locale"
+ [value]="element.valueInBaseCurrency"
+ ></gf-value>
+ </td>
+ <td
+ *matFooterCellDef
+ class="d-lg-none d-xl-none px-1 text-right"
+ mat-footer-cell
+ >
<gf-value
class="d-inline-block justify-content-end"
[isCurrency]="true"
diff --git a/apps/client/src/app/components/accounts-table/accounts-table.component.ts b/apps/client/src/app/components/accounts-table/accounts-table.component.ts
index 994d6ab642..4d82b5ed6b 100644
--- a/apps/client/src/app/components/accounts-table/accounts-table.component.ts
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.ts
@@ -50,7 +50,8 @@ export class AccountsTableComponent implements OnChanges, OnDestroy, OnInit {
'transactions',
'balance',
'value',
- 'currency'
+ 'currency',
+ 'valueInBaseCurrency'
];
if (this.showActions) {
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 3fecdd9068..cbcb7da9c3 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -248,14 +248,18 @@
<ng-container matColumnDef="value">
<th
*matHeaderCellDef
- class="justify-content-end px-1"
+ class="d-none d-lg-table-cell justify-content-end px-1"
i18n
mat-header-cell
mat-sort-header
>
Value
</th>
- <td *matCellDef="let element" class="px-1" mat-cell>
+ <td
+ *matCellDef="let element"
+ class="d-none d-lg-table-cell px-1"
+ mat-cell
+ >
<div class="d-flex justify-content-end">
<gf-value
[isCurrency]="true"
@@ -264,7 +268,38 @@
></gf-value>
</div>
</td>
- <td *matFooterCellDef class="px-1" mat-footer-cell>
+ <td *matFooterCellDef class="d-none d-lg-table-cell px-1" mat-footer-cell>
+ <div class="d-flex justify-content-end">
+ <gf-value
+ [isAbsolute]="true"
+ [isCurrency]="true"
+ [locale]="locale"
+ [value]="isLoading ? undefined : totalValue"
+ ></gf-value>
+ </div>
+ </td>
+ </ng-container>
+
+ <ng-container matColumnDef="valueInBaseCurrency">
+ <th
+ *matHeaderCellDef
+ class="d-lg-none d-xl-none justify-content-end px-1"
+ i18n
+ mat-header-cell
+ mat-sort-header
+ >
+ Value
+ </th>
+ <td *matCellDef="let element" class="d-lg-none d-xl-none px-1" mat-cell>
+ <div class="d-flex justify-content-end">
+ <gf-value
+ [isCurrency]="true"
+ [locale]="locale"
+ [value]="isLoading ? undefined : element.valueInBaseCurrency"
+ ></gf-value>
+ </div>
+ </td>
+ <td *matFooterCellDef class="d-lg-none d-xl-none px-1" mat-footer-cell>
<div class="d-flex justify-content-end">
<gf-value
[isAbsolute]="true"
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index 73182bced8..b8d8b05970 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -140,6 +140,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
'fee',
'value',
'currency',
+ 'valueInBaseCurrency',
'account',
'actions'
];