Merge pull request #246 from xenohunter/master

Fixed leasing transactions amount
wavesplatform · May 23, 2017 · de29e3f · de29e3f
2 parents b34686f + 6ceb338
commit de29e3f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/src/js/dex/component.js b/src/js/dex/component.js
@@ -89,6 +89,8 @@
 
         ctrl.cancelOrder = function (order) {
             // TODO : add a queue for the orders which weren't yet canceled.
+
+            // TODO : add different messages for cancel and delete actions.
             dexOrderService
                 .removeOrder(ctrl.pair, order, sender)
                 .then(function () {

diff --git a/src/js/dex/order.service.js b/src/js/dex/order.service.js
@@ -22,7 +22,7 @@
                     var signedRequest = matcherRequestService.buildCreateOrderRequest(order, sender);
                     return matcherApiService.createOrder(signedRequest);
                 }).catch(function (e) {
-                    throw new Error(e); // TODO
+                    throw new Error(e);
                 });
         };
 
@@ -36,7 +36,7 @@
                             throw new Error();
                         }
                     }).catch(function (e) {
-                        throw new Error(); // TODO
+                        throw new Error(e);
                     });
             } else if (order.status === FILLED || order.status === CANCELLED) {
                 return matcherApiService
@@ -46,7 +46,7 @@
                             throw new Error();
                         }
                     }).catch(function (e) {
-                        throw new Error(e); // TODO
+                        throw new Error(e);
                     });
             }
         };
@@ -81,7 +81,7 @@
                     });
                 })
                 .catch(function (e) {
-                    throw new Error(e); // TODO
+                    throw new Error(e);
                 });
         };
     }

diff --git a/src/js/leasing/component.js b/src/js/leasing/component.js
@@ -10,6 +10,7 @@
             intervalPromise;
 
         ctrl.transactions = [];
+        ctrl.limitTo = 1000;
         ctrl.balanceDetails = null;
 
         refreshAll();
@@ -47,7 +48,7 @@
 
         function refreshLeasingTransactions() {
             transactionLoadingService
-                .loadTransactions(applicationContext.account)
+                .loadTransactions(applicationContext.account, ctrl.limitTo)
                 .then(function (transactions) {
                     ctrl.transactions = transactions.filter(function (tx) {
                         var startLeasing = constants.START_LEASING_TRANSACTION_TYPE,

diff --git a/src/js/shared/transaction.loading.service.js b/src/js/shared/transaction.loading.service.js
@@ -5,18 +5,21 @@
         var self = this;
 
         // returns promise that loads and merges unconfirmed and confirmed transactions
-        this.loadTransactions = function (account) {
+        this.loadTransactions = function (account, limit) {
             var unconfirmed;
             return apiService.transactions.unconfirmed()
                 .then(function (response) {
                     unconfirmed = response;
 
-                    return apiService.transactions.list(account.address);
+                    return apiService.transactions.list(account.address, limit);
                 })
                 .then(function (response) {
-                    var confirmed = response;
+                    // FIXME : redo this when the API is fixed.
+                    if (response[0] instanceof Array) {
+                        response = response[0];
+                    }
 
-                    return self.mergeTransactions(account, unconfirmed, confirmed);
+                    return self.mergeTransactions(account, unconfirmed, response);
                 });
         };
 

diff --git a/src/templates/leasing/component.html b/src/templates/leasing/component.html
@@ -17,5 +17,5 @@
 
   <waves-transaction-history heading="LEASING TRANSACTIONS"
                              transactions="$ctrl.transactions"
-                             limit-to="2000"></waves-transaction-history>
+                             limit-to="$ctrl.limitTo"></waves-transaction-history>
 </div>