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

Merge pull request #148 from JDonadio/bug/open-tx-modal

Browse source 
Fix open sent tx modal
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-21 12:47:01 -03:00 • committed by GitHub
commit 8a0d356956
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ angular.module('copayApp.controllers').controller('activityController',
};
$scope.openNotificationModal = function(n) {
if (!n.txpId && n.txid) {
if (n.txid) {
openTxModal(n);
} else {
var txp = lodash.find($scope.txps, {
@ -34,7 +34,7 @@ angular.module('copayApp.controllers').controller('activityController',
if (txp) txpModalService.open(txp);
else {
$log.warn('No txp found');
return popupService.showAlert(gettextCatalog.getString('Transaction not found'), null);
return popupService.showAlert(null, gettextCatalog.getString('Transaction not found'));
}
}
};
@ -53,7 +53,7 @@ angular.module('copayApp.controllers').controller('activityController',
if (!tx) {
$log.warn('No tx found');
return popupService.showAlert(gettextCatalog.getString('Transaction not found'), null);
return popupService.showAlert(null, gettextCatalog.getString('Transaction not found'));
}
$scope.wallet = wallet;

6
src/js/controllers/tab-home.js
View file

@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
});
$scope.openNotificationModal = function(n) {
if (!n.txpId && n.txid) {
if (n.txid) {
openTxModal(n);
} else {
var txp = lodash.find($scope.txps, {
@ -26,7 +26,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
if (txp) txpModalService.open(txp);
else {
$log.warn('No txp found');
return popupService.showAlert(gettextCatalog.getString('Transaction not found'), null);
return popupService.showAlert(null, gettextCatalog.getString('Transaction not found'));
}
}
};
@ -45,7 +45,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
if (!tx) {
$log.warn('No tx found');
return popupService.showAlert(gettextCatalog.getString('Transaction not found'), null);
return popupService.showAlert(null, gettextCatalog.getString('Transaction not found'));
}
$scope.wallet = wallet;