From c898427d272e70029d5362cc8b3f4255f4a18923 Mon Sep 17 00:00:00 2001
From: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com>
Date: Fri, 26 Apr 2019 17:49:19 +0200
Subject: [PATCH] add proper check (#1048)

---
 packages/app-staking/src/Account/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/app-staking/src/Account/index.tsx b/packages/app-staking/src/Account/index.tsx
index 824d325a58..bef23c2c2b 100644
--- a/packages/app-staking/src/Account/index.tsx
+++ b/packages/app-staking/src/Account/index.tsx
@@ -171,7 +171,7 @@ class Account extends React.PureComponent<Props, State> {
   private renderNominee () {
     const { recentlyOffline, staking_nominators, t } = this.props;
 
-    if (!staking_nominators || !staking_nominators[0].length) {
+    if (!staking_nominators || !staking_nominators[0] || !staking_nominators[0].length) {
       return null;
     }
 
@@ -314,8 +314,8 @@ class Account extends React.PureComponent<Props, State> {
         );
       }
     } else {
-      const isNominating = staking_nominators && staking_nominators[0].length;
-      const isValidating = staking_validators && !(staking_validators[0].isEmpty);
+      const isNominating = !!staking_nominators && !!staking_nominators[0] && staking_nominators[0].length;
+      const isValidating = !!staking_validators && !!staking_validators[0] && !(staking_validators[0].isEmpty);
 
       if (isValidating || isNominating) {
         buttons.push(