Merge branch 'bug/transferbalance'

particl · Sep 30, 2017 · e4e97bf · e4e97bf
2 parents e378b2d + d515bf0
commit e4e97bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/app/wallet/send/send.component.ts b/src/app/wallet/send/send.component.ts
@@ -114,7 +114,8 @@ export class SendComponent {
 
   /** checkAddres: returns boolean, so it can be private later. */
   checkAddress(): boolean {
-    return this.send.validAddress;
+    // use default transferBalance address or custom address.
+    return (this.type === 'balanceTransfer' && !this.send.toAddress) || this.send.validAddress;
   }
 
   /** verifyAddress: calls RPC to validate it. */
@@ -137,13 +138,12 @@ export class SendComponent {
       }
     }
 
-    // this._rpc.oldCall(this, 'validateaddress', [this.send.toAddress], validateAddressCB);
     this._rpc.call('validateaddress', [this.send.toAddress])
       .subscribe(response => {
         validateAddressCB(response)
       },
       error => {
-        this.log.er('errr');
+        this.log.er('verifyAddress: validateAddressCB failed');
       });
   }
 

diff --git a/src/app/wallet/send/send.service.ts b/src/app/wallet/send/send.service.ts
@@ -45,7 +45,7 @@ export class SendService {
             this.rpc_setDefaultAddress_success(response)
         },
         error => {
-          this.log.er('errr');
+          this.log.er('rpc_listDefaultAddress_success: liststealthaddresses failed');
         });
     }
   }