Migrate currency to unit

2 years ago · cc991f9439
9 changed files with 70 additions and 46 deletions
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
@ -12,8 +12,9 @@
      <div class="col-12 d-flex justify-content-center mb-3">
        <gf-value
          size="large"
-          [currency]="user?.settings?.baseCurrency"
+          [isCurrency]="true"
          [locale]="user?.settings?.locale"
+          [unit]="user?.settings?.baseCurrency"
          [value]="valueInBaseCurrency"
        ></gf-value>
      </div>
@ -24,8 +25,9 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="currency"
+          [isCurrency]="true"
          [locale]="user?.settings?.locale"
+          [unit]="currency"
          [value]="balance"
          >Cash Balance</gf-value
        >
@ -34,8 +36,9 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="currency"
+          [isCurrency]="true"
          [locale]="user?.settings?.locale"
+          [unit]="currency"
          [value]="equity"
          >Equity</gf-value
        >
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
@ -13,8 +13,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.totalBuy"
      ></gf-value>
    </div>
@ -24,8 +25,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.totalSell"
      ></gf-value>
    </div>
@ -38,8 +40,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.committedFunds"
      ></gf-value>
    </div>
@ -49,8 +52,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.currentGrossPerformance"
      ></gf-value>
    </div>
@ -79,8 +83,9 @@
      <span *ngIf="summary?.fees || summary?.fees === 0" class="mr-1">-</span>
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.fees"
      ></gf-value>
    </div>
@ -93,8 +98,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.currentNetPerformance"
      ></gf-value>
    </div>
@ -121,8 +127,9 @@
      <gf-value
        class="justify-content-end"
        position="end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.currentValue"
      ></gf-value>
    </div>
@ -132,8 +139,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.items"
      ></gf-value>
    </div>
@ -152,8 +160,9 @@
      ></ion-icon>
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.emergencyFund"
      ></gf-value>
    </div>
@ -163,8 +172,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.cash"
      ></gf-value>
    </div>
@ -174,8 +184,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.excludedAccountsAndActivities"
      ></gf-value>
    </div>
@ -188,8 +199,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.netWorth"
      ></gf-value>
    </div>
@ -217,8 +229,9 @@
    <div class="justify-content-end">
      <gf-value
        class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
        [locale]="locale"
+        [unit]="baseCurrency"
        [value]="isLoading ? undefined : summary?.dividend"
      ></gf-value>
    </div>
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
@ -12,8 +12,9 @@
      <div class="col-12 d-flex justify-content-center mb-3">
        <gf-value
          size="large"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
          [locale]="data.locale"
+          [unit]="data.baseCurrency"
          [value]="value"
        ></gf-value>
      </div>
@ -40,8 +41,9 @@
          i18n
          size="medium"
          [colorizeSign]="true"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
          [locale]="data.locale"
+          [unit]="data.baseCurrency"
          [value]="netPerformance"
          >Change</gf-value
        >
@ -61,8 +63,9 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="SymbolProfile?.currency"
+          [isCurrency]="true"
          [locale]="data.locale"
+          [unit]="SymbolProfile?.currency"
          [value]="averagePrice"
          >Average Unit Price</gf-value
        >
@ -71,8 +74,9 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="SymbolProfile?.currency"
+          [isCurrency]="true"
          [locale]="data.locale"
+          [unit]="SymbolProfile?.currency"
          [value]="marketPrice"
          >Market Price</gf-value
        >
@ -81,9 +85,10 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="SymbolProfile?.currency"
+          [isCurrency]="true"
          [locale]="data.locale"
          [ngClass]="{ 'text-danger': minPrice?.toFixed(2) === marketPrice?.toFixed(2) && maxPrice?.toFixed(2) !== minPrice?.toFixed(2) }"
+          [unit]="SymbolProfile?.currency"
          [value]="minPrice"
          >Minimum Price</gf-value
        >
@ -92,9 +97,10 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="SymbolProfile?.currency"
+          [isCurrency]="true"
          [locale]="data.locale"
          [ngClass]="{ 'text-success': maxPrice?.toFixed(2) === marketPrice?.toFixed(2) && maxPrice?.toFixed(2) !== minPrice?.toFixed(2) }"
+          [unit]="SymbolProfile?.currency"
          [value]="maxPrice"
          >Maximum Price</gf-value
        >
@ -113,8 +119,9 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
          [locale]="data.locale"
+          [unit]="data.baseCurrency"
          [value]="investment"
          >Investment</gf-value
        >
@ -123,8 +130,9 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
          [locale]="data.locale"
+          [unit]="data.baseCurrency"
          [value]="dividendInBaseCurrency"
          >Dividend</gf-value
        >
@ -133,8 +141,9 @@
        <gf-value
          i18n
          size="medium"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
          [locale]="data.locale"
+          [unit]="data.baseCurrency"
          [value]="feeInBaseCurrency"
          >Fees</gf-value
        >
--- a/apps/client/src/app/components/position/position.component.html
+++ b/apps/client/src/app/components/position/position.component.html
@ -45,8 +45,9 @@
          <gf-value
            class="mr-3"
            [colorizeSign]="true"
-            [currency]="baseCurrency"
+            [isCurrency]="true"
            [locale]="locale"
+            [unit]="baseCurrency"
            [value]="position?.netPerformance"
          ></gf-value>
          <gf-value
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
@ -302,8 +302,9 @@
  <div class="d-flex" mat-dialog-actions>
    <gf-value
      class="flex-grow-1"
-      [currency]="activityForm.controls['currency']?.value ?? data.user?.settings?.baseCurrency"
+      [isCurrency]="true"
      [locale]="data.user?.settings?.locale"
+      [unit]="activityForm.controls['currency']?.value ?? data.user?.settings?.baseCurrency"
      [value]="total"
    ></gf-value>
    <div>
--- a/apps/client/src/app/pages/portfolio/fire/fire-page.html
+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.html
@ -59,8 +59,9 @@
      <span class="font-weight-bold"
        ><gf-value
          class="d-inline-block"
-          [currency]="user?.settings?.baseCurrency"
+          [isCurrency]="true"
          [locale]="user?.settings?.locale"
+          [unit]="user?.settings?.baseCurrency"
          [value]="withdrawalRatePerYear?.toNumber()"
        ></gf-value>
        per year</span
@ -69,8 +70,9 @@
      <span class="font-weight-bold"
        ><gf-value
          class="d-inline-block"
-          [currency]="user?.settings?.baseCurrency"
+          [isCurrency]="true"
          [locale]="user?.settings?.locale"
+          [unit]="user?.settings?.baseCurrency"
          [value]="withdrawalRatePerMonth?.toNumber()"
        ></gf-value>
        per month</span
@ -78,8 +80,9 @@
      <span class="font-weight-bold"
        ><gf-value
          class="d-inline-block"
-          [currency]="user?.settings?.baseCurrency"
+          [isCurrency]="true"
          [locale]="user?.settings?.locale"
+          [unit]="user?.settings?.baseCurrency"
          [value]="fireWealth?.toNumber()"
        ></gf-value
      ></span>
--- a/libs/ui/src/lib/value/value.component.html
+++ b/libs/ui/src/lib/value/value.component.html
@ -32,15 +32,9 @@
            {{ formattedValue }}
          </ng-container>
        </div>
-        <small *ngIf="currency && size === 'medium'" class="ml-1">
-          {{ currency }}
-        </small>
        <small *ngIf="unit && size === 'medium'" class="ml-1">
          {{ unit }}
        </small>
-        <div *ngIf="currency && size !== 'medium'" class="ml-1">
-          {{ currency }}
-        </div>
        <div *ngIf="unit && size !== 'medium'" class="ml-1">
          {{ unit }}
        </div>
--- a/libs/ui/src/lib/value/value.component.stories.ts
+++ b/libs/ui/src/lib/value/value.component.stories.ts
@ -24,8 +24,9 @@ Loading.args = {

 export const Currency = Template.bind({});
 Currency.args = {
-  currency: 'USD',
+  isCurrency: true,
  locale: 'en-US',
+  unit: 'USD',
  value: 7
 };

--- a/libs/ui/src/lib/value/value.component.ts
+++ b/libs/ui/src/lib/value/value.component.ts
@ -15,7 +15,6 @@ import { isNumber } from 'lodash';
 })
 export class ValueComponent implements OnChanges {
  @Input() colorizeSign = false;
-  @Input() currency = '';
  @Input() icon = '';
  @Input() isAbsolute = false;
  @Input() isCurrency = false;
@ -47,7 +46,7 @@ export class ValueComponent implements OnChanges {
        this.absoluteValue = Math.abs(<number>this.value);

        if (this.colorizeSign) {
-          if (this.currency || this.isCurrency) {
+          if (this.isCurrency) {
            try {
              this.formattedValue = this.absoluteValue.toLocaleString(
                this.locale,
@ -68,6 +67,13 @@ export class ValueComponent implements OnChanges {
              );
            } catch {}
          }
+        } else if (this.isCurrency) {
+          try {
+            this.formattedValue = this.value?.toLocaleString(this.locale, {
+              maximumFractionDigits: 2,
+              minimumFractionDigits: 2
+            });
+          } catch {}
        } else if (this.isPercent) {
          try {
            this.formattedValue = (this.value * 100).toLocaleString(
@ -78,13 +84,6 @@ export class ValueComponent implements OnChanges {
              }
            );
          } catch {}
-        } else if (this.currency || this.isCurrency) {
-          try {
-            this.formattedValue = this.value?.toLocaleString(this.locale, {
-              maximumFractionDigits: 2,
-              minimumFractionDigits: 2
-            });
-          } catch {}
        } else if (this.precision || this.precision === 0) {
          try {
            this.formattedValue = this.value?.toLocaleString(this.locale, {