From 69f343fd99498c0bbd7b7b7c820ba79b355a0897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 8 Jul 2016 12:12:26 -0300 Subject: [PATCH 1/2] fix wallet encrypted handler --- src/js/controllers/modals/txpDetails.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 855e69cd9..3a8dc55cc 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -29,14 +29,14 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi fingerprintService.check(fc, function(err) { if (err) { - $scope.error = err; + $scope.error = bwsError.msg(err); $scope.loading = null; return; } handleEncryptedWallet(function(err) { if (err) { - $scope.error = err; + $scope.error = bwsError.msg(err); $scope.loading = null; return; } @@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi walletService.signTx(fc, txp, function(err, signedTxp) { walletService.lock(fc); if (err) { - $scope.error = err; + $scope.error = bwsError.msg(err); $scope.loading = null; return; } @@ -211,7 +211,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi if (!walletService.isEncrypted(fc)) return cb(); $rootScope.$emit('Local/NeedsPassword', false, function(err, password) { if (err) return cb(err); - return cb(null, walletService.unlock(fc, password)); + return cb(walletService.unlock(fc, password)); }); }; From a369934635508b53f319c0f128ab9dc289640054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 11 Jul 2016 11:46:48 -0300 Subject: [PATCH 2/2] rename bwsError service to bwcError --- i18n/po/template.pot | 78 ++++++++++---------- src/js/controllers/backup.js | 2 +- src/js/controllers/buyCoinbase.js | 2 +- src/js/controllers/buyGlidera.js | 4 +- src/js/controllers/index.js | 6 +- src/js/controllers/modals/addressbook.js | 4 +- src/js/controllers/modals/txpDetails.js | 14 ++-- src/js/controllers/modals/wallets.js | 6 +- src/js/controllers/sellCoinbase.js | 2 +- src/js/controllers/sellGlidera.js | 16 ++-- src/js/controllers/walletHome.js | 4 +- src/js/services/addressService.js | 4 +- src/js/services/{bwsError.js => bwcError.js} | 2 +- src/js/services/profileService.js | 16 ++-- 14 files changed, 80 insertions(+), 80 deletions(-) rename src/js/services/{bwsError.js => bwcError.js} (98%) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index bc5a5a812..24310195f 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -163,7 +163,7 @@ msgstr "" msgid "Amount" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Amount below minimum allowed" msgstr "" @@ -373,7 +373,7 @@ msgstr "" msgid "Connecting to Glidera..." msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Connection reset by peer" msgstr "" @@ -381,15 +381,15 @@ msgstr "" msgid "Continue" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Copayer already in this wallet" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Copayer already voted on this spend proposal" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Copayer data mismatch" msgstr "" @@ -427,7 +427,7 @@ msgstr "" msgid "Could not broadcast payment" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Could not build transaction" msgstr "" @@ -639,7 +639,7 @@ msgstr "" msgid "Email Notifications" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Empty addresses limit reached. New addresses cannot be generated." msgstr "" @@ -760,7 +760,7 @@ msgstr "" msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Funds are locked by pending spend proposals" msgstr "" @@ -847,7 +847,7 @@ msgstr "" msgid "In order to verify your wallet backup, please type your password:" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Incorrect address network" msgstr "" @@ -856,11 +856,11 @@ msgstr "" msgid "Incorrect code format" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Insufficient funds" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Insufficient funds for fee" msgstr "" @@ -875,7 +875,7 @@ msgstr "" msgid "Invalid account number" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Invalid address" msgstr "" @@ -918,7 +918,7 @@ msgstr "" msgid "Joining Wallet..." msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Key already associated with an existing wallet" msgstr "" @@ -946,11 +946,11 @@ msgstr "" msgid "locked by pending payments" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Locktime in effect. Please wait to create a new spend proposal" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Locktime in effect. Please wait to remove this spend proposal" msgstr "" @@ -985,11 +985,11 @@ msgstr "" msgid "Message" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Missing parameter" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Missing private keys to sign" msgstr "" @@ -1024,7 +1024,7 @@ msgstr "" msgid "Network" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Network connection error" msgstr "" @@ -1049,7 +1049,7 @@ msgstr "" msgid "Normal" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Not authorized" msgstr "" @@ -1253,7 +1253,7 @@ msgstr "" msgid "Please tap the words in order to confirm your backup phrase is correctly written." msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Please upgrade Copay to perform this action" msgstr "" @@ -1289,7 +1289,7 @@ msgstr "" msgid "Priority" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Private key is encrypted, cannot sign" msgstr "" @@ -1487,7 +1487,7 @@ msgstr "" msgid "Sent" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Server response could not be verified" msgstr "" @@ -1552,7 +1552,7 @@ msgstr "" msgid "Show advanced options" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Signatures rejected by server" msgstr "" @@ -1573,15 +1573,15 @@ msgstr "" msgid "Specify Recovery Phrase..." msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Spend proposal is not accepted" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Spend proposal not found" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Spending Password needed" msgstr "" @@ -1654,7 +1654,7 @@ msgstr "" msgid "The recovery phrase could require a password to be imported" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "The request could not be understood by the server" msgstr "" @@ -1666,7 +1666,7 @@ msgstr "" msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet." msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "The spend proposal is not pending" msgstr "" @@ -1746,7 +1746,7 @@ msgstr "" msgid "Transaction" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Transaction already broadcasted" msgstr "" @@ -1828,7 +1828,7 @@ msgstr "" msgid "Waiting..." msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet already exists" msgstr "" @@ -1865,15 +1865,15 @@ msgstr "" msgid "Wallet Invitation is not valid!" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet is full" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet is locked" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet is not complete" msgstr "" @@ -1885,7 +1885,7 @@ msgstr "" msgid "Wallet Name (at creation)" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet needs backup" msgstr "" @@ -1893,11 +1893,11 @@ msgstr "" msgid "Wallet Network" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet not found" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase" msgstr "" @@ -1911,7 +1911,7 @@ msgstr "" msgid "Wallet Recovery Phrase" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet Recovery Phrase is invalid" msgstr "" @@ -1920,7 +1920,7 @@ msgstr "" msgid "Wallet recovery phrase not available. You can still export it from Advanced > Export." msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wallet service not found" msgstr "" @@ -1978,7 +1978,7 @@ msgstr "" msgid "Wrong number of recovery words:" msgstr "" -#: src/js/services/bwsError.js +#: src/js/services/bwcError.js msgid "Wrong spending password" msgstr "" diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 7cbeaf093..6f54c121e 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('backupController', - function($rootScope, $scope, $timeout, $log, go, lodash, fingerprintService, platformInfo, configService, profileService, gettext, bwcService, bwsError, walletService, ongoingProcess) { + function($rootScope, $scope, $timeout, $log, go, lodash, fingerprintService, platformInfo, configService, profileService, gettext, bwcService, walletService, ongoingProcess) { var fc = profileService.focusedClient; var prevState; diff --git a/src/js/controllers/buyCoinbase.js b/src/js/controllers/buyCoinbase.js index 612d97950..e48dea1c7 100644 --- a/src/js/controllers/buyCoinbase.js +++ b/src/js/controllers/buyCoinbase.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('buyCoinbaseController', - function($scope, $log, $ionicModal, $timeout, lodash, profileService, coinbaseService, bwsError, addressService, ongoingProcess) { + function($scope, $log, $ionicModal, $timeout, lodash, profileService, coinbaseService, addressService, ongoingProcess) { var self = this; this.init = function(testnet) { diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index 5e587d5a0..a0eff911c 100644 --- a/src/js/controllers/buyGlidera.js +++ b/src/js/controllers/buyGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('buyGlideraController', - function($scope, $timeout, $ionicModal, profileService, addressService, glideraService, bwsError, lodash, ongoingProcess) { + function($scope, $timeout, $ionicModal, profileService, addressService, glideraService, bwcError, lodash, ongoingProcess) { var self = this; this.show2faCodeInput = null; @@ -90,7 +90,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', addressService.getAddress(self.selectedWalletId, false, function(err, walletAddr) { if (err) { ongoingProcess.set('Buying Bitcoin...', false); - self.error = bwsError.cb(err, 'Could not create address'); + self.error = bwcError.cb(err, 'Could not create address'); return; } var data = { diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 0fc126499..3b0433303 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, $ionicSideMenuDelegate, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwsError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, openURLService, ongoingProcess) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, $ionicSideMenuDelegate, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwcError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, openURLService, ongoingProcess) { var self = this; var SOFT_CONFIRMATION_LIMIT = 12; var errors = bwcService.getErrors(); @@ -296,7 +296,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r twoStep: true }, function(err, ret) { if (err) { - self.updateError = bwsError.msg(err, gettext('Could not update Wallet')); + self.updateError = bwcError.msg(err, gettext('Could not update Wallet')); } else { self.isSingleAddress = !!ret.wallet.singleAddress; if (!opts.quiet) @@ -429,7 +429,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r } else { var msg = "" $scope.$emit('Local/ClientError', (err.error ? err.error : err)); - var msg = bwsError.msg(err, gettext('Error at Wallet Service')); + var msg = bwcError.msg(err, gettext('Error at Wallet Service')); self.showErrorPopup(msg); } }; diff --git a/src/js/controllers/modals/addressbook.js b/src/js/controllers/modals/addressbook.js index dab2f4e5d..3b6dee56b 100644 --- a/src/js/controllers/modals/addressbook.js +++ b/src/js/controllers/modals/addressbook.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('addressbookController', function($rootScope, $scope, $timeout, lodash, profileService, addressService, addressbookService, bwsError) { +angular.module('copayApp.controllers').controller('addressbookController', function($rootScope, $scope, $timeout, lodash, profileService, addressService, addressbookService, bwcError) { var self = $scope.self; var fc = profileService.focusedClient; @@ -128,7 +128,7 @@ angular.module('copayApp.controllers').controller('addressbookController', funct $scope.errorSelectedWallet = {}; profileService.isReady(client, function(err) { - if (err) $scope.errorSelectedWallet[walletId] = bwsError.msg(err); + if (err) $scope.errorSelectedWallet[walletId] = bwcError.msg(err); else { $scope.gettingAddress = true; $scope.selectedWalletName = walletName; diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 3a8dc55cc..3e34bc67a 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, platformInfo, txStatus, $ionicScrollDelegate, txFormatService, fingerprintService, bwsError, gettextCatalog, lodash, profileService, walletService) { +angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, platformInfo, txStatus, $ionicScrollDelegate, txFormatService, fingerprintService, bwcError, gettextCatalog, lodash, profileService, walletService) { var self = $scope.self; var tx = $scope.tx; var copayers = $scope.copayers; @@ -29,14 +29,14 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi fingerprintService.check(fc, function(err) { if (err) { - $scope.error = bwsError.msg(err); + $scope.error = bwcError.msg(err); $scope.loading = null; return; } handleEncryptedWallet(function(err) { if (err) { - $scope.error = bwsError.msg(err); + $scope.error = bwcError.msg(err); $scope.loading = null; return; } @@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi walletService.signTx(fc, txp, function(err, signedTxp) { walletService.lock(fc); if (err) { - $scope.error = bwsError.msg(err); + $scope.error = bwcError.msg(err); $scope.loading = null; return; } @@ -79,7 +79,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi if (err) { $scope.$emit('UpdateTx'); - $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not reject payment')); + $scope.error = bwcError.msg(err, gettextCatalog.getString('Could not reject payment')); $scope.$digest(); } else { $scope.close(txpr); @@ -99,7 +99,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi // Hacky: request tries to parse an empty response if (err && !(err.message && err.message.match(/Unexpected/))) { $scope.$emit('UpdateTx'); - $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not delete payment proposal')); + $scope.error = bwcError.msg(err, gettextCatalog.getString('Could not delete payment proposal')); $scope.$digest(); return; } @@ -117,7 +117,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.loading = null; if (err) { - $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment')); + $scope.error = bwcError.msg(err, gettextCatalog.getString('Could not broadcast payment')); $scope.$digest(); return; } diff --git a/src/js/controllers/modals/wallets.js b/src/js/controllers/modals/wallets.js index 0a0128f47..d871e9218 100644 --- a/src/js/controllers/modals/wallets.js +++ b/src/js/controllers/modals/wallets.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletsController', function($scope, bwsError, profileService) { +angular.module('copayApp.controllers').controller('walletsController', function($scope, bwcError, profileService) { $scope.selectWallet = function(walletId) { @@ -8,8 +8,8 @@ angular.module('copayApp.controllers').controller('walletsController', function( $scope.errorSelectedWallet = {}; profileService.isReady(client, function(err) { - if (err) { - $scope.errorSelectedWallet[walletId] = bwsError.msg(err); + if (err) { + $scope.errorSelectedWallet[walletId] = bwcError.msg(err); return; } diff --git a/src/js/controllers/sellCoinbase.js b/src/js/controllers/sellCoinbase.js index 455c939ed..9d9f876eb 100644 --- a/src/js/controllers/sellCoinbase.js +++ b/src/js/controllers/sellCoinbase.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('sellCoinbaseController', - function($rootScope, $scope, $log, $timeout, $ionicModal, lodash, profileService, coinbaseService, bwsError, configService, walletService, fingerprintService, ongoingProcess, go) { + function($rootScope, $scope, $log, $timeout, $ionicModal, lodash, profileService, coinbaseService, configService, walletService, fingerprintService, ongoingProcess, go) { var self = this; var client; diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index 59717ad4f..59cad402c 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('sellGlideraController', - function($rootScope, $scope, $timeout, $ionicModal, $log, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, walletService, fingerprintService, ongoingProcess, go) { + function($rootScope, $scope, $timeout, $ionicModal, $log, configService, profileService, addressService, feeService, glideraService, bwcError, lodash, walletService, fingerprintService, ongoingProcess, go) { var self = this; var config = configService.getSync(); @@ -111,7 +111,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', if (!refundAddress) { ongoingProcess.clear(); - self.error = bwsError.msg(err, 'Could not create address'); + self.error = bwcError.msg(err, 'Could not create address'); return; } glideraService.getSellAddress(token, function(error, sellAddress) { @@ -145,20 +145,20 @@ angular.module('copayApp.controllers').controller('sellGlideraController', walletService.createTx(client, txp, function(err, createdTxp) { ongoingProcess.clear(); if (err) { - self.error = err.message ||  bwsError.msg(err); + self.error = err.message ||  bwcError.msg(err); return; } $scope.$emit('Local/NeedsConfirmation', createdTxp, function(accept) { if (accept) { fingerprintService.check(client, function(err) { if (err) { - self.error = err.message ||  bwsError.msg(err); + self.error = err.message ||  bwcError.msg(err); return; } handleEncryptedWallet(client, function(err) { if (err) { - self.error = err.message ||  bwsError.msg(err); + self.error = err.message ||  bwcError.msg(err); return; } @@ -166,7 +166,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', walletService.publishTx(client, createdTxp, function(err, publishedTxp) { if (err) { ongoingProcess.clear(); - self.error = err.message ||  bwsError.msg(err); + self.error = err.message ||  bwcError.msg(err); } walletService.signTx(client, publishedTxp, function(err, signedTxp) { @@ -176,7 +176,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', }); ongoingProcess.clear(); if (err) { - self.error = err.message ||  bwsError.msg(err); + self.error = err.message ||  bwcError.msg(err); return; } var rawTx = signedTxp.raw; @@ -191,7 +191,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', glideraService.sell(token, twoFaCode, data, function(err, data) { ongoingProcess.clear(); if (err) { - self.error = err.message ||  bwsError.msg(err); + self.error = err.message ||  bwcError.msg(err); $timeout(function() { $scope.$emit('Local/GlideraError'); }, 100); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 2c5d7142f..878497619 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, notification, txStatus, profileService, lodash, configService, rateService, storageService, bitcore, gettext, gettextCatalog, platformInfo, addressService, ledger, bwsError, confirmDialog, txFormatService, addressbookService, go, feeService, walletService, fingerprintService, nodeWebkit, ongoingProcess) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, notification, txStatus, profileService, lodash, configService, rateService, storageService, bitcore, gettext, gettextCatalog, platformInfo, addressService, ledger, bwcError, confirmDialog, txFormatService, addressbookService, go, feeService, walletService, fingerprintService, nodeWebkit, ongoingProcess) { var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; @@ -365,7 +365,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var prefix = fc.credentials.m > 1 ? gettextCatalog.getString('Could not create payment proposal') : gettextCatalog.getString('Could not send payment'); - this.error = bwsError.msg(err, prefix); + this.error = bwcError.msg(err, prefix); $timeout(function() { $scope.$digest(); diff --git a/src/js/services/addressService.js b/src/js/services/addressService.js index f81225ccc..2e4f0e79e 100644 --- a/src/js/services/addressService.js +++ b/src/js/services/addressService.js @@ -1,7 +1,7 @@ 'use strict'; 'use strict'; angular.module('copayApp.services') - .factory('addressService', function(storageService, profileService, $log, $timeout, lodash, bwsError, gettextCatalog) { + .factory('addressService', function(storageService, profileService, $log, $timeout, lodash, bwcError, gettextCatalog) { var root = {}; root.expireAddress = function(walletId, cb) { @@ -44,7 +44,7 @@ angular.module('copayApp.services') return cb(null, addr[0].address); }); } - return bwsError.cb(err, prefix, cb); + return bwcError.cb(err, prefix, cb); } return cb(null, addr.address); }); diff --git a/src/js/services/bwsError.js b/src/js/services/bwcError.js similarity index 98% rename from src/js/services/bwsError.js rename to src/js/services/bwcError.js index 10060e295..436dde91c 100644 --- a/src/js/services/bwsError.js +++ b/src/js/services/bwcError.js @@ -1,6 +1,6 @@ 'use strict'; angular.module('copayApp.services') - .factory('bwsError', function bwcErrorService($log, gettextCatalog) { + .factory('bwcError', function bwcErrorService($log, gettextCatalog) { var root = {}; root.msg = function(err, prefix) { diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 2e4a8dc7d..ab2170509 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -1,6 +1,6 @@ 'use strict'; angular.module('copayApp.services') - .factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, notificationService, pushNotificationsService, gettext, gettextCatalog, bwsError, uxLanguage, bitcore, platformInfo, walletService) { + .factory('profileService', function profileServiceFactory($rootScope, $timeout, $filter, $log, sjcl, lodash, storageService, bwcService, configService, notificationService, pushNotificationsService, gettext, gettextCatalog, bwcError, uxLanguage, bitcore, platformInfo, walletService) { var isChromeApp = platformInfo.isChromeApp; @@ -357,7 +357,7 @@ angular.module('copayApp.services') singleAddress: opts.singleAddress, walletPrivKey: opts.walletPrivKey, }, function(err, secret) { - if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb); + if (err) return bwcError.cb(err, gettext('Error creating wallet'), cb); return cb(null, walletClient, secret); }); }); @@ -405,8 +405,8 @@ angular.module('copayApp.services') // check if exist if (lodash.find(root.profile.credentials, { - 'walletId': walletData.walletId - })) { + 'walletId': walletData.walletId + })) { return cb(gettext('Cannot join the same wallet more that once')); } } catch (ex) { @@ -420,7 +420,7 @@ angular.module('copayApp.services') if (err) return cb(err); walletClient.joinWallet(opts.secret, opts.myName || 'me', {}, function(err) { - if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb); + if (err) return bwcError.cb(err, gettext('Could not join wallet'), cb); root.addAndBindWalletClient(walletClient, { bwsurl: opts.bwsurl }, cb); @@ -583,7 +583,7 @@ angular.module('copayApp.services') if (err instanceof errors.NOT_AUTHORIZED) return cb(err); - return bwsError.cb(err, gettext('Could not import'), cb); + return bwcError.cb(err, gettext('Could not import'), cb); } root.addAndBindWalletClient(walletClient, { @@ -614,7 +614,7 @@ angular.module('copayApp.services') if (err instanceof errors.NOT_AUTHORIZED) return cb(err); - return bwsError.cb(err, gettext('Could not import'), cb); + return bwcError.cb(err, gettext('Could not import'), cb); } root.addAndBindWalletClient(walletClient, { @@ -637,7 +637,7 @@ angular.module('copayApp.services') if (err instanceof errors.NOT_AUTHORIZED) err.name = 'WALLET_DOES_NOT_EXIST'; - return bwsError.cb(err, gettext('Could not import'), cb); + return bwcError.cb(err, gettext('Could not import'), cb); } root.addAndBindWalletClient(walletClient, {