From f808a3afcdbecaedecac73aafeda576d9029cae8 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 08:57:08 -0400 Subject: [PATCH 1/9] added new logic to external link service to open in system browser with confirm message to notify them they're leaving and give option to cancel --- src/js/controllers/glidera.js | 8 +++++--- src/js/routes.js | 6 ++---- src/js/services/externalLinkService.js | 12 ++++++++---- www/views/amazon.html | 2 +- www/views/buyAmazon.html | 22 +++++++++++----------- www/views/glidera.html | 7 +++---- www/views/modals/amazon-card-details.html | 16 ++++++++-------- www/views/modals/terms.html | 2 +- www/views/modals/tx-details.html | 2 +- www/views/preferencesAbout.html | 2 +- www/views/preferencesLanguage.html | 4 ++-- www/views/tab-settings.html | 2 +- www/views/termsOfUse.html | 2 +- www/views/translators.html | 2 +- www/views/walletDetails.html | 2 +- 15 files changed, 47 insertions(+), 44 deletions(-) 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}}
    From 3b3d931892f610a398b5fa94d00273083f786c49 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 11:19:09 -0400 Subject: [PATCH 2/9] added opt in option, and new inputs to make modal completely custom per use. --- src/js/services/externalLinkService.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index 58e5dba54..e33bdd871 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -2,16 +2,16 @@ angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog) { - this.open = function(url, desc) { + this.open = function(url, optIn, title, desc, okText, cancelText) { if (platformInfo.isNW) { nodeWebkitService.openExternalLink(url); } else { - desc = desc || 'this link'; - var message = gettextCatalog.getString('You are leaving to view ' + desc + ''), + var message = gettextCatalog.getString(desc), + title = gettextCatalog.getString(title), openBrowser = function(res) { if (res) window.open(url, '_system'); }; - popupService.showConfirm('Opening Browser', message, 'Open', 'Cancel', openBrowser); + popupService.showConfirm(title, message, 'Open', 'Cancel', openBrowser); } }; From fa7c746f5e8c3a010655d15beda3a6ba4072c9ed Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 15:29:06 -0400 Subject: [PATCH 3/9] added additional options to external service to provide custom message. disabled confirm dialog where needed --- src/js/controllers/amazon.js | 6 ++--- src/js/controllers/buyAmazon.js | 14 +++++++----- src/js/controllers/glidera.js | 4 ++-- .../controllers/modals/amazonCardDetails.js | 6 ++++- src/js/controllers/modals/txDetails.js | 4 ++-- src/js/controllers/onboarding/terms.js | 4 ++-- src/js/controllers/preferencesAbout.js | 4 ++-- src/js/controllers/tab-settings.js | 4 ++-- src/js/services/externalLinkService.js | 20 ++++++++++------- www/views/amazon.html | 2 +- www/views/buyAmazon.html | 22 +++++++++---------- www/views/glidera.html | 4 ++-- www/views/modals/amazon-card-details.html | 16 +++++++------- www/views/modals/terms.html | 2 +- www/views/modals/tx-details.html | 2 +- www/views/preferencesAbout.html | 2 +- www/views/preferencesLanguage.html | 6 +++-- www/views/tab-settings.html | 2 +- www/views/translators.html | 6 +++-- 19 files changed, 73 insertions(+), 57 deletions(-) diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js index 954c35c24..453cced4e 100644 --- a/src/js/controllers/amazon.js +++ b/src/js/controllers/amazon.js @@ -5,8 +5,8 @@ angular.module('copayApp.controllers').controller('amazonController', $scope.network = amazonService.getEnvironment(); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; var initAmazon = function() { @@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('amazonController', }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ + $scope.$on("$ionicView.beforeEnter", function(event, data) { initAmazon(); }); }); diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index 903e2a682..ca2aede91 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -16,12 +16,14 @@ angular.module('copayApp.controllers').controller('buyAmazonController', $log.debug('Wallet changed: ' + w.name); }); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; this.confirm = function() { - var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.formData.fiat}); + var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', { + amount: $scope.formData.fiat + }); var ok = gettextCatalog.getString('Buy'); popupService.showConfirm(null, message, ok, null, function(res) { if (res) self.createTx(); @@ -209,8 +211,10 @@ angular.module('copayApp.controllers').controller('buyAmazonController', }); }; - $scope.$on("$ionicView.enter", function(event, data){ - $scope.formData = { fiat: null }; + $scope.$on("$ionicView.enter", function(event, data) { + $scope.formData = { + fiat: null + }; $scope.wallets = profileService.getWallets({ network: network, onlyComplete: true diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index 9250de9f1..c3b9380c9 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -5,8 +5,8 @@ angular.module('copayApp.controllers').controller('glideraController', $scope.network = glideraService.getEnvironment(); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; var initGlidera = function(accessToken) { diff --git a/src/js/controllers/modals/amazonCardDetails.js b/src/js/controllers/modals/amazonCardDetails.js index 9cadccb10..ffe54b713 100644 --- a/src/js/controllers/modals/amazonCardDetails.js +++ b/src/js/controllers/modals/amazonCardDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('amazonCardDetailsController', function($scope, $log, $timeout, bwcError, amazonService, lodash, ongoingProcess, popupService, gettextCatalog) { +angular.module('copayApp.controllers').controller('amazonCardDetailsController', function($scope, $log, $timeout, bwcError, amazonService, lodash, ongoingProcess, popupService, gettextCatalog, externalLinkService) { $scope.cancelGiftCard = function() { ongoingProcess.set('Canceling gift card...', true); @@ -62,4 +62,8 @@ angular.module('copayApp.controllers').controller('amazonCardDetailsController', $scope.amazonCardDetailsModal.hide(); }; + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); + }; + }); diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index adb7ddda6..7f3dacf10 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -139,8 +139,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio }); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; $scope.getShortNetworkName = function() { diff --git a/src/js/controllers/onboarding/terms.js b/src/js/controllers/onboarding/terms.js index 0c4773c04..f06b8ca20 100644 --- a/src/js/controllers/onboarding/terms.js +++ b/src/js/controllers/onboarding/terms.js @@ -15,8 +15,8 @@ angular.module('copayApp.controllers').controller('termsController', function($s }); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/preferencesAbout.js b/src/js/controllers/preferencesAbout.js index 64f10de54..e8369abd7 100644 --- a/src/js/controllers/preferencesAbout.js +++ b/src/js/controllers/preferencesAbout.js @@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesAbout', $scope.commitHash = $window.commitHash; $scope.name = $window.appConfig.gitHubRepoName; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index 2981745ca..773a6a5f3 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -24,8 +24,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct $scope.wallets = profileService.getWallets(); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; $scope.$on("$ionicView.beforeEnter", function(event, data) { diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index cc0a447fe..8154601d0 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -1,8 +1,8 @@ 'use strict'; -angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog) { +angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog, $window, $log, $timeout) { - this.open = function(url, optIn, title, desc, okText, cancelText) { + this.open = function(url, optIn, title, message, okText, cancelText) { var old = $window.handleOpenURL; $window.handleOpenURL = function(url) { @@ -17,12 +17,16 @@ angular.module('copayApp.services').service('externalLinkService', function(plat if (platformInfo.isNW) { nodeWebkitService.openExternalLink(url); } else { - var message = gettextCatalog.getString(desc), - title = gettextCatalog.getString(title), - openBrowser = function(res) { - if (res) window.open(url, '_system'); - }; - popupService.showConfirm(title, message, 'Open', 'Cancel', openBrowser); + if (optIn) { + var message = gettextCatalog.getString(message), + title = gettextCatalog.getString(title), + okText = gettextCatalog.getString(okText), + cancelText = gettextCatalog.getString(cancelText), + openBrowser = function(res) { + if (res) window.open(url, '_system'); + }; + popupService.showConfirm(title, message, okText, cancelText, openBrowser); + } else window.open(url, '_system'); } }; diff --git a/www/views/amazon.html b/www/views/amazon.html index 543ac2a1a..31701b4d6 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 495292aa0..f382490c0 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 314297c05..4fe56cb16 100644 --- a/www/views/glidera.html +++ b/www/views/glidera.html @@ -36,7 +36,7 @@

    Connect your Glidera account to get started

    @@ -96,7 +96,7 @@
    Your Glidera account is not ready to transact. Please, verify it at Glidera.io
    + ng-click="openExternalLink(glideraUrl, false)"> Go to Glidera
    diff --git a/www/views/modals/amazon-card-details.html b/www/views/modals/amazon-card-details.html index 95cee6b29..d9c2813e0 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 d2872f95b..d5bf23609 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 47f9911e1..af5272235 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, yes, 'View Transaction on Insight', 'Would you like to view this transaction on the Insight blockchain explorer?
', 'Open Insight', 'Go back')"> View transaction on the blockchain
      diff --git a/www/views/preferencesAbout.html b/www/views/preferencesAbout.html index 356dc74c4..72ff490e6 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 9ad77f72a..2c01d7d61 100644 --- a/www/views/preferencesLanguage.html +++ b/www/views/preferencesLanguage.html @@ -13,8 +13,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. + We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin. + Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 80cf2af3b..2c94c426c 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -123,7 +123,7 @@
      - + diff --git a/www/views/translators.html b/www/views/translators.html index 961a46e26..e2a97d9cb 100644 --- a/www/views/translators.html +++ b/www/views/translators.html @@ -21,8 +21,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. + We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin. +

      Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. From 404b76d65b362b81b086a63e6a559eb27e64737d Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 15:33:52 -0400 Subject: [PATCH 4/9] fix settings view issue --- www/views/tab-settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 2c94c426c..e88cf5141 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -123,7 +123,7 @@
      - + From 992f0bd8a47960c9f1f70465e59deac412a6b5af Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 12:11:36 -0400 Subject: [PATCH 5/9] removed new releases link --- www/views/walletDetails.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 371cfc392..b0d2e784c 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -90,10 +90,6 @@
      -
      - {{newRelease}} -
      -
      From a0201cfec88d0c757549d5f81d706f10554ce691 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 12:20:53 -0400 Subject: [PATCH 6/9] removed false declaration, fixed broken string in open link function call --- www/views/amazon.html | 2 +- www/views/buyAmazon.html | 22 +++++++++++----------- www/views/glidera.html | 4 ++-- www/views/modals/amazon-card-details.html | 16 ++++++++-------- www/views/modals/tx-details.html | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/www/views/amazon.html b/www/views/amazon.html index 31701b4d6..8e17d5559 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 f382490c0..8dc95908e 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 4fe56cb16..368651cd6 100644 --- a/www/views/glidera.html +++ b/www/views/glidera.html @@ -36,7 +36,7 @@

      Connect your Glidera account to get started

      @@ -96,7 +96,7 @@
      Your Glidera account is not ready to transact. Please, verify it at Glidera.io
      + ng-click="openExternalLink(glideraUrl)"> Go to Glidera
      diff --git a/www/views/modals/amazon-card-details.html b/www/views/modals/amazon-card-details.html index d9c2813e0..75e6aa7b1 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/tx-details.html b/www/views/modals/tx-details.html index af5272235..2db70f5b6 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-' : '') + 'insight.bitpay.com/tx/' + btx.txid, true, 'View Transaction on Insight', 'Would you like to view this transaction on the Insight blockchain explorer?
', 'Open Insight', 'Go back')"> View transaction on the blockchain
        From 3769772f74caa1eb025ae6246813217043c52a0c Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 12:22:05 -0400 Subject: [PATCH 7/9] removed duplicate help and support --- www/views/tab-settings.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 72cb67c18..8f8eba854 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -135,17 +135,6 @@ About {{appName}} - -
        - - - - - Help & Support - - - -
        From 796b70304e0bb4e9a61ec9151b4b7fb5993aca23 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 14:33:31 -0400 Subject: [PATCH 8/9] last updates --- www/views/tab-settings.html | 2 +- www/views/termsOfUse.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 8f8eba854..76d8e353b 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -20,7 +20,7 @@ Address Book - + diff --git a/www/views/termsOfUse.html b/www/views/termsOfUse.html index d7672a732..93d475dcd 100644 --- a/www/views/termsOfUse.html +++ b/www/views/termsOfUse.html @@ -11,7 +11,7 @@ From 04539bfca80d68882fc69d8f41b34b7709f633a1 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 14:34:24 -0400 Subject: [PATCH 9/9] removed typo --- www/views/termsOfUse.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/termsOfUse.html b/www/views/termsOfUse.html index 93d475dcd..9421f7fda 100644 --- a/www/views/termsOfUse.html +++ b/www/views/termsOfUse.html @@ -11,7 +11,7 @@