diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 47a043629..5ada33cbf 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -30,6 +30,11 @@
Wallet Service URL
+
  • + +
    Transaction History
    +
  • +
  • Delete Wallet
    diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html new file mode 100644 index 000000000..6df8ac0ec --- /dev/null +++ b/public/views/preferencesHistory.html @@ -0,0 +1,21 @@ +
    +
    +
    +

    + +
    diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index 1ca38d889..3e0ea6d54 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -146,14 +146,6 @@ -

    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 44650e9f5..d4eccff5a 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -496,19 +496,11 @@
    -
    -
    - -
    diff --git a/src/js/controllers/preferencesHistory.js b/src/js/controllers/preferencesHistory.js new file mode 100644 index 000000000..2a71425bb --- /dev/null +++ b/src/js/controllers/preferencesHistory.js @@ -0,0 +1,21 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesHistory', + function($scope, $log, $timeout, storageService, go, profileService) { + var fc = profileService.focusedClient; + var c = fc.credentials; + + this.clearTransactionHistory = function() { + storageService.removeTxHistory(c.walletId, function(err) { + if (err) { + $log.error(err); + return; + } + $scope.$emit('Local/ClearHistory'); + + $timeout(function() { + go.walletHome(); + }, 100); + }); + } + }); diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index b0ea5a395..081a24908 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', var c = fc.credentials; this.init = function() { - var basePath = c.getBaseAddressDerivationPath(); + var basePath = c.getBaseAddressDerivationPath(); $scope.walletName = c.walletName; $scope.walletId = c.walletId; @@ -94,17 +94,4 @@ angular.module('copayApp.controllers').controller('preferencesInformation', }, 100); }; - this.clearTransactionHistory = function() { - storageService.removeTxHistory(c.walletId, function(err) { - if (err) { - $log.error(err); - return; - } - $scope.$emit('Local/ClearHistory'); - - $timeout(function() { - go.walletHome(); - }, 100); - }); - } }); diff --git a/src/js/routes.js b/src/js/routes.js index 60db0e35d..2e24d4bc9 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -342,6 +342,18 @@ angular } }) + .state('preferencesHistory', { + url: '/preferencesHistory', + templateUrl: 'views/preferencesHistory.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesHistory.html' + }, + + } + }) .state('deleteWords', { url: '/deleteWords', templateUrl: 'views/preferencesDeleteWords.html',