diff --git a/js/src/modals/DeployContract/DetailsStep/detailsStep.js b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
index 9db223793..3de7a8a44 100644
--- a/js/src/modals/DeployContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
@@ -28,27 +28,25 @@ export default class DetailsStep extends Component {
 
   static propTypes = {
     accounts: PropTypes.object.isRequired,
-
-    onFromAddressChange: PropTypes.func.isRequired,
-    onNameChange: PropTypes.func.isRequired,
-    onDescriptionChange: PropTypes.func.isRequired,
     onAbiChange: PropTypes.func.isRequired,
     onCodeChange: PropTypes.func.isRequired,
-    onParamsChange: PropTypes.func.isRequired,
+    onDescriptionChange: PropTypes.func.isRequired,
+    onFromAddressChange: PropTypes.func.isRequired,
     onInputsChange: PropTypes.func.isRequired,
+    onNameChange: PropTypes.func.isRequired,
+    onParamsChange: PropTypes.func.isRequired,
 
+    abi: PropTypes.string,
+    abiError: PropTypes.string,
     balances: PropTypes.object,
+    code: PropTypes.string,
+    codeError: PropTypes.string,
+    description: PropTypes.string,
+    descriptionError: PropTypes.string,
     fromAddress: PropTypes.string,
     fromAddressError: PropTypes.string,
     name: PropTypes.string,
     nameError: PropTypes.string,
-    description: PropTypes.string,
-    descriptionError: PropTypes.string,
-    abi: PropTypes.string,
-    abiError: PropTypes.string,
-    code: PropTypes.string,
-    codeError: PropTypes.string,
-
     readOnly: PropTypes.bool
   };
 
diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
index 7bbe7be84..fde7fa1b2 100644
--- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
@@ -32,20 +32,20 @@ export default class DetailsStep extends Component {
   static propTypes = {
     accounts: PropTypes.object.isRequired,
     contract: PropTypes.object.isRequired,
-    amount: PropTypes.string,
-    amountError: PropTypes.string,
     onAmountChange: PropTypes.func.isRequired,
     onFromAddressChange: PropTypes.func.isRequired,
     onValueChange: PropTypes.func.isRequired,
     values: PropTypes.array.isRequired,
     valuesError: PropTypes.array.isRequired,
 
+    amount: PropTypes.string,
+    amountError: PropTypes.string,
     balances: PropTypes.object,
     fromAddress: PropTypes.string,
     fromAddressError: PropTypes.string,
-    gasEdit: PropTypes.bool,
     func: PropTypes.object,
     funcError: PropTypes.string,
+    gasEdit: PropTypes.bool,
     onFuncChange: PropTypes.func,
     onGasEditClick: PropTypes.func,
     warning: PropTypes.string
diff --git a/js/src/ui/Form/AddressSelect/addressSelect.js b/js/src/ui/Form/AddressSelect/addressSelect.js
index 4bd93caa9..0cd92c5c8 100644
--- a/js/src/ui/Form/AddressSelect/addressSelect.js
+++ b/js/src/ui/Form/AddressSelect/addressSelect.js
@@ -158,7 +158,7 @@ export default class AddressSelect extends Component {
       return null;
     }
 
-    const ethToken = balance.tokens.find((t) => t.token.tag.toLowerCase() === 'eth');
+    const ethToken = balance.tokens.find((tok) => tok.token && tok.token.tag && tok.token.tag.toLowerCase() === 'eth');
 
     if (!ethToken) {
       return null;
@@ -187,7 +187,6 @@ export default class AddressSelect extends Component {
         <IdentityName
           className={ styles.name }
           address={ address } />
-
         { balance }
       </div>
     );
diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js
index fd26d94e5..609f029c7 100644
--- a/js/src/views/Addresses/addresses.js
+++ b/js/src/views/Addresses/addresses.js
@@ -89,7 +89,7 @@ class Addresses extends Component {
 
     if (hasContacts && Object.keys(balances).length === 0) {
       return (
-        <Loading size={ 3 } />
+        <Loading />
       );
     }