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

txps refresh WIP

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-23 10:18:43 -03:00
commit ac68106cbf
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
6 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
public/index.html
View file

@ -13,6 +13,7 @@
</head> </head>
<body> <body>
<div notifications="right top"></div>
<ion-nav-view></ion-nav-view> <ion-nav-view></ion-nav-view>
<script src="lib/ionic.bundle.min.js"></script> <script src="lib/ionic.bundle.min.js"></script>

2
public/views/tab-home.html
View file

@ -30,7 +30,7 @@
<span> <span>
- {{tx.amountStr}} - {{tx.amountStr}}
</span> </span>
<div class="item item-divider"> <div class="item-note">
{{tx.wallet.name}} &middot; <time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time> {{tx.wallet.name}} &middot; <time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
</div> </div>
</li> </li>

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

@ -101,19 +101,24 @@ angular.module('copayApp.controllers').controller('tabHomeController',
} }
self.updateWallet = function(wallet) { self.updateWallet = function(wallet) {
var txps = lodash.filter($scope.txps, function(x) {
return x.walletId != wallet.id;
});
$log.debug('Updating wallet:'+ wallet.name) $log.debug('Updating wallet:'+ wallet.name)
walletService.getStatus(wallet, {}, function(err, status) { walletService.getStatus(wallet, {}, function(err, status) {
console.log('[tab-home.js.107:status:]',status); //TODO
if (err) { if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
return; return;
} }
if (status.pendingTxps && status.pendingTxps[0]) { if (status.pendingTxps && status.pendingTxps[0]) {
console.log('[tab-home.js.113]', status.pendingTxps); //TODO
var txps = lodash.filter($scope.txps, function(x) {
return x.walletId != wallet.id;
});
txps = txps.concat(status.pendingTxps); txps = txps.concat(status.pendingTxps);
txps = formatPendingTxps(txps); txps = formatPendingTxps(txps);
console.log('[tab-home.js.120:txps:]',txps); //TODO
setPendingTxps(txps); setPendingTxps(txps);
} }
wallet.status = status; wallet.status = status;

12
src/js/services/addressbookService.js
View file

@ -4,11 +4,13 @@ angular.module('copayApp.services').factory('addressbookService', function($stat
var root = {}; var root = {};
root.getLabel = function(addr, cb) { root.getLabel = function(addr, cb) {
var wallet = profileService.getWallet($stateParams.walletId); storageService.getAddressbook('testnet', function(err, ab) {
storageService.getAddressbook(wallet.credentials.network, function(err, ab) { if (ab && ab[addr]) return cb(ab[addr]);
if (!ab) return cb();
if (ab[addr]) return cb(ab[addr]); storageService.getAddressbook('livnet', function(err, ab) {
else return cb(); if (ab && ab[addr]) return cb(ab[addr]);
return cb();
});
}); });
}; };

3
src/js/services/profileService.js
View file

@ -70,13 +70,14 @@ angular.module('copayApp.services')
notificationService.newBWCNotification(n, notificationService.newBWCNotification(n,
walletId, wallet.credentials.walletName); walletId, wallet.credentials.walletName);
$rootScope.$emit('bwsEvent', wallet.id, n.type, n);
if (wallet.cacheStatus) if (wallet.cacheStatus)
wallet.cacheStatus.isValid = false; wallet.cacheStatus.isValid = false;
if (wallet.completeHistory) if (wallet.completeHistory)
wallet.completeHistory.isValid = false; wallet.completeHistory.isValid = false;
$rootScope.$emit('bwsEvent', wallet.id, n.type, n);
}); });
wallet.on('walletCompleted', function() { wallet.on('walletCompleted', function() {

2
src/js/services/txStatus.js
View file

@ -5,7 +5,7 @@ angular.module('copayApp.services').factory('txStatus', function($stateParams, l
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;
root.notify = function(txp) { root.notify = function(txp) {
var wallet = profileService.getWallet($stateParams.walletId); var wallet = profileService.getWallet(txp.walletId);
var status = txp.status; var status = txp.status;
var type; var type;
var INMEDIATE_SECS = 10; var INMEDIATE_SECS = 10;