From fd7069219362084d17a6ab3ba945735f9fcf95af Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 7 Aug 2020 13:00:20 +0200
Subject: [PATCH] Non-zero lastZeroSlash (#3364)

* Displayed chilled nominators in waiting

* Non-zero-era slashingSpans
---
 packages/page-staking/src/Actions/useInactives.ts    | 12 +++++++++---
 .../src/Overview/Address/NominatedBy.tsx             |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/page-staking/src/Actions/useInactives.ts b/packages/page-staking/src/Actions/useInactives.ts
index 4d2e5de98d..4e2c425217 100644
--- a/packages/page-staking/src/Actions/useInactives.ts
+++ b/packages/page-staking/src/Actions/useInactives.ts
@@ -18,9 +18,15 @@ interface Inactives {
 
 function extractState (stashId: string, slashes: Option<SlashingSpans>[], nominees: string[], activeEra: EraIndex, submittedIn: EraIndex, exposures: Exposure[]): Inactives {
   // chilled
-  const nomsChilled = nominees.filter((_, index) =>
-    slashes[index].isSome && slashes[index].unwrap().lastNonzeroSlash.gte(submittedIn)
-  );
+  const nomsChilled = nominees.filter((_, index): boolean => {
+    if (slashes[index].isNone) {
+      return false;
+    }
+
+    const { lastNonzeroSlash } = slashes[index].unwrap();
+
+    return !lastNonzeroSlash.isZero() && lastNonzeroSlash.gte(submittedIn);
+  });
 
   // first a blanket find of nominations not in the active set
   let nomsInactive = exposures
diff --git a/packages/page-staking/src/Overview/Address/NominatedBy.tsx b/packages/page-staking/src/Overview/Address/NominatedBy.tsx
index 1e7b2de243..0e29b46bdb 100644
--- a/packages/page-staking/src/Overview/Address/NominatedBy.tsx
+++ b/packages/page-staking/src/Overview/Address/NominatedBy.tsx
@@ -28,7 +28,7 @@ function NominatedBy ({ nominators, slashingSpans }: Props): React.ReactElement<
     if (nominators) {
       const chilled = slashingSpans
         ? nominators
-          .filter(([, submittedIn]) => submittedIn.lte(slashingSpans.lastNonzeroSlash))
+          .filter(([, submittedIn]) => !slashingSpans.lastNonzeroSlash.isZero() && slashingSpans.lastNonzeroSlash.gte(submittedIn))
           .map(([who]) => who)
         : [];
       const active = nominators