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

Merge pull request #3640 from matiu/feat/animation-when-new-tx3

Browse source 
adds missing icon
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-10 15:18:15 -03:00
commit edb3764623
3 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/js/controllers/index.js
View file

@ -125,7 +125,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.initGlidera();
self.setCustomBWSFlag();
self.setCustomBWSFlag();
if (fc.isPrivKeyExternal()) {
self.needsBackup = false;
self.openWallet();
@ -153,18 +153,18 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (profile) profile.disclaimerAccepted = true;
self.disclaimerAccepted = true;
profileService.setDisclaimerAccepted(function(err) {
if (err) $log.error(err);
if (err) $log.error(err);
go.walletHome();
});
};
self.isDisclaimerAccepted = function() {
if (self.disclaimerAccepted == true) {
if (self.disclaimerAccepted == true) {
go.walletHome();
return;
}
profileService.isDisclaimerAccepted(function(v) {
if (v) {
if (v) {
self.acceptDisclaimer();
} else go.path('disclaimer');
});
@ -948,6 +948,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (err)
self.txHistoryError = true;
$timeout(function() {
self.newTx = false
}, 1000);
$rootScope.$apply();
});
});
@ -1276,6 +1280,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
$rootScope.$on('NewIncomingTx', function() {
self.newTx = true;
self.updateAll({
walletStatus: null,
untilItChanges: true,
@ -1308,6 +1313,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on('NewOutgoingTx', function() {
self.newTx = true;
self.updateAll({
walletStatus: null,
untilItChanges: true,
@ -1319,6 +1325,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
'Local/NewTxProposal', 'Local/TxProposalAction', 'Local/GlideraTx'
], function(eventName) {
$rootScope.$on(eventName, function(event, untilItChanges) {
self.newTx = eventName == 'Local/TxProposalAction' && untilItChanges;
self.updateAll({
walletStatus: null,
untilItChanges: untilItChanges,