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

.

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-17 15:36:19 -03:00
commit 985c0af780
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
3 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/confirm.html
View file

@ -28,12 +28,12 @@
<div class="item item-text-wrap"> <div class="item item-text-wrap">
<i class="icon ion-arrow-up-c"></i> <span class="text-bold size-16">Sending</span> <i class="icon ion-arrow-up-c"></i> <span class="text-bold size-16">Sending</span>
<div class="text-bold size-28 m15t">{{amount}} {{unitName}}</div> <div class="text-bold size-28 m15t">{{amount}} {{unitName}}</div>
<div class="text-light size-20 m5t">{{alternativeAmount}} {{alternativeIsoCode}}</div> <div class="text-light size-20 m5t">{{alternativeAmount || '...'}} {{alternativeIsoCode}}</div>
</div> </div>
</div> </div>
<div class="list card"> <div class="list card">
<div class="item">Fee: Economy (97 bits)</div> <div class="item">Fee: {{feeLevel}} ({{fee || '...'}} {{unitName}})</div>
<div class="item item-icon-left"> <div class="item item-icon-left">
<i class="icon ion-ios-person-outline"></i> <i class="icon ion-ios-person-outline"></i>
@ -76,7 +76,7 @@
</div> </div>
<div class="card"> <div class="card">
<button class="item button button-full button-positive" ng-click="approve()"> <button class="item button button-full button-positive" ng-click="approve()" ng-disabled="!txp">
Approve Approve
</button> </button>
</div> </div>

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

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, walletService, platformInfo, lodash, configService, go, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup) { angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, walletService, platformInfo, lodash, configService, go, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus) {
// An alert dialog // An alert dialog
var showAlert = function(title, msg, cb) { var showAlert = function(title, msg, cb) {
@ -37,6 +37,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.isCordova = platformInfo.isCordova; $scope.isCordova = platformInfo.isCordova;
config = configService.getSync().wallet; config = configService.getSync().wallet;
$scope.feeLevel = config.feeLevel;
$scope.unitName = config.settings.unitName; $scope.unitName = config.settings.unitName;
$scope.alternativeIsoCode = config.settings.alternativeIsoCode; $scope.alternativeIsoCode = config.settings.alternativeIsoCode;
@ -45,7 +46,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
satToUnit = 1 / unitToSatoshi; satToUnit = 1 / unitToSatoshi;
satToBtc = 1 / 100000000; satToBtc = 1 / 100000000;
$scope.toAmount = $stateParams.toAmount; $scope.toAmount = parseInt($stateParams.toAmount);
$scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals) ; $scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals) ;
$scope.toAddress = $stateParams.toAddress; $scope.toAddress = $stateParams.toAddress;
$scope.toName = $stateParams.toName; $scope.toName = $stateParams.toName;
@ -53,7 +54,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var network = (new bitcore.Address($scope.toAddress)).network.name; var network = (new bitcore.Address($scope.toAddress)).network.name;
$scope.setWallets(network); $scope.setWallets(network);
$scope.alternativeAmount = toFiat($scope.toAmount); toFiat($scope.amount, function(v) {
$scope.alternativeAmount = v;
});
unitDecimals = config.settings.unitDecimals; unitDecimals = config.settings.unitDecimals;
$scope.$on("$ionicSlides.slideChangeEnd", function(event, data) { $scope.$on("$ionicSlides.slideChangeEnd", function(event, data) {
@ -67,8 +71,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
}, 100); }, 100);
}; };
var setSendError = function(msg) { var setSendError = function(msg) {
showAlert('Error creating transaction', msg); showAlert(gettext('Error creating transaction'), msg);
}; };
var createTx = function(toAddress, toAmount, comment) { var createTx = function(toAddress, toAmount, comment) {
@ -114,11 +118,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
txp.sendMax = true; txp.sendMax = true;
txp.inputs = $scope.sendMaxInfo.inputs; txp.inputs = $scope.sendMaxInfo.inputs;
txp.fee = $scope.sendMaxInfo.fee; txp.fee = $scope.sendMaxInfo.fee;
} else {
txp.amount = toAmount;
} }
txp.toAddress = toAddress;
txp.outputs = outputs; txp.outputs = outputs;
txp.message = comment; txp.message = comment;
txp.payProUrl = paypro ? paypro.url : null; txp.payProUrl = paypro ? paypro.url : null;
@ -133,7 +134,7 @@ console.log('[confirm.js.102:createdTxp:]',err, createdTxp); //TODO
return setSendError(err); return setSendError(err);
} }
$scope.fee = createdTxp.fee; $scope.fee = ((createdTxp.fee) * satToUnit).toFixed(unitDecimals) ;
$scope.txp = createdTxp; $scope.txp = createdTxp;
}); });
}); });
@ -144,33 +145,30 @@ console.log('[confirm.js.102:createdTxp:]',err, createdTxp); //TODO
var wallet = $scope.wallet; var wallet = $scope.wallet;
var txp =$scope.txp; var txp =$scope.txp;
if (!wallet) { if (!wallet) {
$log.error('No wallet selected') return setSendError(gettext('No wallet selected'));
return; return;
}; };
if (!txp) { if (!txp) {
$log.error('No txp') return setSendError(gettext('No transaction'));
return; return;
}; };
if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
$log.info('No signing proposal: No private key'); $log.info('No signing proposal: No private key');
// ongoingProcess.set('sendingTx', true); // ongoingProcess.set('sendingTx', true);
walletService.publishTx(walelt, txp, function(err, publishedTxp) { walletService.publishTx(wallet, txp, function(err, publishedTxp) {
// ongoingProcess.set('sendingTx', false); // ongoingProcess.set('sendingTx', false);
if (err) { if (err) {
return setSendError(err); return setSendError(err);
} }
// TODO
$state.transitionTo('tab.home'); $state.transitionTo('tab.home');
// TODO
// var type = txStatus.notify(createdTxp); var type = txStatus.notify(createdTxp);
// $scope.openStatusModal(type, createdTxp, function() { $scope.openStatusModal(type, createdTxp, function() {
// return $scope.$emit('Local/TxProposalAction'); return $scope.$emit('Local/TxProposalAction');
// }); });
}); });
} else { } else {
@ -190,10 +188,12 @@ console.log('[confirm.js.102:createdTxp:]',err, createdTxp); //TODO
return parseFloat((rateService.fromFiat(val, $scope.alternativeIsoCode) * satToUnit).toFixed(unitDecimals), 10); return parseFloat((rateService.fromFiat(val, $scope.alternativeIsoCode) * satToUnit).toFixed(unitDecimals), 10);
}; };
function toFiat(val) { function toFiat(val, cb) {
if (!rateService.isAvailable()) return; rateService.whenAvailable(function() {
return parseFloat((rateService.toFiat(val * unitToSatoshi, $scope.alternativeIsoCode)).toFixed(2), 10); console.log('[confirm.js.194] WWW'); //TODO
return cb(parseFloat((rateService.toFiat(val * unitToSatoshi, $scope.alternativeIsoCode)).toFixed(2), 10));
});
}; };
$scope.finish = function() { $scope.finish = function() {

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

@ -36,5 +36,5 @@ angular.module('copayApp.controllers').controller('tabHomeController',
$scope.bitpayCardEnabled = true; // TODO $scope.bitpayCardEnabled = true; // TODO
// $state.transitionTo('confirm', {toAmount:555500, toAddress: 'mvfAwUJohJWibGzBZgAUGsDarsr4Z4NovU', toName: 'bla bla'}); $state.transitionTo('confirm', {toAmount:555500, toAddress: 'mvfAwUJohJWibGzBZgAUGsDarsr4Z4NovU', toName: 'bla bla'});
}); });