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

Merge pull request #5777 from gabrielbazan7/fix/removeval

Browse source 
remove validation for ios and wp
This commit is contained in:
Gustavo Maximiliano Cortez 2017-03-15 12:21:49 -03:00 • committed by GitHub
commit 9c4cbdbf6e
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/services/onGoingProcess.js
View file

@ -30,7 +30,6 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
'sendingTx': gettext('Sending transaction'), 'sendingTx': gettext('Sending transaction'),
'signingTx': gettext('Signing transaction'), 'signingTx': gettext('Signing transaction'),
'sweepingWallet': gettext('Sweeping Wallet...'), 'sweepingWallet': gettext('Sweeping Wallet...'),
'validatingWallet': gettext('Validating wallet integrity...'),
'validatingWords': gettext('Validating recovery phrase...'), 'validatingWords': gettext('Validating recovery phrase...'),
'loadingTxInfo': gettext('Loading transaction info...'), 'loadingTxInfo': gettext('Loading transaction info...'),
'sendingFeedback': gettext('Sending feedback...'), 'sendingFeedback': gettext('Sending feedback...'),

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

@ -207,6 +207,9 @@ angular.module('copayApp.services')
}, delay); }, delay);
}; };
var shouldSkipValidation = function() {
return root.profile.isChecked(platformInfo.ua, credentials.walletId) || isIOS || isWP;
}
// Used when reading wallets from the profile // Used when reading wallets from the profile
root.bindWallet = function(credentials, cb) { root.bindWallet = function(credentials, cb) {
if (!credentials.walletId || !credentials.m) if (!credentials.walletId || !credentials.m)
@ -224,7 +227,7 @@ angular.module('copayApp.services')
bwsurl: getBWSURL(credentials.walletId), bwsurl: getBWSURL(credentials.walletId),
}); });
var skipKeyValidation = root.profile.isChecked(platformInfo.ua, credentials.walletId); var skipKeyValidation = shouldSkipValidation();
if (!skipKeyValidation) if (!skipKeyValidation)
root.runValidation(client, 500); root.runValidation(client, 500);
@ -494,7 +497,7 @@ angular.module('copayApp.services')
return cb(gettextCatalog.getString('Wallet already in Copay')); return cb(gettextCatalog.getString('Wallet already in Copay'));
var skipKeyValidation = root.profile.isChecked(platformInfo.ua, walletId); var skipKeyValidation = shouldSkipValidation();
if (!skipKeyValidation) if (!skipKeyValidation)
root.runValidation(client); root.runValidation(client);