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

Merge pull request #5226 from JDonadio/fix/proposal-view

Browse source 
Use contact name in proposal card
This commit is contained in:
Gustavo Maximiliano Cortez 2016-12-14 16:28:22 -03:00 • committed by GitHub
commit 80346f20e7
2 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/js/controllers/proposals.js
View file

@ -1,24 +1,34 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('proposalsController', angular.module('copayApp.controllers').controller('proposalsController',
function($timeout, $scope, profileService, $log, txpModalService) { function($timeout, $scope, profileService, $log, txpModalService, addressbookService) {
$scope.fetchingProposals = true; $scope.fetchingProposals = true;
$scope.$on("$ionicView.enter", function(event, data){ $scope.$on("$ionicView.enter", function(event, data) {
profileService.getTxps(50, function(err, txps) { addressbookService.list(function(err, ab) {
$scope.fetchingProposals = false; if (err) $log.error(err);
if (err) { $scope.addressbook = ab || {};
$log.error(err);
return; profileService.getTxps(50, function(err, txps) {
} $scope.fetchingProposals = false;
$scope.txps = txps; if (err) {
$timeout(function() { $log.error(err);
$scope.$apply(); return;
}, 1); }
$scope.txps = txps;
$timeout(function() {
$scope.$apply();
});
});
}); });
}); });
$scope.openTxpModal = txpModalService.open; $scope.openTxpModal = txpModalService.open;
$scope.createdWithinPastDay = function(time) {
var now = new Date();
var date = new Date(time * 1000);
return (now.getTime() - date.getTime()) < (1000 * 60 * 60 * 24);
};
}); });

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

@ -126,6 +126,12 @@ angular.module('copayApp.controllers').controller('tabHomeController',
}); });
}); });
$scope.createdWithinPastDay = function(time) {
var now = new Date();
var date = new Date(time * 1000);
return (now.getTime() - date.getTime()) < (1000 * 60 * 60 * 24);
};
$scope.openExternalLink = function() { $scope.openExternalLink = function() {
var url = 'https://github.com/bitpay/copay/releases/latest'; var url = 'https://github.com/bitpay/copay/releases/latest';
var optIn = true; var optIn = true;