diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index 1de232c47..910a093b2 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -48,23 +48,26 @@ at ${{buy.buyPrice.price}} {{buy.buyPrice.currency}} -
-

- The purchase price of ${{buy.buyPrice.price}} {{buy.buyPrice.currency}} will be immediately withdrawn from your bank account. +

+ ${{buy.buyPrice.price}} {{buy.buyPrice.currency}} will be immediately withdrawn from your + bank account. The total of {{buy.buyPrice.qty}} BTC will be purchased and deposited in your bitcoin wallet ({{index.walletName}}) in 2-4 business days.

-

- The total of {{buy.buyPrice.qty}} BTC will be purchased and deposited in your bitcoin wallet ({{index.walletName}}) in 2-4 business days. +

+ A SMS containing a confirmation code was sent to your phone. Please, enter code below

- + -
diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index 0ee649931..a0f0e17c9 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -49,23 +49,25 @@ at ${{sell.sellPrice.price}} {{sell.sellPrice.currency}} -
-

- The bitcoin amount of {{sell.sellPrice.qty}} will be immediately sent from your bitcoin wallet ({{index.walletName}}) to Glidera. +

+ {{sell.sellPrice.qty}} BTC will be immediately sent from your wallet to Glidera. The total of ${{sell.sellPrice.subtotal}} {{sell.sellPrice.currency}} will be deposited in your bank account in 4-6 business days.

-

- The total of ${{sell.sellPrice.subtotal}} {{sell.sellPrice.currency}} will be deposited in your bank account in 4-6 business days. +

+ A SMS containing a confirmation code was sent to your phone. Please, enter code below

- + -
diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index e8d2b88ea..fb05a438b 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, profileService, addressService, glideraService, gettext) { + function($scope, $timeout, profileService, addressService, glideraService, gettext, gettextCatalog, bwsError) { this.addr = {}; this.show2faCodeInput = null; @@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', } glideraService.buyPrice(token, price, function(err, buyPrice) { if (err) { - self.error = gettext('Glidera could not get pricing to buy bitcoin'); + self.error = gettext('Could not get exchange information. Please, try again.'); } else { self.buyPrice = buyPrice; @@ -32,7 +32,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', glideraService.get2faCode(token, function(err, sent) { self.loading = null; if (err) { - self.error = gettext('Glidera could not send the 2FA code to your phone'); + self.error = gettext('Could not send confirmation code to your phone'); } else { self.error = null; @@ -49,7 +49,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', self.error = null; addressService.getAddress(fc.credentials.walletId, null, function(err, addr) { if (!addr) { - self.error = gettext('Could not get the bitcoin address'); + self.error = bwsError.msg(err); $scope.$apply(); } else { diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index 1b525c981..278ae4933 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($scope, $timeout, $log, gettext, configService, profileService, addressService, feeService, glideraService) { + function($scope, $timeout, $log, gettext, gettextCatalog, configService, profileService, addressService, feeService, glideraService, bwsError) { var config = configService.getSync(); this.data = {}; @@ -21,7 +21,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', } glideraService.sellPrice(token, price, function(err, sellPrice) { if (err) { - self.error = gettext('Glidera could not get pricing to sell bitcoin'); + self.error = gettext('Could not get exchange information. Please, try again.'); } else { self.error = null; @@ -37,7 +37,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', glideraService.get2faCode(token, function(err, sent) { self.loading = null; if (err) { - self.error = gettext('Glidera could not send the 2FA code to your phone'); + self.error = gettext('Could not send confirmation code to your phone'); } else { self.show2faCodeInput = sent; @@ -56,7 +56,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', addressService.getAddress(fc.credentials.walletId, null, function(err, refundAddress) { if (!refundAddress) { self.loading = null; - self.error = gettext('Could not get the bitcoin address'); + self.error = bwsError.msg(err); return; } glideraService.getSellAddress(token, function(error, sellAddress) { @@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', $log.error(err); $timeout(function() { self.loading = null; - self.error = gettext('Could not create transaction'); + self.error = bwsError.msg(err, gettextCatalog.getString('Error')); }, 1); return; } @@ -141,7 +141,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', fc.signTxProposal(txp, function(err, signedTx) { profileService.lockFC(); if (err) { - err = gettext('The payment was created but could not be signed'); + err = bwsError.msg(err, gettextCatalog.getString('Could not accept payment')); return cb(err); } else {