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

send

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-17 17:31:45 -03:00
commit 7d0870aea0
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
6 changed files with 152 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/services/txFormatService.js
View file

@ -6,7 +6,7 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS
var formatAmountStr = function(amount) {
if (!amount) return;
var config = configService.getSync().wallet.settings;
return profileService.formatAmount(amount) + ' ' + config.unitName;
return walletService.formatAmount(amount) + ' ' + config.unitName;
};
var formatAlternativeStr = function(amount) {
@ -18,7 +18,7 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS
var formatFeeStr = function(fee) {
if (!fee) return;
var config = configService.getSync().wallet.settings;
return profileService.formatAmount(fee) + ' ' + config.unitName;
return walletService.formatAmount(fee) + ' ' + config.unitName;
};
root.processTx = function(tx) {

9
src/js/services/walletService.js
View file

@ -843,5 +843,14 @@ console.log('[walletService.js.786:wallet:]',wallet, forceNew); //TODO
root.handleEncryptedWallet = function(client, cb) {
if (!root.isEncrypted(client)) return cb();
$rootScope.$emit('Local/NeedsPassword', false, function(err, password) {
if (err) return cb(err);
return cb(walletService.unlock(client, password));
});
};
return root;
});