diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index 9f701e984..9250de9f1 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('glideraController', $scope.network = glideraService.getEnvironment(); $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + externalLinkService.open(url); }; var initGlidera = function(accessToken) { @@ -27,7 +27,9 @@ angular.module('copayApp.controllers').controller('glideraController', } $scope.token = glidera.token; $scope.permissions = glidera.permissions; - $scope.update({fullUpdate: true}); + $scope.update({ + fullUpdate: true + }); }); }; @@ -113,7 +115,7 @@ angular.module('copayApp.controllers').controller('glideraController', }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ + $scope.$on("$ionicView.beforeEnter", function(event, data) { initGlidera(); }); diff --git a/src/js/routes.js b/src/js/routes.js index ed29cd0a0..ff3073659 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -971,8 +971,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (lodash.isEmpty(profileService.getWallets())) { $log.debug('No wallets and no disclaimer... redirecting'); $state.go('onboarding.welcome'); - } - else { + } else { $log.debug('Display disclaimer... redirecting'); $state.go('onboarding.disclaimer', { resume: true @@ -981,8 +980,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } else { throw new Error(err); // TODO } - } - else { + } else { profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index aa1951fd6..58e5dba54 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -1,13 +1,17 @@ 'use strict'; -angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService) { +angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog) { - this.open = function(url, target) { + this.open = function(url, desc) { if (platformInfo.isNW) { nodeWebkitService.openExternalLink(url); } else { - target = target || '_blank'; - var ref = window.open(url, target, 'location=no'); + desc = desc || 'this link'; + var message = gettextCatalog.getString('You are leaving to view ' + desc + ''), + openBrowser = function(res) { + if (res) window.open(url, '_system'); + }; + popupService.showConfirm('Opening Browser', message, 'Open', 'Cancel', openBrowser); } }; diff --git a/www/views/amazon.html b/www/views/amazon.html index ad3350ac0..f5499dabb 100644 --- a/www/views/amazon.html +++ b/www/views/amazon.html @@ -24,7 +24,7 @@
Amazon.com Gift Cards never expire and can be redeemed towards millions of items at - www.amazon.com + www.amazon.com
diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index cb0374248..7c22fb9e7 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -17,7 +17,7 @@ BitPay Invoice ID: {{buy.errorInfo.invoiceId}}.
- Open invoice + Open invoice
@@ -88,7 +88,7 @@
Thank you for participating in the BitPay offer. It is our pleasure to send you this Amazon.com Gift Card* that can be redeemed towards millions of items at - www.amazon.com. + www.amazon.com. You may want to print this screen for easy reference later you will need the gift card claim code below.
@@ -105,19 +105,19 @@
- See invoice + See invoice
To redeem your gift card, follow these steps:
    -
  1. 1. Visit www.amazon.com/gc +
  2. 1. Visit www.amazon.com/gc
  3. 2. Click Apply to Account and enter the Claim Code when prompted.
  4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
  5. 4. You must pay for any remaining balance on your order with another payment method. @@ -130,7 +130,7 @@

    If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

    @@ -139,14 +139,14 @@
- * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + * Amazon.com is not a sponsor of this promotion. + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
diff --git a/www/views/glidera.html b/www/views/glidera.html index fb65265e7..436f77932 100644 --- a/www/views/glidera.html +++ b/www/views/glidera.html @@ -37,7 +37,7 @@

Connect your Glidera account to get started

@@ -96,9 +96,8 @@

Complete Setup

Your Glidera account is not ready to transact. Please, verify it at Glidera.io
+ ng-init="glideraUrl = network == 'testnet' ? 'https://sandbox.glidera.io/login' : 'https://glidera.io/login'" + ng-click="openExternalLink(glideraUrl, 'Glidera account verification')"> Go to Glidera
diff --git a/www/views/modals/amazon-card-details.html b/www/views/modals/amazon-card-details.html index daf729be4..95cee6b29 100644 --- a/www/views/modals/amazon-card-details.html +++ b/www/views/modals/amazon-card-details.html @@ -23,7 +23,7 @@
@@ -48,7 +48,7 @@
- See invoice + See invoice
@@ -60,7 +60,7 @@ To redeem your gift card, follow these steps:
    -
  1. 1. Visit www.amazon.com/gc +
  2. 1. Visit www.amazon.com/gc
  3. 2. Click Apply to Account and enter the Claim Code when prompted.
  4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
  5. 4. You must pay for any remaining balance on your order with another payment method. @@ -73,7 +73,7 @@

    If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

    @@ -81,13 +81,13 @@
    * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
    diff --git a/www/views/modals/terms.html b/www/views/modals/terms.html index 743970e06..d2872f95b 100644 --- a/www/views/modals/terms.html +++ b/www/views/modals/terms.html @@ -10,7 +10,7 @@
    - Official English Disclaimer + Official English Disclaimer

    I have read, understood, and agree with the Terms of use.

    diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index b5a118a29..51ca318bd 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -70,7 +70,7 @@
    + ng-click="openExternalLink('https://' + (getShortNetworkName() == 'test' ? 'test-' : '', 'blockchain transaction') + 'insight.bitpay.com/tx/' + btx.txid)"> View transaction on the blockchain
    diff --git a/www/views/preferencesAbout.html b/www/views/preferencesAbout.html index 7c66822e9..72102c1ac 100644 --- a/www/views/preferencesAbout.html +++ b/www/views/preferencesAbout.html @@ -16,7 +16,7 @@ v{{version}} -
    +
    Commit hash diff --git a/www/views/preferencesLanguage.html b/www/views/preferencesLanguage.html index b4544870a..9ad77f72a 100644 --- a/www/views/preferencesLanguage.html +++ b/www/views/preferencesLanguage.html @@ -14,10 +14,10 @@
    All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + https://crowdin.com/project/copay. Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language.
    - \ No newline at end of file + diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index c22662e72..80cf2af3b 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -123,7 +123,7 @@
    - + diff --git a/www/views/termsOfUse.html b/www/views/termsOfUse.html index 5d330a0cc..e80a003b2 100644 --- a/www/views/termsOfUse.html +++ b/www/views/termsOfUse.html @@ -11,7 +11,7 @@
    diff --git a/www/views/translators.html b/www/views/translators.html index 6d368914d..961a46e26 100644 --- a/www/views/translators.html +++ b/www/views/translators.html @@ -22,7 +22,7 @@

    All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + https://crowdin.com/project/copay.

    Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 5314a2714..c634c1ef8 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -90,7 +90,7 @@
    -
    +
    {{newRelease}}