From 51b3e831f48169d8c559d20ec46939adee25deca Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 20 Mar 2017 12:50:11 +0100
Subject: [PATCH 1/3] Update for case where account === undefined

---
 .../transactionPendingFormConfirm.js               | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
index 13bf27876b8..3f452d6f6fa 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -95,7 +95,7 @@ export default class TransactionPendingFormConfirm extends Component {
   render () {
     const { account, address, disabled, isSending } = this.props;
     const { wallet, walletError } = this.state;
-    const isWalletOk = account.hardware || account.uuid || (walletError === null && wallet !== null);
+    const isWalletOk = (account && (account.hardware || account.uuid)) || (walletError === null && wallet !== null);
 
     return (
       <div className={ styles.confirmForm }>
@@ -153,10 +153,12 @@ export default class TransactionPendingFormConfirm extends Component {
       return null;
     }
 
+    const isAccount = account && account.uuid;
+
     return (
       <Input
         hint={
-          account.uuid
+          isAccount
             ? (
               <FormattedMessage
                 id='signer.txPendingConfirm.password.unlock.hint'
@@ -171,7 +173,7 @@ export default class TransactionPendingFormConfirm extends Component {
             )
         }
         label={
-          account.uuid
+          isAccount
             ? (
               <FormattedMessage
                 id='signer.txPendingConfirm.password.unlock.label'
@@ -197,7 +199,7 @@ export default class TransactionPendingFormConfirm extends Component {
   renderHint () {
     const { account, disabled, isSending } = this.props;
 
-    if (account.hardware) {
+    if (account && account.hardware) {
       if (isSending) {
         return (
           <div className={ styles.passwordHint }>
@@ -242,7 +244,7 @@ export default class TransactionPendingFormConfirm extends Component {
     const { account } = this.props;
     const { walletError } = this.state;
 
-    if (account.uuid || account.wallet || account.hardware) {
+    if (account && (account.uuid || account.wallet || account.hardware)) {
       return null;
     }
 
@@ -271,7 +273,7 @@ export default class TransactionPendingFormConfirm extends Component {
   renderTooltip () {
     const { account } = this.props;
 
-    if (this.state.password.length || account.hardware) {
+    if (this.state.password.length || (account && account.hardware)) {
       return;
     }
 

From 002791902ccf91d539d58ad8d94125a59c8170a4 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 20 Mar 2017 15:19:34 +0100
Subject: [PATCH 2/3] Update tests to not mask account === undefined

---
 .../transactionPendingFormConfirm.js                        | 2 +-
 .../transactionPendingFormConfirm.spec.js                   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
index 3f452d6f6fa..71da32c61fd 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -27,7 +27,7 @@ import styles from './transactionPendingFormConfirm.css';
 
 export default class TransactionPendingFormConfirm extends Component {
   static propTypes = {
-    account: PropTypes.object.isRequired,
+    account: PropTypes.object,
     address: PropTypes.string.isRequired,
     disabled: PropTypes.bool,
     isSending: PropTypes.bool.isRequired,
diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js
index 79456c8fd09..1176a01f0be 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.spec.js
@@ -48,7 +48,7 @@ function render (address) {
 
   component = shallow(
     <TransactionPendingFormConfirm
-      account={ ACCOUNTS[address] || {} }
+      account={ ACCOUNTS[address] }
       address={ address }
       onConfirm={ onConfirm }
       isSending={ false }
@@ -130,5 +130,9 @@ describe('views/Signer/TransactionPendingFormConfirm', () => {
     it('renders the password', () => {
       expect(instance.renderPassword()).not.to.be.null;
     });
+
+    it('renders the hint', () => {
+      expect(instance.renderHint()).to.be.null;
+    });
   });
 });

From 0f047420c011292f05a71f94d2a55c67b6f68209 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Mon, 20 Mar 2017 15:39:04 +0100
Subject: [PATCH 3/3] default account = {} where undefined (thanks @tomusdrw)

---
 .../transactionPendingFormConfirm.js              | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
index 71da32c61fd..8a20b33325b 100644
--- a/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
+++ b/js/src/views/Signer/components/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -36,6 +36,7 @@ export default class TransactionPendingFormConfirm extends Component {
   };
 
   static defaultProps = {
+    account: {},
     focus: false
   };
 
@@ -80,7 +81,7 @@ export default class TransactionPendingFormConfirm extends Component {
 
   getPasswordHint () {
     const { account } = this.props;
-    const accountHint = account && account.meta && account.meta.passwordHint;
+    const accountHint = account.meta && account.meta.passwordHint;
 
     if (accountHint) {
       return accountHint;
@@ -95,7 +96,7 @@ export default class TransactionPendingFormConfirm extends Component {
   render () {
     const { account, address, disabled, isSending } = this.props;
     const { wallet, walletError } = this.state;
-    const isWalletOk = (account && (account.hardware || account.uuid)) || (walletError === null && wallet !== null);
+    const isWalletOk = account.hardware || account.uuid || (walletError === null && wallet !== null);
 
     return (
       <div className={ styles.confirmForm }>
@@ -149,11 +150,11 @@ export default class TransactionPendingFormConfirm extends Component {
     const { account } = this.props;
     const { password } = this.state;
 
-    if (account && account.hardware) {
+    if (account.hardware) {
       return null;
     }
 
-    const isAccount = account && account.uuid;
+    const isAccount = account.uuid;
 
     return (
       <Input
@@ -199,7 +200,7 @@ export default class TransactionPendingFormConfirm extends Component {
   renderHint () {
     const { account, disabled, isSending } = this.props;
 
-    if (account && account.hardware) {
+    if (account.hardware) {
       if (isSending) {
         return (
           <div className={ styles.passwordHint }>
@@ -244,7 +245,7 @@ export default class TransactionPendingFormConfirm extends Component {
     const { account } = this.props;
     const { walletError } = this.state;
 
-    if (account && (account.uuid || account.wallet || account.hardware)) {
+    if (account.uuid || account.wallet || account.hardware) {
       return null;
     }
 
@@ -273,7 +274,7 @@ export default class TransactionPendingFormConfirm extends Component {
   renderTooltip () {
     const { account } = this.props;
 
-    if (this.state.password.length || (account && account.hardware)) {
+    if (this.state.password.length || account.hardware) {
       return;
     }