From 44aacbddac5e9ec5d2e4f006a5b3918ebb4709c5 Mon Sep 17 00:00:00 2001
From: Vadim Arasev <varasev@gmail.com>
Date: Wed, 11 Jul 2018 11:19:13 +0300
Subject: [PATCH] (Fix) Avoid some exceptions if Metamask is locked

---
 src/components/BallotKeysMetadata.jsx  | 2 +-
 src/components/BallotProxyMetadata.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/BallotKeysMetadata.jsx b/src/components/BallotKeysMetadata.jsx
index 2354d26..e117d5f 100644
--- a/src/components/BallotKeysMetadata.jsx
+++ b/src/components/BallotKeysMetadata.jsx
@@ -15,7 +15,7 @@ export class BallotKeysMetadata extends React.Component {
       }
     }
     let newVotingPayoutKeys = '';
-    if (ballotStore.isNewValidatorPersonalData && contractsStore.votingToChangeKeys.doesMethodExist('createBallotToAddNewValidator')) {
+    if (ballotStore.isNewValidatorPersonalData && contractsStore.votingToChangeKeys && contractsStore.votingToChangeKeys.doesMethodExist('createBallotToAddNewValidator')) {
       newVotingPayoutKeys = <div>
         <div className="left">
           <div className="form-el">
diff --git a/src/components/BallotProxyMetadata.jsx b/src/components/BallotProxyMetadata.jsx
index 8a35cee..ce828dd 100644
--- a/src/components/BallotProxyMetadata.jsx
+++ b/src/components/BallotProxyMetadata.jsx
@@ -18,7 +18,7 @@ export class BallotProxyMetadata extends React.Component {
       /*7*/ { value: '8', label: ballotStore.ProxyBallotType[8] }, // ProxyStorage
     ];
 
-    if (!contractsStore.proxyStorage.doesMethodExist('getValidatorMetadata')) {
+    if (!contractsStore.proxyStorage || !contractsStore.proxyStorage.doesMethodExist('getValidatorMetadata')) {
       options.splice(6); // keep 0-5 and remove 6-... items if ProxyStorage is old
     }