Fix bugs found during patch release testing (#457)

decred · Jun 21, 2017 · e8788e3 · e8788e3
1 parent 5bae48d
commit e8788e3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/app/actions/ClientActions.js b/app/actions/ClientActions.js
@@ -136,7 +136,7 @@ function getBalanceSuccess(account, getBalanceResponse) {
     var updatedBalances = balances;
     var found = false;
     for (var i = 0; i < balances.length; i++) {
-      if (balances[i].accountNumber == accountNumber) {
+      if (balances[i].accountNumber == account.getAccountNumber()) {
         updatedBalances[i] = updatedBalance;
         found = true;
       }

diff --git a/app/actions/NotificationActions.js b/app/actions/NotificationActions.js
@@ -113,6 +113,7 @@ function transactionNtfnsData(response) {
         dispatch({currentHeight: currentHeight, timeBackString: timeBackString(daysBack), type: TRANSACTIONNTFNS_SYNCING });
       }
     } else if (response.getUnminedTransactionsList().length > 0) {
+      setTimeout( () => {dispatch(getAccountsAttempt());}, 1000);
       for (var z = 0; z < response.getUnminedTransactionsList().length; z++) {
         var found = false;
         for (var y = 0; y < unmined.length; y++) {

diff --git a/app/components/AccountRow.js b/app/components/AccountRow.js
@@ -241,7 +241,7 @@ class AccountRow extends Component {
     const { account } = this.props;
     return (
         <div style={this.state.showAccountDetails ? this.state.showRenameAccount ? styles.accountRowRename : styles.accountRowLong : styles.accountRowShort}>
-          <div style={this.state.showAccountDetails ? styles.accountRowDetailsTop : styles.accountRow} key={account.accountNumber} onClick={this.state.showAccountDetails ? () => this.setState({showAccountDetails: false}) : () => this.setState({showAccountDetails: true})}>
+          <div style={this.state.showAccountDetails ? styles.accountRowDetailsTop : styles.accountRow} key={'top'+account.accountNumber} onClick={this.state.showAccountDetails ? () => this.setState({showAccountDetails: false}) : () => this.setState({showAccountDetails: true})}>
             <div style={styles.accountRowTopTop}>
               <div style={styles.accountRowWalletIcon}/>
               <div style={styles.accountRowTopAccountName}>{account.accountName}</div>

diff --git a/app/components/views/Accounts.js b/app/components/views/Accounts.js
@@ -104,7 +104,7 @@ class Accounts extends Component{
             balances !== null ?
               <div style={AccountStyles.contentNest}>
               {balances.map((account) => {
-                return (<AccountRow key={account.accountName} account={account} renameAccount={(name, number) => this.props.renameAccountAttempt(name, number)}/>);
+                return (<AccountRow key={'accountRow' + account.accountName} account={account} renameAccount={(name, number) => this.props.renameAccountAttempt(name, number)}/>);
               })}
               </div>:
               <div></div>

diff --git a/app/components/views/Send.js b/app/components/views/Send.js
@@ -160,11 +160,16 @@ class Send extends Component{
       units = 1;
     }
     var updateOutputs = this.state.outputs;
-    if (amount < 0) {
-      updateOutputs[outputKey].amountError = '*Please enter a valid amount (> 0)';
+    if (isNaN(parseInt(amount))) {
+      updateOutputs[outputKey].amountError = '*Please enter a valid amount';
+      updateOutputs[outputKey].amount = 0;
     } else {
-      updateOutputs[outputKey].amount = amount * units;
-      updateOutputs[outputKey].amountError = null;
+      if (parseInt(amount) <= 0) {
+        updateOutputs[outputKey].amountError = '*Please enter a valid amount (> 0)';
+      } else {
+        updateOutputs[outputKey].amount = parseInt(amount) * units;
+        updateOutputs[outputKey].amountError = null;
+      }
     }
     var totalOutputAmount = 0;
     for (var i = 0; i < updateOutputs.length; i++){