From b5f256be9582250277f0dab260f3997001024453 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 20 Jan 2023 20:50:32 +0100
Subject: [PATCH 1/2] Remove mail address (#1621)

---
 README.md                                       | 2 +-
 apps/client/src/app/pages/about/about-page.html | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f09dd7541..fea70c4b7 100644
--- a/README.md
+++ b/README.md
@@ -269,7 +269,7 @@ You can get the _Bearer Token_ via `GET http://localhost:3333/api/v1/auth/anonym
 
 Ghostfolio is **100% free** and **open source**. We encourage and support an active and healthy community that accepts contributions from the public - including you.
 
-Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack channel](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg), tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_) or send an e-mail to hi@ghostfol.io. We would love to hear from you.
+Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack channel](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) or tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_). We would love to hear from you.
 
 If you like to support this project, get [**Ghostfolio Premium**](https://ghostfol.io/en/pricing) or [**Buy me a coffee**](https://www.buymeacoffee.com/ghostfolio).
 
diff --git a/apps/client/src/app/pages/about/about-page.html b/apps/client/src/app/pages/about/about-page.html
index 20843c292..a6b688944 100644
--- a/apps/client/src/app/pages/about/about-page.html
+++ b/apps/client/src/app/pages/about/about-page.html
@@ -42,9 +42,11 @@
             href="https://twitter.com/ghostfolio_"
             title="Tweet to Ghostfolio on Twitter"
             >@ghostfolio_</a
-          >, send an e-mail to
-          <a href="mailto:hi@ghostfol.io" title="Send an e-mail"
-            >hi@ghostfol.io</a
+          ><ng-container *ngIf="hasPermissionForSubscription"
+            >, send an e-mail to
+            <a href="mailto:hi@ghostfol.io" title="Send an e-mail"
+              >hi@ghostfol.io</a
+            ></ng-container
           >
           or open an issue at
           <a

From a7e513a6d1d3a83ef045a0776a0677ac4f474788 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 20 Jan 2023 20:51:08 +0100
Subject: [PATCH 2/2] Bugfix/fix filtered value for emergency fund (#1619)

* Fix filtered value

* Update changelog
---
 CHANGELOG.md                                    | 6 ++++++
 apps/api/src/app/portfolio/portfolio.service.ts | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7afcf3965..11653d69c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Fixed the value of the active (emergency fund) filter in percentage on the allocations page
+
 ## 1.228.1 - 2023-01-18
 
 ### Added
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 210b5b838..5b7a8386f 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -614,6 +614,8 @@ export class PortfolioService {
         )
         .toNumber();
 
+      filteredValueInBaseCurrency = emergencyFund;
+
       accounts[UNKNOWN_KEY] = {
         balance: 0,
         currency: userCurrency,