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

18
public/img/icon-new.svg Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="61" height="61" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 3.4.2 (15855) - http://www.bohemiancoding.com/sketch -->
<title>Oval 145 Copy 7 + retweet</title>
<desc>Created with Sketch.</desc>
<defs>
<circle r="26.25" cy="26.25" cx="26.25" id="path-1"/>
</defs>
<g>
<title>Layer 1</title>
<g id="Group">
<g stroke="#DDDDDD" id="Oval-145-Copy-7">
<use id="svg_1" x="4" y="3.75" xlink:href="#path-1" fill-rule="evenodd" fill="#FFFFFF" stroke-width="1.090909"/>
<use id="svg_2" x="4" y="3.75" xlink:href="#path-1" fill="none" stroke-width="4" stroke-opacity="0.15"/>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 739 B

2
public/views/walletHome.html
View file

@ -212,7 +212,7 @@
</h4> </h4>
<div ng-if="index.txHistory[0] && index.updatingTxHistory[index.walletId]" class="row collapse last-transactions-content animated fadeInDown"> <div ng-if="index.txHistory[0] && index.updatingTxHistory[index.walletId] && index.newTx" class="row collapse last-transactions-content animated fadeInDown">
<div class="large-6 medium-6 small-6 columns size-14"> <div class="large-6 medium-6 small-6 columns size-14">
<div class="m10r left"> <div class="m10r left">
<img src="img/icon-new.svg" width="40"> <img src="img/icon-new.svg" width="40">

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

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