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

Merge pull request #3363 from gabrielbazan7/feat/initialTransactionMessage

Browse source 
initial transaction message in history page
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-30 10:21:49 -03:00
commit 8313fe8f92
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/walletHome.html
View file

@ -465,6 +465,10 @@
<div class="rect5"></div> <div class="rect5"></div>
</div> </div>
</div> </div>
<p ng-show="index.showWaitingSign" translate class="size-12 text-gray">
Initial transaction history synchronization can take some minutes for wallets with many transactions.</br>
Please stand by.
</p>
</div> </div>
<div ng-if="!index.isCordova && index.txHistory[0] && !index.updatingTxHistory" class="m20t text-center"> <div ng-if="!index.isCordova && index.txHistory[0] && !index.updatingTxHistory" class="m20t text-center">
<input id="export_file" type="file" nwsaveas="Copay-{{index.alias || index.walletName}}.csv" accept=".csv" style="display:none"> <input id="export_file" type="file" nwsaveas="Copay-{{index.alias || index.walletName}}.csv" accept=".csv" style="display:none">

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

@ -762,6 +762,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$log.warn(ex); $log.warn(ex);
} }
if (!localTxs) self.showWaitingSign = true;
return cb(null, self.removeSoftConfirmedTx(localTxs)); return cb(null, self.removeSoftConfirmedTx(localTxs));
}); });
} }
@ -831,6 +833,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateLocalTxHistory(function(err) { self.updateLocalTxHistory(function(err) {
if (err) self.txHistoryError = true; if (err) self.txHistoryError = true;
self.updatingTxHistory = false; self.updatingTxHistory = false;
self.showWaitingSign = false;
$rootScope.$apply(); $rootScope.$apply();
}); });
}); });