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

activity

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-25 19:05:50 -03:00
commit de8df20062
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
4 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
public/views/confirm.html
View file

@ -39,10 +39,9 @@
</div>
</div>
<div class="item item-icon-left">
<i class="icon ion-briefcase size-21"></i>
<div class="item">
<label translate>From</label>
<span class="badge badge-assertive" ng-show="notAvailable" translate>Not available</span>
<span class="badge badge-assertive" ng-show="notAvailable" translate>No wallet with enough funds</span>
</div>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
@ -56,8 +55,7 @@
</div>
<button class="item button button-block button-balanced" ng-click="approve()" ng-disabled="!txp">
<span ng-show="wallet.canSign()" translate>Approve</span>
<span ng-show="!wallet.canSign()" translate>Send</span>
<span translate>Send</span>
</button>
</ion-content>
</ion-view>

5
public/views/tab-home.html
View file

@ -5,7 +5,8 @@
</ion-nav-bar>
<ion-content class="padding" ng-controller="tabHomeController">
<h3 class="title" translate>Recent Activity</h3>
<h3 class="title" translate>Recent Activity
</h3>
<div ng-if="fetchingNotifications" class="updatingHistory">
<div class="text-center">
@ -20,7 +21,9 @@
</div>
<a class="item text-center" ui-sref="activity" ng-show="notificationsMore">
<span translate>More</span> ({{notificationsMore}})
(ToDo: 1-1 no here yet)
</a>
<div class="item" ng-show="!notifications[0]">

9
src/js/controllers/confirm.js
View file

@ -33,9 +33,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.description = description;
$scope.txp = null;
ongoingProcess.set('creatingTx', true);
createTx($scope.wallet, function(err, txp) {
ongoingProcess.set('creatingTx', false);
if (err) return;
cachedTxp[$scope.wallet.id] = txp;
apply(txp);
@ -124,8 +122,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var filteredWallets = [];
var index = 0;
ongoingProcess.set('scanning', true);
lodash.each(wallets, function(w) {
walletService.getStatus(w, {}, function(err, status) {
if (err) $log.error(err);
@ -133,7 +129,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (status.availableBalanceSat > amount) filteredWallets.push(w);
if (++index == wallets.length) {
ongoingProcess.set('scanning', false);
if (!lodash.isEmpty(filteredWallets)) {
$scope.wallets = lodash.clone(filteredWallets);
@ -183,10 +178,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (cachedTxp[wallet.id]) {
apply(cachedTxp[wallet.id]);
} else {
ongoingProcess.set('creatingTx', true);
stop = $timeout(function() {
createTx(wallet, function(err, txp) {
ongoingProcess.set('creatingTx', false);
if (err) return;
cachedTxp[wallet.id] = txp;
apply(txp);
@ -205,7 +198,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.$apply();
};
var createTx = function(wallet, cb) {
var createTx = function(wallet, cb) {
var config = configService.getSync().wallet;
var currentSpendUnconfirmed = config.spendUnconfirmed;
var outputs = [];

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

@ -37,6 +37,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
walletService.getNotifications(wallet, {
timeSpan: timeSpan
}, function(err, n) {
console.log('[tab-home.js.39]', wallet.name, n); //TODO
if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
return;