diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index e04ec2114..2e0692b17 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -30,7 +30,6 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'sendingTx': gettext('Sending transaction'), 'signingTx': gettext('Signing transaction'), 'sweepingWallet': gettext('Sweeping Wallet...'), - 'validatingWallet': gettext('Validating wallet integrity...'), 'validatingWords': gettext('Validating recovery phrase...'), 'loadingTxInfo': gettext('Loading transaction info...'), 'sendingFeedback': gettext('Sending feedback...'), diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index ae2d970b2..6c0a7d001 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -207,6 +207,9 @@ angular.module('copayApp.services') }, delay); }; + var shouldSkipValidation = function() { + return root.profile.isChecked(platformInfo.ua, credentials.walletId) || isIOS || isWP; + } // Used when reading wallets from the profile root.bindWallet = function(credentials, cb) { if (!credentials.walletId || !credentials.m) @@ -224,7 +227,7 @@ angular.module('copayApp.services') bwsurl: getBWSURL(credentials.walletId), }); - var skipKeyValidation = root.profile.isChecked(platformInfo.ua, credentials.walletId); + var skipKeyValidation = shouldSkipValidation(); if (!skipKeyValidation) root.runValidation(client, 500); @@ -494,7 +497,7 @@ angular.module('copayApp.services') return cb(gettextCatalog.getString('Wallet already in Copay')); - var skipKeyValidation = root.profile.isChecked(platformInfo.ua, walletId); + var skipKeyValidation = shouldSkipValidation(); if (!skipKeyValidation) root.runValidation(client);