mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #3640 from matiu/feat/animation-when-new-tx3
adds missing icon
This commit is contained in:
commit
edb3764623
|
@ -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>
|
After Width: | Height: | Size: 739 B |
|
@ -212,7 +212,7 @@
|
|||
</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="m10r left">
|
||||
<img src="img/icon-new.svg" width="40">
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue