Merge pull request #199 from beregovoy68/master

Fixed transaction history table again
wavesplatform · Apr 12, 2017 · 91cb694 · 91cb694
2 parents 3a151ab + a228ed4
commit 91cb694
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/js/history/controller.js b/src/js/history/controller.js
@@ -21,7 +21,7 @@
 
         function refreshTransactions() {
             var txArray;
-            transactionLoadingService.loadTransactions(applicationContext.account.address)
+            transactionLoadingService.loadTransactions(applicationContext.account)
                 .then(function (transactions) {
                     txArray = transactions;
 

diff --git a/src/js/shared/transaction.loading.service.js b/src/js/shared/transaction.loading.service.js
@@ -5,18 +5,18 @@
         var self = this;
 
         // returns promise that loads and merges unconfirmed and confirmed transactions
-        this.loadTransactions = function (address) {
+        this.loadTransactions = function (account) {
             var unconfirmed;
             return apiService.transactions.unconfirmed()
                 .then(function (response) {
                     unconfirmed = response;
 
-                    return apiService.transactions.list(address);
+                    return apiService.transactions.list(account.address);
                 })
                 .then(function (response) {
                     var confirmed = response[0];
 
-                    return self.mergeTransactions(address, unconfirmed, confirmed);
+                    return self.mergeTransactions(account, unconfirmed, confirmed);
                 });
         };
 

diff --git a/src/js/wallet/list.controller.js b/src/js/wallet/list.controller.js
@@ -139,7 +139,7 @@
 
         function refreshTransactions() {
             var txArray;
-            transactionLoadingService.loadTransactions(applicationContext.account.address)
+            transactionLoadingService.loadTransactions(applicationContext.account)
                 .then(function (transactions) {
                     txArray = transactions;