From b64482666e6eaae544f34b8f6861ac367379d38b Mon Sep 17 00:00:00 2001
From: JCNoguera <jcnoguera@boxfish.studio>
Date: Thu, 30 Nov 2023 10:24:29 +0100
Subject: [PATCH] exclude a validator on role changes

---
 .../ManaCalculator/actions/calculateManaRewards.ts | 14 +++++++++-----
 .../components/AdvancedSettingsValidator.tsx       | 12 +++++++-----
 .../ManaCalculator/hooks/useManaState.ts           |  7 +++++++
 .../ManaCalculator/types/validator.type.ts         |  1 +
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/ManaCalculator/actions/calculateManaRewards.ts b/src/components/ManaCalculator/actions/calculateManaRewards.ts
index b2ea44e3863..affe8cde86f 100644
--- a/src/components/ManaCalculator/actions/calculateManaRewards.ts
+++ b/src/components/ManaCalculator/actions/calculateManaRewards.ts
@@ -32,16 +32,20 @@ export function calculateManaRewards(
     totalTargetReward = targetReward(initialEpoch, supply, generationPerSlot);
   }
 
-  const lockedStake: number[] = validators.map(
+  const filteredValidators = validators.filter(
+    (validator) => !validator.excluded,
+  );
+
+  const lockedStake: number[] = filteredValidators.map(
     (validator) => validator.lockedStake,
   );
-  const fixedCosts: number[] = validators.map(
+  const fixedCosts: number[] = filteredValidators.map(
     (validator) => validator.fixedCost,
   );
-  const performance: number[] = validators.map(
+  const performance: number[] = filteredValidators.map(
     (validator) => validator.performanceFactor,
   );
-  const delegatedStake: number[] = validators.map(
+  const delegatedStake: number[] = filteredValidators.map(
     (validator) => validator.delegatedStake,
   );
 
@@ -55,7 +59,7 @@ export function calculateManaRewards(
         validatorParameters.attractedDelegatedStakeFromOtherPools *
           delegatedStake.reduce((a, b) => a + b, 0),
     );
-    for (let i = 0; i < validators.length; i++) {
+    for (let i = 0; i < filteredValidators.length; i++) {
       delegatedStake[i] *=
         1 - validatorParameters.attractedDelegatedStakeFromOtherPools;
     }
diff --git a/src/components/ManaCalculator/components/AdvancedSettingsValidator.tsx b/src/components/ManaCalculator/components/AdvancedSettingsValidator.tsx
index e29f0ae995f..d0d9026ce29 100644
--- a/src/components/ManaCalculator/components/AdvancedSettingsValidator.tsx
+++ b/src/components/ManaCalculator/components/AdvancedSettingsValidator.tsx
@@ -37,11 +37,13 @@ export function AdvancedSettingsValidator() {
           </div>
           <div className='col col--1'></div>
         </div>
-        {state.validators.map((validator, i) => (
-          <div className='row row--centered' key={i}>
-            <ValidatorCard validator={validator} id={i} />
-          </div>
-        ))}
+        {state.validators
+          .filter(({ excluded }) => !excluded)
+          .map((validator, i) => (
+            <div className='row row--centered' key={i}>
+              <ValidatorCard validator={validator} id={i} />
+            </div>
+          ))}
       </div>
       <button
         className='button button--block mana-calculator__button '
diff --git a/src/components/ManaCalculator/hooks/useManaState.ts b/src/components/ManaCalculator/hooks/useManaState.ts
index 75cd3d844d0..528be52849c 100644
--- a/src/components/ManaCalculator/hooks/useManaState.ts
+++ b/src/components/ManaCalculator/hooks/useManaState.ts
@@ -150,9 +150,16 @@ export function useGivenManaState(
   }
 
   function handleUserChange(value: UserType) {
+    const validators = [...state.validators];
+    if (value === UserType.VALIDATOR) {
+      validators[0].excluded = true;
+    } else {
+      validators[0].excluded = false;
+    }
     setState({
       ...state,
       userType: value,
+      validators,
     });
   }
 
diff --git a/src/components/ManaCalculator/types/validator.type.ts b/src/components/ManaCalculator/types/validator.type.ts
index 0de049520b5..193bee3fb29 100644
--- a/src/components/ManaCalculator/types/validator.type.ts
+++ b/src/components/ManaCalculator/types/validator.type.ts
@@ -3,6 +3,7 @@ export interface ValidatorProps {
   delegatedStake: number;
   performanceFactor: number;
   fixedCost: number;
+  excluded?: boolean;
 }
 
 export interface ValidatorParameters {