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

Merge pull request #4558 from gabrielbazan7/fix/EncryptedWalletHandler

Browse source 
fix wallet encrypted handler and rename BwsError service to BwcError
This commit is contained in:
Gustavo Maximiliano Cortez 2016-07-12 10:18:29 -03:00 • committed by GitHub
commit eb014927a4
14 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

78
i18n/po/template.pot
View file

@ -163,7 +163,7 @@ msgstr ""
msgid "Amount" msgid "Amount"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Amount below minimum allowed" msgid "Amount below minimum allowed"
msgstr "" msgstr ""
@ -373,7 +373,7 @@ msgstr ""
msgid "Connecting to Glidera..." msgid "Connecting to Glidera..."
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Connection reset by peer" msgid "Connection reset by peer"
msgstr "" msgstr ""
@ -381,15 +381,15 @@ msgstr ""
msgid "Continue" msgid "Continue"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Copayer already in this wallet" msgid "Copayer already in this wallet"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Copayer already voted on this spend proposal" msgid "Copayer already voted on this spend proposal"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Copayer data mismatch" msgid "Copayer data mismatch"
msgstr "" msgstr ""
@ -427,7 +427,7 @@ msgstr ""
msgid "Could not broadcast payment" msgid "Could not broadcast payment"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Could not build transaction" msgid "Could not build transaction"
msgstr "" msgstr ""
@ -639,7 +639,7 @@ msgstr ""
msgid "Email Notifications" msgid "Email Notifications"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Empty addresses limit reached. New addresses cannot be generated." msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "" msgstr ""
@ -760,7 +760,7 @@ msgstr ""
msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Funds are locked by pending spend proposals" msgid "Funds are locked by pending spend proposals"
msgstr "" msgstr ""
@ -847,7 +847,7 @@ msgstr ""
msgid "In order to verify your wallet backup, please type your password:" msgid "In order to verify your wallet backup, please type your password:"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Incorrect address network" msgid "Incorrect address network"
msgstr "" msgstr ""
@ -856,11 +856,11 @@ msgstr ""
msgid "Incorrect code format" msgid "Incorrect code format"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Insufficient funds" msgid "Insufficient funds"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Insufficient funds for fee" msgid "Insufficient funds for fee"
msgstr "" msgstr ""
@ -875,7 +875,7 @@ msgstr ""
msgid "Invalid account number" msgid "Invalid account number"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Invalid address" msgid "Invalid address"
msgstr "" msgstr ""
@ -918,7 +918,7 @@ msgstr ""
msgid "Joining Wallet..." msgid "Joining Wallet..."
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Key already associated with an existing wallet" msgid "Key already associated with an existing wallet"
msgstr "" msgstr ""
@ -946,11 +946,11 @@ msgstr ""
msgid "locked by pending payments" msgid "locked by pending payments"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Locktime in effect. Please wait to create a new spend proposal" msgid "Locktime in effect. Please wait to create a new spend proposal"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Locktime in effect. Please wait to remove this spend proposal" msgid "Locktime in effect. Please wait to remove this spend proposal"
msgstr "" msgstr ""
@ -985,11 +985,11 @@ msgstr ""
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Missing parameter" msgid "Missing parameter"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Missing private keys to sign" msgid "Missing private keys to sign"
msgstr "" msgstr ""
@ -1024,7 +1024,7 @@ msgstr ""
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Network connection error" msgid "Network connection error"
msgstr "" msgstr ""
@ -1049,7 +1049,7 @@ msgstr ""
msgid "Normal" msgid "Normal"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Not authorized" msgid "Not authorized"
msgstr "" msgstr ""
@ -1253,7 +1253,7 @@ msgstr ""
msgid "Please tap the words in order to confirm your backup phrase is correctly written." msgid "Please tap the words in order to confirm your backup phrase is correctly written."
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Please upgrade Copay to perform this action" msgid "Please upgrade Copay to perform this action"
msgstr "" msgstr ""
@ -1289,7 +1289,7 @@ msgstr ""
msgid "Priority" msgid "Priority"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Private key is encrypted, cannot sign" msgid "Private key is encrypted, cannot sign"
msgstr "" msgstr ""
@ -1487,7 +1487,7 @@ msgstr ""
msgid "Sent" msgid "Sent"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Server response could not be verified" msgid "Server response could not be verified"
msgstr "" msgstr ""
@ -1552,7 +1552,7 @@ msgstr ""
msgid "Show advanced options" msgid "Show advanced options"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Signatures rejected by server" msgid "Signatures rejected by server"
msgstr "" msgstr ""
@ -1573,15 +1573,15 @@ msgstr ""
msgid "Specify Recovery Phrase..." msgid "Specify Recovery Phrase..."
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Spend proposal is not accepted" msgid "Spend proposal is not accepted"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Spend proposal not found" msgid "Spend proposal not found"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Spending Password needed" msgid "Spending Password needed"
msgstr "" msgstr ""
@ -1654,7 +1654,7 @@ msgstr ""
msgid "The recovery phrase could require a password to be imported" msgid "The recovery phrase could require a password to be imported"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "The request could not be understood by the server" msgid "The request could not be understood by the server"
msgstr "" 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." msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet."
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "The spend proposal is not pending" msgid "The spend proposal is not pending"
msgstr "" msgstr ""
@ -1746,7 +1746,7 @@ msgstr ""
msgid "Transaction" msgid "Transaction"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Transaction already broadcasted" msgid "Transaction already broadcasted"
msgstr "" msgstr ""
@ -1828,7 +1828,7 @@ msgstr ""
msgid "Waiting..." msgid "Waiting..."
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wallet already exists" msgid "Wallet already exists"
msgstr "" msgstr ""
@ -1865,15 +1865,15 @@ msgstr ""
msgid "Wallet Invitation is not valid!" msgid "Wallet Invitation is not valid!"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wallet is full" msgid "Wallet is full"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wallet is locked" msgid "Wallet is locked"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wallet is not complete" msgid "Wallet is not complete"
msgstr "" msgstr ""
@ -1885,7 +1885,7 @@ msgstr ""
msgid "Wallet Name (at creation)" msgid "Wallet Name (at creation)"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wallet needs backup" msgid "Wallet needs backup"
msgstr "" msgstr ""
@ -1893,11 +1893,11 @@ msgstr ""
msgid "Wallet Network" msgid "Wallet Network"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wallet not found" msgid "Wallet not found"
msgstr "" 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" msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "" msgstr ""
@ -1911,7 +1911,7 @@ msgstr ""
msgid "Wallet Recovery Phrase" msgid "Wallet Recovery Phrase"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wallet Recovery Phrase is invalid" msgid "Wallet Recovery Phrase is invalid"
msgstr "" msgstr ""
@ -1920,7 +1920,7 @@ msgstr ""
msgid "Wallet recovery phrase not available. You can still export it from Advanced > Export." msgid "Wallet recovery phrase not available. You can still export it from Advanced > Export."
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wallet service not found" msgid "Wallet service not found"
msgstr "" msgstr ""
@ -1978,7 +1978,7 @@ msgstr ""
msgid "Wrong number of recovery words:" msgid "Wrong number of recovery words:"
msgstr "" msgstr ""
#: src/js/services/bwsError.js #: src/js/services/bwcError.js
msgid "Wrong spending password" msgid "Wrong spending password"
msgstr "" msgstr ""

2
src/js/controllers/backup.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('backupController', 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 fc = profileService.focusedClient;
var prevState; var prevState;

2
src/js/controllers/buyCoinbase.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('buyCoinbaseController', 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; var self = this;
this.init = function(testnet) { this.init = function(testnet) {

4
src/js/controllers/buyGlidera.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('buyGlideraController', 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; var self = this;
this.show2faCodeInput = null; this.show2faCodeInput = null;
@ -90,7 +90,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
addressService.getAddress(self.selectedWalletId, false, function(err, walletAddr) { addressService.getAddress(self.selectedWalletId, false, function(err, walletAddr) {
if (err) { if (err) {
ongoingProcess.set('Buying Bitcoin...', false); ongoingProcess.set('Buying Bitcoin...', false);
self.error = bwsError.cb(err, 'Could not create address'); self.error = bwcError.cb(err, 'Could not create address');
return; return;
} }
var data = { var data = {

6
src/js/controllers/index.js
View file

@ -1,6 +1,6 @@
'use strict'; '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 self = this;
var SOFT_CONFIRMATION_LIMIT = 12; var SOFT_CONFIRMATION_LIMIT = 12;
var errors = bwcService.getErrors(); var errors = bwcService.getErrors();
@ -295,7 +295,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
twoStep: true twoStep: true
}, function(err, ret) { }, function(err, ret) {
if (err) { if (err) {
self.updateError = bwsError.msg(err, gettext('Could not update Wallet')); self.updateError = bwcError.msg(err, gettext('Could not update Wallet'));
} else { } else {
self.isSingleAddress = !!ret.wallet.singleAddress; self.isSingleAddress = !!ret.wallet.singleAddress;
if (!opts.quiet) if (!opts.quiet)
@ -428,7 +428,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} else { } else {
var msg = "" var msg = ""
$scope.$emit('Local/ClientError', (err.error ? err.error : err)); $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); self.showErrorPopup(msg);
} }
}; };

4
src/js/controllers/modals/addressbook.js
View file

@ -1,6 +1,6 @@
'use strict'; '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 self = $scope.self;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
@ -128,7 +128,7 @@ angular.module('copayApp.controllers').controller('addressbookController', funct
$scope.errorSelectedWallet = {}; $scope.errorSelectedWallet = {};
profileService.isReady(client, function(err) { profileService.isReady(client, function(err) {
if (err) $scope.errorSelectedWallet[walletId] = bwsError.msg(err); if (err) $scope.errorSelectedWallet[walletId] = bwcError.msg(err);
else { else {
$scope.gettingAddress = true; $scope.gettingAddress = true;
$scope.selectedWalletName = walletName; $scope.selectedWalletName = walletName;

16
src/js/controllers/modals/txpDetails.js
View file

@ -1,6 +1,6 @@
'use strict'; '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 self = $scope.self;
var tx = $scope.tx; var tx = $scope.tx;
var copayers = $scope.copayers; var copayers = $scope.copayers;
@ -29,14 +29,14 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
fingerprintService.check(fc, function(err) { fingerprintService.check(fc, function(err) {
if (err) { if (err) {
$scope.error = err; $scope.error = bwcError.msg(err);
$scope.loading = null; $scope.loading = null;
return; return;
} }
handleEncryptedWallet(function(err) { handleEncryptedWallet(function(err) {
if (err) { if (err) {
$scope.error = err; $scope.error = bwcError.msg(err);
$scope.loading = null; $scope.loading = null;
return; return;
} }
@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
walletService.signTx(fc, txp, function(err, signedTxp) { walletService.signTx(fc, txp, function(err, signedTxp) {
walletService.lock(fc); walletService.lock(fc);
if (err) { if (err) {
$scope.error = err; $scope.error = bwcError.msg(err);
$scope.loading = null; $scope.loading = null;
return; return;
} }
@ -79,7 +79,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
if (err) { if (err) {
$scope.$emit('UpdateTx'); $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(); $scope.$digest();
} else { } else {
$scope.close(txpr); $scope.close(txpr);
@ -99,7 +99,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
// Hacky: request tries to parse an empty response // Hacky: request tries to parse an empty response
if (err && !(err.message && err.message.match(/Unexpected/))) { if (err && !(err.message && err.message.match(/Unexpected/))) {
$scope.$emit('UpdateTx'); $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(); $scope.$digest();
return; return;
} }
@ -117,7 +117,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
$scope.loading = null; $scope.loading = null;
if (err) { 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(); $scope.$digest();
return; return;
} }
@ -211,7 +211,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
if (!walletService.isEncrypted(fc)) return cb(); if (!walletService.isEncrypted(fc)) return cb();
$rootScope.$emit('Local/NeedsPassword', false, function(err, password) { $rootScope.$emit('Local/NeedsPassword', false, function(err, password) {
if (err) return cb(err); if (err) return cb(err);
return cb(null, walletService.unlock(fc, password)); return cb(walletService.unlock(fc, password));
}); });
}; };

6
src/js/controllers/modals/wallets.js
View file

@ -1,6 +1,6 @@
'use strict'; '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) { $scope.selectWallet = function(walletId) {
@ -8,8 +8,8 @@ angular.module('copayApp.controllers').controller('walletsController', function(
$scope.errorSelectedWallet = {}; $scope.errorSelectedWallet = {};
profileService.isReady(client, function(err) { profileService.isReady(client, function(err) {
if (err) { if (err) {
$scope.errorSelectedWallet[walletId] = bwsError.msg(err); $scope.errorSelectedWallet[walletId] = bwcError.msg(err);
return; return;
} }

2
src/js/controllers/sellCoinbase.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('sellCoinbaseController', 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 self = this;
var client; var client;

16
src/js/controllers/sellGlidera.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('sellGlideraController', 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 self = this;
var config = configService.getSync(); var config = configService.getSync();
@ -111,7 +111,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
if (!refundAddress) { if (!refundAddress) {
ongoingProcess.clear(); ongoingProcess.clear();
self.error = bwsError.msg(err, 'Could not create address'); self.error = bwcError.msg(err, 'Could not create address');
return; return;
} }
glideraService.getSellAddress(token, function(error, sellAddress) { glideraService.getSellAddress(token, function(error, sellAddress) {
@ -145,20 +145,20 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
walletService.createTx(client, txp, function(err, createdTxp) { walletService.createTx(client, txp, function(err, createdTxp) {
ongoingProcess.clear(); ongoingProcess.clear();
if (err) { if (err) {
self.error = err.message ||  bwsError.msg(err); self.error = err.message ||  bwcError.msg(err);
return; return;
} }
$scope.$emit('Local/NeedsConfirmation', createdTxp, function(accept) { $scope.$emit('Local/NeedsConfirmation', createdTxp, function(accept) {
if (accept) { if (accept) {
fingerprintService.check(client, function(err) { fingerprintService.check(client, function(err) {
if (err) { if (err) {
self.error = err.message ||  bwsError.msg(err); self.error = err.message ||  bwcError.msg(err);
return; return;
} }
handleEncryptedWallet(client, function(err) { handleEncryptedWallet(client, function(err) {
if (err) { if (err) {
self.error = err.message ||  bwsError.msg(err); self.error = err.message ||  bwcError.msg(err);
return; return;
} }
@ -166,7 +166,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
walletService.publishTx(client, createdTxp, function(err, publishedTxp) { walletService.publishTx(client, createdTxp, function(err, publishedTxp) {
if (err) { if (err) {
ongoingProcess.clear(); ongoingProcess.clear();
self.error = err.message ||  bwsError.msg(err); self.error = err.message ||  bwcError.msg(err);
} }
walletService.signTx(client, publishedTxp, function(err, signedTxp) { walletService.signTx(client, publishedTxp, function(err, signedTxp) {
@ -176,7 +176,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
}); });
ongoingProcess.clear(); ongoingProcess.clear();
if (err) { if (err) {
self.error = err.message ||  bwsError.msg(err); self.error = err.message ||  bwcError.msg(err);
return; return;
} }
var rawTx = signedTxp.raw; var rawTx = signedTxp.raw;
@ -191,7 +191,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
glideraService.sell(token, twoFaCode, data, function(err, data) { glideraService.sell(token, twoFaCode, data, function(err, data) {
ongoingProcess.clear(); ongoingProcess.clear();
if (err) { if (err) {
self.error = err.message ||  bwsError.msg(err); self.error = err.message ||  bwcError.msg(err);
$timeout(function() { $timeout(function() {
$scope.$emit('Local/GlideraError'); $scope.$emit('Local/GlideraError');
}, 100); }, 100);

4
src/js/controllers/walletHome.js
View file

@ -1,6 +1,6 @@
'use strict'; '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 isCordova = platformInfo.isCordova;
var isWP = platformInfo.isWP; var isWP = platformInfo.isWP;
@ -365,7 +365,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var prefix = var prefix =
fc.credentials.m > 1 ? gettextCatalog.getString('Could not create payment proposal') : gettextCatalog.getString('Could not send payment'); 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() { $timeout(function() {
$scope.$digest(); $scope.$digest();

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

@ -1,7 +1,7 @@
'use strict'; 'use strict';
'use strict'; 'use strict';
angular.module('copayApp.services') 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 = {}; var root = {};
root.expireAddress = function(walletId, cb) { root.expireAddress = function(walletId, cb) {
@ -44,7 +44,7 @@ angular.module('copayApp.services')
return cb(null, addr[0].address); return cb(null, addr[0].address);
}); });
} }
return bwsError.cb(err, prefix, cb); return bwcError.cb(err, prefix, cb);
} }
return cb(null, addr.address); return cb(null, addr.address);
}); });

2
src/js/services/bwsError.js → src/js/services/bwcError.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services') angular.module('copayApp.services')
.factory('bwsError', function bwcErrorService($log, gettextCatalog) { .factory('bwcError', function bwcErrorService($log, gettextCatalog) {
var root = {}; var root = {};
root.msg = function(err, prefix) { root.msg = function(err, prefix) {

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

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services') 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; var isChromeApp = platformInfo.isChromeApp;
@ -357,7 +357,7 @@ angular.module('copayApp.services')
singleAddress: opts.singleAddress, singleAddress: opts.singleAddress,
walletPrivKey: opts.walletPrivKey, walletPrivKey: opts.walletPrivKey,
}, function(err, secret) { }, 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); return cb(null, walletClient, secret);
}); });
}); });
@ -405,8 +405,8 @@ angular.module('copayApp.services')
// check if exist // check if exist
if (lodash.find(root.profile.credentials, { if (lodash.find(root.profile.credentials, {
'walletId': walletData.walletId 'walletId': walletData.walletId
})) { })) {
return cb(gettext('Cannot join the same wallet more that once')); return cb(gettext('Cannot join the same wallet more that once'));
} }
} catch (ex) { } catch (ex) {
@ -420,7 +420,7 @@ angular.module('copayApp.services')
if (err) return cb(err); if (err) return cb(err);
walletClient.joinWallet(opts.secret, opts.myName || 'me', {}, function(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, { root.addAndBindWalletClient(walletClient, {
bwsurl: opts.bwsurl bwsurl: opts.bwsurl
}, cb); }, cb);
@ -583,7 +583,7 @@ angular.module('copayApp.services')
if (err instanceof errors.NOT_AUTHORIZED) if (err instanceof errors.NOT_AUTHORIZED)
return cb(err); return cb(err);
return bwsError.cb(err, gettext('Could not import'), cb); return bwcError.cb(err, gettext('Could not import'), cb);
} }
root.addAndBindWalletClient(walletClient, { root.addAndBindWalletClient(walletClient, {
@ -614,7 +614,7 @@ angular.module('copayApp.services')
if (err instanceof errors.NOT_AUTHORIZED) if (err instanceof errors.NOT_AUTHORIZED)
return cb(err); return cb(err);
return bwsError.cb(err, gettext('Could not import'), cb); return bwcError.cb(err, gettext('Could not import'), cb);
} }
root.addAndBindWalletClient(walletClient, { root.addAndBindWalletClient(walletClient, {
@ -637,7 +637,7 @@ angular.module('copayApp.services')
if (err instanceof errors.NOT_AUTHORIZED) if (err instanceof errors.NOT_AUTHORIZED)
err.name = 'WALLET_DOES_NOT_EXIST'; 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, { root.addAndBindWalletClient(walletClient, {