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

Merge branch 'master' of https://github.com/bitpay/copay into v3.5.0

Browse source
This commit is contained in:
magmahindenburg 2017-06-16 11:20:33 +09:00
commit 19824e8fde
73 changed files with 200 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/services/applicationService.js
View file

@ -50,19 +50,15 @@ angular.module('copayApp.services')
});
scope.openModal = function() {
scope.fingerprintCheckModal.show();
checkFingerprint();
scope.checkFingerprint();
};
scope.hideModal = function() {
root.isModalOpen = false;
scope.fingerprintCheckModal.hide();
};
function checkFingerprint() {
scope.checkFingerprint = function() {
fingerprintService.check('unlockingApp', function(err) {
if (err) {
checkFingerprint();
return;
}
if (err) return;
scope.hideModal();
});
}

8
src/js/services/profileService.js
View file

@ -208,9 +208,9 @@ angular.module('copayApp.services')
};
var shouldSkipValidation = function(walletId) {
return root.profile.isChecked(platformInfo.ua, walletId) || isIOS || isWP;
}
// Used when reading wallets from the profile
return root.profile.isChecked(platformInfo.ua, walletId) || isIOS || isWP;
}
// Used when reading wallets from the profile
root.bindWallet = function(credentials, cb) {
if (!credentials.walletId || !credentials.m)
return cb('bindWallet should receive credentials JSON');
@ -618,6 +618,8 @@ angular.module('copayApp.services')
walletClient.importFromMnemonic(words, {
network: opts.networkName,
passphrase: opts.passphrase,
entropySourcePath: opts.entropySourcePath,
derivationStrategy: opts.derivationStrategy || 'BIP44',
account: opts.account || 0,
}, function(err) {
if (err) {

10
src/js/services/trezor.js
View file

@ -93,7 +93,6 @@ angular.module('copayApp.services')
outputs = [];
var tmpOutputs = [];
if (txp.type && txp.type != 'simple') {
return callback('Only TXPs type SIMPLE are supported in TREZOR');
} else if (txp.outputs) {
@ -170,7 +169,6 @@ angular.module('copayApp.services')
return '';
});
inputs = lodash.map(txp.inputs, function(i) {
$log.debug("Trezor TX input path:", i.path);
var pathArr = i.path.split('/');
@ -180,12 +178,12 @@ angular.module('copayApp.services')
inAmount += i.satoshis;
var orderedPubKeys = root._orderPubKeys(xPubKeys, np);
var pubkeys = lodash(orderedPubKeys.map(function(v) {
var pubkeys = orderedPubKeys.map(function(v) {
return {
node: v,
address_n: np,
};
}));
});
return {
address_n: n,
@ -208,12 +206,12 @@ angular.module('copayApp.services')
var np = n.slice(3);
var orderedPubKeys = root._orderPubKeys(xPubKeys, np);
var pubkeys = lodash(orderedPubKeys.map(function(v) {
var pubkeys = orderedPubKeys.map(function(v) {
return {
node: v,
address_n: np,
};
}));
});
tmpOutputs.push({
address_n: n,