anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

use new txp-detail view from activity

Browse source
This commit is contained in:
Marty Alcala 2016-10-21 19:04:18 -04:00
commit 83cdc77e35
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/js/controllers/activity.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('activityController', angular.module('copayApp.controllers').controller('activityController',
function($timeout, $scope, $log, $ionicModal, lodash, txpModalService, profileService, walletService, ongoingProcess, popupService, gettextCatalog) { function($timeout, $scope, $log, $ionicModal, lodash, txpModalService, profileService, walletService, ongoingProcess, popupService, gettextCatalog, $state) {
$scope.openTxpModal = txpModalService.open; $scope.openTxpModal = txpModalService.open;
$scope.fetchingNotifications = true; $scope.fetchingNotifications = true;
@ -66,12 +66,13 @@ angular.module('copayApp.controllers').controller('activityController',
$scope.wallet = wallet; $scope.wallet = wallet;
$scope.btx = lodash.cloneDeep(tx); $scope.btx = lodash.cloneDeep(tx);
$ionicModal.fromTemplateUrl('views/modals/tx-details.html', { $state.go('tabs.wallet.tx-details', {tx: $scope.btx, wallet: $scope.wallet});
scope: $scope // $ionicModal.fromTemplateUrl('views/modals/tx-details.html', {
}).then(function(modal) { // scope: $scope
$scope.txDetailsModal = modal; // }).then(function(modal) {
$scope.txDetailsModal.show(); // $scope.txDetailsModal = modal;
}); // $scope.txDetailsModal.show();
// });
walletService.getTxNote(wallet, n.txid, function(err, note) { walletService.getTxNote(wallet, n.txid, function(err, note) {
if (err) $log.warn('Could not fetch transaction note: ' + err); if (err) $log.warn('Could not fetch transaction note: ' + err);