Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Bugfix/fix zen mode (#723)
Thomas Kaul745ba978a3c4
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 2062723668..5b4c46f1c8 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Distinguished the labels _Other_ and _Unknown_ in the portfolio proportion chart component- Improved the portfolio entry page+### Fixed++- Fixed the _Zen Mode_+## 1.119.0 - 21.02.2022### Addeddiff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.tsindex 38a083c75f..5d15aa4237 100644--- a/apps/api/src/app/portfolio/portfolio.controller.ts+++ b/apps/api/src/app/portfolio/portfolio.controller.ts@@ -33,6 +33,7 @@ import {} from '@nestjs/common';import { REQUEST } from '@nestjs/core';import { AuthGuard } from '@nestjs/passport';+import { ViewMode } from '@prisma/client';import { StatusCodes, getReasonPhrase } from 'http-status-codes';import { PortfolioPositionDetail } from './interfaces/portfolio-position-detail.interface';@@ -213,6 +214,7 @@ export class PortfolioController {if (impersonationId ||+ this.request.user.Settings.viewMode === ViewMode.ZEN ||this.userService.isRestrictedView(this.request.user)) {performanceInformation.performance = nullifyValuesInObject(diff --git a/apps/client/src/app/components/home-holdings/home-holdings.component.ts b/apps/client/src/app/components/home-holdings/home-holdings.component.tsindex 50c452ea85..7d40a27ef6 100644--- a/apps/client/src/app/components/home-holdings/home-holdings.component.ts+++ b/apps/client/src/app/components/home-holdings/home-holdings.component.ts@@ -93,7 +93,9 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {});this.dateRange =- <DateRange>this.settingsStorageService.getSetting(RANGE) || 'max';+ this.user.settings.viewMode === 'ZEN'+ ? 'max'+ : <DateRange>this.settingsStorageService.getSetting(RANGE) ?? 'max';this.update();}diff --git a/apps/client/src/app/components/home-holdings/home-holdings.html b/apps/client/src/app/components/home-holdings/home-holdings.htmlindex 9b69a1a8e6..9e1fb9c9ed 100644--- a/apps/client/src/app/components/home-holdings/home-holdings.html+++ b/apps/client/src/app/components/home-holdings/home-holdings.html@@ -1,5 +1,5 @@<div class="container justify-content-center p-3">- <div class="mb-3 text-center">+ <div *ngIf="user.settings.viewMode !== 'ZEN'" class="mb-3 text-center"><gf-toggle[defaultValue]="dateRange"[isLoading]="positions === undefined"diff --git a/apps/client/src/app/components/home-overview/home-overview.component.ts b/apps/client/src/app/components/home-overview/home-overview.component.tsindex a102b10953..d6ae7e2b08 100644--- a/apps/client/src/app/components/home-overview/home-overview.component.ts+++ b/apps/client/src/app/components/home-overview/home-overview.component.ts@@ -32,6 +32,7 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {public isAllTimeLow: boolean;public isLoadingPerformance = true;public performance: PortfolioPerformance;+ public showDetails = false;public user: User;private unsubscribeSubject = new Subject<void>();@@ -79,7 +80,14 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {});this.dateRange =- <DateRange>this.settingsStorageService.getSetting(RANGE) || 'max';+ this.user.settings.viewMode === 'ZEN'+ ? 'max'+ : <DateRange>this.settingsStorageService.getSetting(RANGE) ?? 'max';++ this.showDetails =+ !this.hasImpersonationId &&+ !this.user.settings.isRestrictedView &&+ this.user.settings.viewMode !== 'ZEN';this.update();}diff --git a/apps/client/src/app/components/home-overview/home-overview.html b/apps/client/src/app/components/home-overview/home-overview.htmlindex a6e1c63f8b..82f45ed575 100644--- a/apps/client/src/app/components/home-overview/home-overview.html+++ b/apps/client/src/app/components/home-overview/home-overview.html@@ -34,9 +34,9 @@[isLoading]="isLoadingPerformance"[locale]="user?.settings?.locale"[performance]="performance"- [showDetails]="!hasImpersonationId && !user.settings.isRestrictedView"+ [showDetails]="showDetails"></gf-portfolio-performance>- <div class="text-center">+ <div *ngIf="showDetails" class="text-center"><gf-toggle[defaultValue]="dateRange"[isLoading]="isLoadingPerformance"