Merge pull request stratisproject#22 from stratisproject/submodule-up…

…date

updated StratisBitcoinFullNode submodule

FullNode.UI/src/app/shared/services/api.service.ts

@@ -158,15 +158,41 @@ export class ApiService {
     }
 
     /**
-     * Get unused receive addresses for a certain wallet from the API.
+     * Get an unused receive address for a certain wallet from the API.
      */
     getUnusedReceiveAddress(data: WalletInfo): Observable<any> {
       let params: URLSearchParams = new URLSearchParams();
       params.set('walletName', data.walletName);
       params.set('accountName', "account 0"); //temporary
 
       return this.http
-        .get(this.stratisApiUrl + '/wallet/address', new RequestOptions({headers: this.headers, search: params}))
+        .get(this.stratisApiUrl + '/wallet/unusedaddress', new RequestOptions({headers: this.headers, search: params}))
+        .map((response: Response) => response);
+    }
+
+    /**
+     * Get multiple unused receive addresses for a certain wallet from the API.
+     */
+    getUnusedReceiveAddresses(data: WalletInfo): Observable<any> {
+      let params: URLSearchParams = new URLSearchParams();
+      params.set('walletName', data.walletName);
+      params.set('accountName', "account 0"); //temporary
+
+      return this.http
+        .get(this.stratisApiUrl + '/wallet/unusedaddresses', new RequestOptions({headers: this.headers, search: params}))
+        .map((response: Response) => response);
+    }
+
+    /**
+     * Get get all receive addresses for an account of a wallet from the API.
+     */
+    getAllReceiveAddresses(data: WalletInfo): Observable<any> {
+      let params: URLSearchParams = new URLSearchParams();
+      params.set('walletName', data.walletName);
+      params.set('accountName', "account 0"); //temporary
+
+      return this.http
+        .get(this.stratisApiUrl + '/wallet/addresses', new RequestOptions({headers: this.headers, search: params}))
         .map((response: Response) => response);
     }
 

FullNode.UI/src/app/wallet/dashboard/dashboard.component.ts

@@ -244,8 +244,8 @@ export class DashboardComponent implements OnInit {
             this.stakingEnabled = stakingResponse.enabled;
             this.stakingActive = stakingResponse.staking;
             this.stakingWeight = stakingResponse.weight;
-            this.netStakingWeight = stakingResponse.netstakeweight;
-            this.expectedTime = stakingResponse.expectedtime;
+            this.netStakingWeight = stakingResponse.netStakeWeight;
+            this.expectedTime = stakingResponse.expectedTime;
             this.dateTime = this.secondsToString(this.expectedTime);
             if (this.stakingActive) {
               this.isStarting = false;