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

mv txps to walletDetails

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-23 17:31:50 -03:00
commit 55f6d9f3f6
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
5 changed files with 133 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/modals/txpDetails.js
View file

@ -28,6 +28,8 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
$scope.error = msg || gettextCatalog.getString('Could not send payment');
}
$scope.sign = function() {
$scope.error = null;
$scope.loading = true;

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

@ -3,27 +3,14 @@
angular.module('copayApp.controllers').controller('tabHomeController',
function($rootScope, $timeout, $scope, $state, lodash, profileService, walletService, configService, txFormatService, $ionicModal, $log, platformInfo) {
var self = this;
$scope.txps = [];
self.setWallets = function() {
$scope.wallets = profileService.getWallets();
};
var setPendingTxps = function(txps) {
if (!txps) {
$scope.txps = [];
return;
}
$scope.txps = lodash.sortBy(txps, 'createdOn').reverse();
console.log('[tab-home.js.18]', $scope.txps); //TODO
};
self.updateAllWallets = function() {
$scope.wallets = profileService.getWallets();
var txps = [];
var i = $scope.wallets.length;
lodash.each($scope.wallets, function(wallet) {
walletService.getStatus(wallet, {}, function(err, status) {
@ -31,13 +18,6 @@ console.log('[tab-home.js.18]', $scope.txps); //TODO
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
return;
}
if (status.pendingTxps && status.pendingTxps[0]) {
txps = txps.concat(status.pendingTxps);
}
if (--i == 0) {
setPendingTxps(txps);
}
wallet.status = status;
});
});
@ -51,16 +31,6 @@ console.log('[tab-home.js.18]', $scope.txps); //TODO
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
return;
}
var txps = lodash.filter($scope.txps, function(x) {
return x.walletId != wallet.id;
});
var wasAny = txps.length != $scope.txps.length;
if ( (status.pendingTxps && status.pendingTxps[0]) || wasAny ) {
txps = txps.concat(status.pendingTxps);
setPendingTxps(txps);
}
wallet.status = status;
$scope.$apply();
});
@ -88,28 +58,6 @@ console.log('[tab-home.js.18]', $scope.txps); //TODO
});
});
var GLIDERA_LOCK_TIME = 6 * 60 * 60;
var glideraActive = true; // TODO TODO TODO
// isGlidera flag is a security measure so glidera status is not
// only determined by the tx.message
$scope.openTxpModal = function(tx) {
var config = configService.getSync().wallet;
var scope = $rootScope.$new(true);
scope.tx = tx;
scope.wallet = tx.wallet;
scope.copayers = tx.wallet.copayers;
scope.isGlidera = glideraActive;
scope.currentSpendUnconfirmed = config.spendUnconfirmed;
$ionicModal.fromTemplateUrl('views/modals/txp-details.html', {
scope: scope
}).then(function(modal) {
scope.txpDetailsModal = modal;
scope.txpDetailsModal.show();
});
};
configService.whenAvailable(function() {
var config = configService.getSync();
var glideraEnabled = config.glidera.enabled;

91
src/js/controllers/walletDetails.js
View file

@ -10,6 +10,79 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var errorPopup;
var HISTORY_SHOW_LIMIT = 10;
$scope.txps = [];
var setPendingTxps = function(txps) {
if (!txps) {
$scope.txps = [];
return;
}
$scope.txps = lodash.sortBy(txps, 'createdOn').reverse();
};
$scope.updateStatus = function(force) {
$scope.updatingStatus = true;
$scope.updateStatusError = false;
walletService.getStatus(wallet, {
force: !!force,
}, function(err, status) {
$scope.updatingStatus = false;
if (err) {
$scope.status = null;
$scope.updateStatusError = true;
return;
}
setPendingTxps(status.pendingTxps);
$scope.status = status;
$scope.$apply();
});
};
var glideraActive = true; // TODO TODO TODO
// isGlidera flag is a security measure so glidera status is not
// only determined by the tx.message
$scope.openTxpModal = function(tx) {
var config = configService.getSync().wallet;
var scope = $rootScope.$new(true);
scope.tx = tx;
scope.wallet = tx.wallet;
scope.copayers = tx.wallet.copayers;
scope.isGlidera = glideraActive;
scope.currentSpendUnconfirmed = config.spendUnconfirmed;
$ionicModal.fromTemplateUrl('views/modals/txp-details.html', {
scope: scope
}).then(function(modal) {
scope.txpDetailsModal = modal;
scope.txpDetailsModal.show();
});
};
var listeners = [
$rootScope.$on('bwsEvent', function(e, walletId) {
if (walletId == wallet.id)
$scope.updateStatus();
}),
$rootScope.$on('Local/TxAction', function(e, walletId) {
var wallet = profileService.getWallet(walletId);
if (walletId == wallet.id)
$scope.updateStatus();
}),
];
$scope.$on('$destroy', function() {
lodash.each(listeners, function(x){
x();
});
});
$scope.openSearchModal = function() {
$scope.color = wallet.color;
@ -42,24 +115,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
walletService.recreate();
};
$scope.updateStatus = function(force) {
$scope.updatingStatus = true;
$scope.updateStatusError = false;
$timeout(function() {
walletService.getStatus(wallet, {
force: !!force,
}, function(err, status) {
$scope.updatingStatus = false;
if (err) {
$scope.status = null;
$scope.updateStatusError = true;
return;
}
$scope.status = status;
});
})
};
$scope.updateTxHistory = function() {
if ($scope.updatingTxHistory) return;