fix for the staker status

Signed-off-by: Uncle Stretch <uncle.stretch@ghostchain.io>

src/action.rs

@@ -105,6 +105,8 @@ pub enum Action {
     GetValidatorPrefs([u8; 32], bool),
     GetSlashingSpans([u8; 32], bool),
     GetValidatorLatestClaim([u8; 32], bool),
+    GetValidatorIsDisabled([u8; 32], bool),
+    GetValidatorInSession([u8; 32], bool),
     GetCurrentValidatorEraRewards,
 
     SetNodeName(Option<String>),
@@ -135,6 +137,7 @@ pub enum Action {
     SetValidatorEraSlash(u32, u128),
     SetValidatorEraUnlocking(u32, u128, [u8; 32]),
     SetValidatorLatestClaim(u32, [u8; 32]),
+    SetValidatorInSession(bool, [u8; 32]),
     SetIsBonded(bool),
     SetStakedAmountRatio(u128, u128, [u8; 32]),
     SetStakedRatio(u128, u128, [u8; 32]),

src/components/validator/reward_details.rs

@@ -24,6 +24,7 @@ pub struct RewardDetails {
     stash: [u8; 32],
     in_staking_validators: bool, 
     in_session_validators: bool,
+    is_disabled: bool,
 }
 
 impl Default for RewardDetails {
@@ -43,6 +44,7 @@ impl RewardDetails {
             stash: [0u8; 32],
             in_staking_validators: false, 
             in_session_validators: false,
+            is_disabled: false,
         }
     }
 
@@ -79,6 +81,13 @@ impl Component for RewardDetails {
     fn update(&mut self, action: Action) -> Result<Option<Action>> {
         match action {
             Action::SetStashAccount(stash) => self.stash = stash,
+            Action::SetCurrentValidatorEraRewards(_, _, individual) => self.is_disabled = individual
+                .iter()
+                .find(|data| data.account_id == self.stash)
+                .map(|data| data.disabled)
+                .unwrap_or_default(),
+            Action::SetValidatorInSession(in_session_validators, account_id) if self.stash == account_id =>
+                self.in_session_validators = in_session_validators,
             Action::SetValidatorPrefs(commission, disabled, account_id) if self.stash == account_id => {
                 self.commission = commission;
                 self.in_staking_validators = commission.is_some();
@@ -95,11 +104,15 @@ impl Component for RewardDetails {
         let [_, _, place] = super::validator_balance_layout(area);
         let (border_style, border_type) = self.palette.create_border_style(false);
 
-        let staking_status = match (self.in_staking_validators, self.in_session_validators) {
-            (false, false) => "Staking status: Nothing".to_string(),
-            (true, false)  => "Staking status: Active".to_string(),
-            (false, true)  => "Staking status: Pending".to_string(),
-            (true, true)   => "Staking status: Active".to_string(),
+        let staking_status = if self.is_disabled {
+            "Staking status: Disabled".to_string()
+        } else {
+            match (self.in_staking_validators, self.in_session_validators) {
+                (false, false) => "Staking status: Nothing".to_string(),
+                (true, false)  => "Staking status: Stopping".to_string(),
+                (false, true)  => "Staking status: Pending".to_string(),
+                (true, true)   => "Staking status: Active".to_string(),
+            }
         };
 
         let table = Table::new(

src/components/validator/stash_info.rs

@@ -159,6 +159,8 @@ impl StashInfo {
             let _ = network_tx.send(Action::GetSessionKeys(account_id, true));
             let _ = network_tx.send(Action::GetValidatorAllRewards(account_id, true));
             let _ = network_tx.send(Action::GetSlashingSpans(account_id, true));
+            let _ = network_tx.send(Action::GetValidatorIsDisabled(account_id, true));
+            let _ = network_tx.send(Action::GetValidatorInSession(account_id, true));
         }
     }
 

src/network/mod.rs

@@ -118,6 +118,7 @@ impl Network {
                     predefined_calls::get_is_stash_bonded(&self.action_tx, &self.online_client_api, &stash_to_watch).await?;
                     predefined_calls::get_validators_ledger(&self.action_tx, &self.online_client_api, &stash_to_watch).await?;
                     predefined_calls::get_slashing_spans(&self.action_tx, &self.online_client_api, &stash_to_watch).await?;
+                    predefined_calls::get_validator_in_session(&self.action_tx, &self.online_client_api, &stash_to_watch).await?;
 
                     for era_index in self.eras_to_watch.iter() {
                         predefined_calls::get_validator_staking_result(&self.action_tx, &self.online_client_api, &stash_to_watch, *era_index).await?;
@@ -206,6 +207,10 @@ impl Network {
                 Ok(())
             }
 
+            Action::GetValidatorInSession(account_id, is_stash) => {
+                self.store_stash_or_validator_if_possible(account_id, is_stash);
+                predefined_calls::get_validator_in_session(&self.action_tx, &self.online_client_api, &account_id).await
+            }
             Action::GetValidatorLatestClaim(account_id, is_stash) => {
                 self.store_stash_or_validator_if_possible(account_id, is_stash);
                 predefined_calls::get_validator_latest_claim(&self.action_tx, &self.online_client_api, &account_id).await

src/network/predefined_calls.rs

@@ -574,3 +574,18 @@ pub async fn get_validator_latest_claim(
 
     Ok(())
 }
+
+pub async fn get_validator_in_session(
+    action_tx: &UnboundedSender<Action>,
+    api: &OnlineClient<CasperConfig>,
+    account_id: &[u8; 32],
+) -> Result<()> {
+    let in_list = super::raw_calls::session::validators(api, None)
+        .await?
+        .unwrap_or_default()
+        .iter()
+        .position(|validator| validator.0 == *account_id)
+        .is_some();
+    action_tx.send(Action::SetValidatorInSession(in_list, *account_id))?;
+    Ok(())
+}