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

fix apply

Browse source
This commit is contained in:
Javier 2016-11-24 16:26:15 -03:00
commit a25292fb55
2 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -275,11 +275,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.wallet = wallet;
$scope.fee = $scope.txp = null;
$timeout(function() {
$ionicScrollDelegate.resize();
$scope.$apply();
});
if (stop) {
$timeout.cancel(stop);
stop = null;
@ -296,6 +291,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
});
}, delayed ? 2000 : 1);
}
$timeout(function() {
$ionicScrollDelegate.resize();
$scope.$apply();
});
};
var setSendError = function(msg) {
@ -309,7 +309,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
function apply(txp) {
$scope.fee = txFormatService.formatAmountStr(txp.fee);
$scope.txp = txp;
$scope.$apply();
$timeout(function() {
$scope.$apply();
});
};
var createTx = function(wallet, dryRun, cb) {

11
www/views/tab-send.html
View file

@ -20,17 +20,6 @@
</div>
<div ng-if="hasFunds">
<div class="item item-heading send-heading" translate>Recipient</div>
<!-- <div>
<label class="item item-input bitcoin-address">
<i class="icon icon-svg placeholder-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
<input type="text" placeholder="{{'Search or enter bitcoin address' | translate}}" ng-model="formData.search" ng-change="findContact(formData.search)" ng-model-onblur>
</label>
<div class="qr-scan-icon">
<a on-tap="openScanner()" ng-style="{'top': '55px'}">
<img src="img/tab-icons/ico-scan.svg"/>
</a>
</div>
</div> -->
<div class="item item-icon-left item-icon-right input">
<i class="icon icon-svg left"><img src="img/icon-bitcoin-symbol.svg"></i>