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

open tx modal from home

Browse source
This commit is contained in:
Javier 2016-09-20 13:56:54 -03:00
commit 64b879fcd3
4 changed files with 52 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/js/controllers/modals/txDetails.js
View file

@ -1,26 +1,37 @@
'use strict';
angular.module('copayApp.controllers').controller('txDetailsController', function($log, $timeout, $scope, $filter, $stateParams, walletService, lodash, gettextCatalog, profileService, configService, txFormatService, externalLinkService, popupService) {
angular.module('copayApp.controllers').controller('txDetailsController', function($log, $timeout, $scope, $filter, $stateParams, ongoingProcess, walletService, lodash, gettextCatalog, profileService, configService, txFormatService, externalLinkService, popupService) {
var self = $scope.self;
var wallet = profileService.getWallet($stateParams.walletId || $scope.walletId);
var config = configService.getSync();
var configWallet = config.wallet;
var walletSettings = configWallet.settings;
$scope.title = gettextCatalog.getString('Transaction');
$scope.loadingTxInfo = false;
$scope.init = function() {
$scope.loadingTxInfo = true;
ongoingProcess.set('loadingTxInfo', true);
findTx($scope.txid, function(err, tx) {
ongoingProcess.set('loadingTxInfo', false);
$scope.loadingTxInfo = false;
if (err) {
$log.error(err);
return;
popupService.showAlert(gettextCatalog.getString('Error'), err);
return $scope.cancel();
}
console.log('TX FOUND', tx);
if (!tx) {
$log.warn('No tx found');
popupService.showAlert(gettextCatalog.getString('Transaction not found'), null);
return $scope.cancel();
}
$scope.btx = lodash.cloneDeep(tx);
$scope.alternativeIsoCode = walletSettings.alternativeIsoCode;
$scope.color = wallet.color;
$scope.copayerId = wallet.credentials.copayerId;
$scope.isShared = wallet.credentials.n > 1;
// $scope.btx.amountStr = txFormatService.formatAmount($scope.btx.amount, true) + ' ' + walletSettings.unitName;
// $scope.btx.feeStr = txFormatService.formatAmount($scope.btx.fees, true) + ' ' + walletSettings.unitName;
$scope.btx.feeLevel = walletSettings.feeLevel;
if ($scope.btx.action != 'invalid') {
@ -46,8 +57,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
txid: txid
});
if (tx) return cb(null, tx);
else return cb();
return cb(null, tx);
});
};
@ -148,5 +158,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
$scope.cancel = function() {
$scope.txDetailsModal.hide();
$timeout(function() {
$scope.txDetailsModal.remove();
}, 10);
};
});

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

@ -17,7 +17,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
});
$scope.openTxModal = function(n) {
console.log(n);
$scope.txid = n.txid;
$scope.walletId = n.walletId;
$ionicModal.fromTemplateUrl('views/modals/tx-details.html', {

1
src/js/services/onGoingProcess.js
View file

@ -32,6 +32,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
'sweepingWallet': gettext('Sweeping Wallet...'),
'validatingWallet': gettext('Validating wallet integrity...'),
'validatingWords': gettext('Validating recovery phrase...'),
'loadingTxInfo': gettext('Loading transaction info...'),
};
root.clear = function() {