diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
index 65c83b64d..a95f2eee0 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
@@ -177,6 +177,9 @@ describe('PortfolioCalculator', () => {
             netPerformancePercentageWithCurrencyEffect: new Big(
               '-0.05528341497550734703'
             ),
+            netPerformancePercentageWithCurrencyEffectMap: {
+              max: new Big('-0.18658152554233729881') // TODO: Different
+            },
             netPerformanceWithCurrencyEffect: new Big('-15.8'),
             netPerformanceWithCurrencyEffectMap: {
               max: new Big('-15.8')
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts
index 5787151c0..b0ee40299 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts
@@ -162,6 +162,9 @@ describe('PortfolioCalculator', () => {
             netPerformancePercentageWithCurrencyEffect: new Big(
               '-0.0552834149755073478'
             ),
+            netPerformancePercentageWithCurrencyEffectMap: {
+              max: new Big('-0.18658152554233729881') // TODO: Different
+            },
             netPerformanceWithCurrencyEffect: new Big('-15.8'),
             netPerformanceWithCurrencyEffectMap: {
               max: new Big('-15.8')
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts
index 6f4ed3fc3..a71342c5a 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts
@@ -147,6 +147,9 @@ describe('PortfolioCalculator', () => {
             netPerformancePercentageWithCurrencyEffect: new Big(
               '0.08437042459736456808'
             ),
+            netPerformancePercentageWithCurrencyEffectMap: {
+              max: new Big('0.08437042459736456808')
+            },
             netPerformanceWithCurrencyEffect: new Big('23.05'),
             netPerformanceWithCurrencyEffectMap: {
               max: new Big('23.05')
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
index 5bd4be395..ab4e2aaea 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
@@ -179,6 +179,9 @@ describe('PortfolioCalculator', () => {
             netPerformancePercentageWithCurrencyEffect: new Big(
               '41.64017412624815595315'
             ),
+            netPerformancePercentageWithCurrencyEffectMap: {
+              max: new Big('41.65910103572163194783')
+            },
             netPerformanceWithCurrencyEffect: new Big(
               '26516.208701400000064086'
             ),
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts
index 2426aded1..d628856dc 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts
@@ -130,6 +130,7 @@ describe('PortfolioCalculator', () => {
             netPerformance: null,
             netPerformancePercentage: null,
             netPerformancePercentageWithCurrencyEffect: null,
+            netPerformancePercentageWithCurrencyEffectMap: null,
             netPerformanceWithCurrencyEffect: null,
             netPerformanceWithCurrencyEffectMap: null,
             quantity: new Big('0'),
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts
index 24457f844..74d91f9b7 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts
@@ -160,6 +160,9 @@ describe('PortfolioCalculator', () => {
             netPerformancePercentageWithCurrencyEffect: new Big(
               '0.24112962014285697628'
             ),
+            netPerformancePercentageWithCurrencyEffectMap: {
+              max: new Big('0.24112962014285697628')
+            },
             netPerformanceWithCurrencyEffect: new Big('19.851974'),
             netPerformanceWithCurrencyEffectMap: {
               max: new Big('19.851974')
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts
index de7bcecc7..d24199af5 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts
@@ -130,6 +130,7 @@ describe('PortfolioCalculator', () => {
             netPerformance: null,
             netPerformancePercentage: null,
             netPerformancePercentageWithCurrencyEffect: null,
+            netPerformancePercentageWithCurrencyEffectMap: null,
             netPerformanceWithCurrencyEffect: null,
             netPerformanceWithCurrencyEffectMap: null,
             quantity: new Big('0'),
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
index b2827891b..3157c9171 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
@@ -162,6 +162,9 @@ describe('PortfolioCalculator', () => {
             netPerformancePercentageWithCurrencyEffect: new Big(
               '0.12184460284330327256'
             ),
+            netPerformancePercentageWithCurrencyEffectMap: {
+              max: new Big('0.12348284960422163588')
+            },
             netPerformanceWithCurrencyEffect: new Big('17.68'),
             netPerformanceWithCurrencyEffectMap: {
               max: new Big('17.68')
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts
index 4097ccda3..760508453 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts
@@ -192,6 +192,9 @@ describe('PortfolioCalculator', () => {
             netPerformancePercentageWithCurrencyEffect: new Big(
               '0.13100263852242744063'
             ),
+            netPerformancePercentageWithCurrencyEffectMap: {
+              max: new Big('0.14737796833773087071')
+            },
             netPerformanceWithCurrencyEffect: new Big('19.86'),
             netPerformanceWithCurrencyEffectMap: {
               max: new Big('19.86')