diff --git a/src/js/controllers/addressbook.js b/src/js/controllers/addressbook.js index 00931bc83..b86bbcc54 100644 --- a/src/js/controllers/addressbook.js +++ b/src/js/controllers/addressbook.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('addressbookListController', function($scope, $log, $timeout, addressbookService, lodash, popupService) { +angular.module('copayApp.controllers').controller('addressbookListController', function($scope, $log, $timeout, addressbookService, lodash, popupService, gettextCatalog) { var contacts; diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js index 9e1787f57..402f831de 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, optIn, title, message, okText, cancelText) { - externalLinkService.open(url, optIn, title, message, okText, cancelText); + $scope.openExternalLink = function(url) { + externalLinkService.open(url); }; var initAmazon = function() { @@ -20,7 +20,9 @@ angular.module('copayApp.controllers').controller('amazonController', $scope.$digest(); }); if ($scope.cardClaimCode) { - var card = lodash.find($scope.giftCards, { claimCode: $scope.cardClaimCode }); + var card = lodash.find($scope.giftCards, { + claimCode: $scope.cardClaimCode + }); if (lodash.isEmpty(card)) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Card not found')); return; diff --git a/src/js/controllers/feedback/rateApp.js b/src/js/controllers/feedback/rateApp.js index 58f4c389f..e94982e03 100644 --- a/src/js/controllers/feedback/rateApp.js +++ b/src/js/controllers/feedback/rateApp.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, $window, lodash, externalLinkService, configService, gettextCatalog, platformInfo, feedbackService, ongoingProcess, popupService) { +angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, $window, lodash, externalLinkService, configService, platformInfo, feedbackService, ongoingProcess, popupService) { $scope.score = parseInt($stateParams.score); var isAndroid = platformInfo.isAndroid; var isIOS = platformInfo.isIOS; diff --git a/src/js/controllers/modals/amazonCardDetails.js b/src/js/controllers/modals/amazonCardDetails.js index ffe54b713..b567c99b1 100644 --- a/src/js/controllers/modals/amazonCardDetails.js +++ b/src/js/controllers/modals/amazonCardDetails.js @@ -62,8 +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); + $scope.openExternalLink = function(url) { + externalLinkService.open(url); }; }); diff --git a/src/js/controllers/onboarding/terms.js b/src/js/controllers/onboarding/terms.js index f06b8ca20..7cab71203 100644 --- a/src/js/controllers/onboarding/terms.js +++ b/src/js/controllers/onboarding/terms.js @@ -1,8 +1,7 @@ 'use strict'; -angular.module('copayApp.controllers').controller('termsController', function($scope, $log, $state, $window, uxLanguage, profileService, externalLinkService) { +angular.module('copayApp.controllers').controller('termsController', function($scope, $log, $state, $window, uxLanguage, profileService, externalLinkService, gettextCatalog) { $scope.lang = uxLanguage.currentLanguage; - $scope.disclaimerUrl = $window.appConfig.disclaimerUrl; $scope.confirm = function() { profileService.setDisclaimerAccepted(function(err) { @@ -15,7 +14,13 @@ angular.module('copayApp.controllers').controller('termsController', function($s }); }; - $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + $scope.openExternalLink = function() { + var url = $window.appConfig.disclaimerUrl; + var optIn = true; + var title = gettextCatalog.getString('View Terms of Service'); + var message = gettextCatalog.getString('The official English Terms of Service are available on the BitPay website. Would you like to view them?'); + var okText = gettextCatalog.getString('Open Website'); + var cancelText = gettextCatalog.getString('Go Back'); externalLinkService.open(url, optIn, title, message, okText, cancelText); }; diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index f5aba00ad..8b1a8dde0 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesController', - function($scope, $rootScope, $timeout, $log, $stateParams, $ionicHistory, gettextCatalog, configService, profileService, fingerprintService, walletService) { + function($scope, $rootScope, $timeout, $log, $stateParams, $ionicHistory, configService, profileService, fingerprintService, walletService) { var wallet = profileService.getWallet($stateParams.walletId); var walletId = wallet.credentials.walletId; $scope.wallet = wallet; diff --git a/src/js/controllers/preferencesAbout.js b/src/js/controllers/preferencesAbout.js index e8369abd7..75be9a7ce 100644 --- a/src/js/controllers/preferencesAbout.js +++ b/src/js/controllers/preferencesAbout.js @@ -5,10 +5,14 @@ angular.module('copayApp.controllers').controller('preferencesAbout', $scope.title = gettextCatalog.getString('About') + ' ' + $window.appConfig.nameCase; $scope.version = $window.version; - $scope.commitHash = $window.commitHash; - $scope.name = $window.appConfig.gitHubRepoName; - $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + $scope.openExternalLink = function() { + var url = 'https://github.com/bitpay/' + $window.appConfig.gitHubRepoName + '/tree/' + $window.commitHash + ''; + var optIn = true; + var title = gettextCatalog.getString('Open GitHub Project'); + var message = gettextCatalog.getString('You can see the latest developments and contribute to this open source app by visiting our project on GitHub.'); + var okText = gettextCatalog.getString('Open GitHub'); + var cancelText = gettextCatalog.getString('Go Back'); externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/preferencesAlias.js b/src/js/controllers/preferencesAlias.js index 5060335c1..8cb9f2670 100644 --- a/src/js/controllers/preferencesAlias.js +++ b/src/js/controllers/preferencesAlias.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesAliasController', - function($scope, $timeout, $stateParams, $ionicHistory, gettextCatalog, configService, profileService, walletService) { + function($scope, $timeout, $stateParams, $ionicHistory, configService, profileService, walletService) { var wallet = profileService.getWallet($stateParams.walletId); var walletId = wallet.credentials.walletId; var config = configService.getSync(); diff --git a/src/js/controllers/preferencesAltCurrency.js b/src/js/controllers/preferencesAltCurrency.js index 2286d9a3f..5f9ab9910 100644 --- a/src/js/controllers/preferencesAltCurrency.js +++ b/src/js/controllers/preferencesAltCurrency.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesAltCurrencyController', - function($scope, $log, $timeout, $ionicHistory, gettextCatalog, configService, rateService, lodash, profileService, walletService) { + function($scope, $log, $timeout, $ionicHistory, configService, rateService, lodash, profileService, walletService) { var next = 10; var completeAlternativeList; diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index da4552c00..cf1518e2d 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, $timeout, $log, $stateParams, $ionicHistory, gettextCatalog, configService, profileService) { +angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, $timeout, $log, $stateParams, $ionicHistory, configService, profileService) { var wallet = profileService.getWallet($stateParams.walletId); $scope.wallet = wallet; var walletId = wallet.credentials.walletId; diff --git a/src/js/controllers/preferencesHistory.js b/src/js/controllers/preferencesHistory.js index 0cd529a04..06167fb4f 100644 --- a/src/js/controllers/preferencesHistory.js +++ b/src/js/controllers/preferencesHistory.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesHistory', - function($scope, $log, $stateParams, $timeout, $state, $ionicHistory, gettextCatalog, storageService, platformInfo, profileService, lodash, $window) { + function($scope, $log, $stateParams, $timeout, $state, $ionicHistory, storageService, platformInfo, profileService, lodash, $window) { $scope.wallet = profileService.getWallet($stateParams.walletId); $scope.csvReady = false; $scope.isCordova = platformInfo.isCordova; diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js index 81db570a2..74b75f291 100644 --- a/src/js/controllers/preferencesLanguage.js +++ b/src/js/controllers/preferencesLanguage.js @@ -5,7 +5,13 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController $scope.availableLanguages = uxLanguage.getLanguages(); - $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + $scope.openExternalLink = function() { + var url = 'https://crowdin.com/project/copay'; + var optIn = true; + var title = gettextCatalog.getString('Open Translation Community'); + var message = gettextCatalog.getString('You can make contributions by signing up on our Crowdin community translation website. We’re looking forward to hearing from you!'); + var okText = gettextCatalog.getString('Open Crowdin'); + var cancelText = gettextCatalog.getString('Go Back'); externalLinkService.open(url, optIn, title, message, okText, cancelText); }; diff --git a/src/js/controllers/preferencesLogs.js b/src/js/controllers/preferencesLogs.js index 43d5d42cb..94b82e100 100644 --- a/src/js/controllers/preferencesLogs.js +++ b/src/js/controllers/preferencesLogs.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesLogs', - function($scope, historicLog, gettextCatalog) { + function($scope, historicLog) { $scope.$on("$ionicView.enter", function(event, data) { $scope.logs = historicLog.get(); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 25dd485cf..d520ef88e 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -126,7 +126,13 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); }); - $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + $scope.openExternalLink = function() { + var url = 'https://github.com/bitpay/copay/releases/latest'; + var optIn = true; + var title = gettextCatalog.getString('Update Available'); + var message = gettextCatalog.getString('An update to this app is available. For your security, please update to the latest version.'); + var okText = gettextCatalog.getString('View Update'); + var cancelText = gettextCatalog.getString('Go Back'); 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 ed23075e2..9c1c9b524 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService) { +angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService, gettextCatalog) { var updateConfig = function() { @@ -30,7 +30,13 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct $scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp; }; - $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + $scope.openExternalLink = function() { + var url = 'https://help.bitpay.com/bitpay-app'; + var optIn = true; + var title = gettextCatalog.getString('BitPay Help Center'); + var message = gettextCatalog.getString('Help and support information is available at the BitPay Help Center website. Would you like to go there now?'); + var okText = gettextCatalog.getString('Open Help Center'); + var cancelText = gettextCatalog.getString('Go Back'); externalLinkService.open(url, optIn, title, message, okText, cancelText); }; diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js index 1b07555d5..42899e13e 100644 --- a/src/js/controllers/tabsController.js +++ b/src/js/controllers/tabsController.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash, popupService) { +angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash, popupService, gettextCatalog) { $scope.onScan = function(data) { if (!incomingData.redir(data)) { diff --git a/src/js/controllers/termOfUse.js b/src/js/controllers/termOfUse.js index 46d91160f..6bbc2bdf4 100644 --- a/src/js/controllers/termOfUse.js +++ b/src/js/controllers/termOfUse.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('termOfUseController', - function($scope, $window, uxLanguage, gettextCatalog, externalLinkService) { + function($scope, $window, uxLanguage, externalLinkService) { $scope.lang = uxLanguage.currentLanguage; $scope.disclaimerUrl = $window.appConfig.disclaimerUrl; diff --git a/src/js/controllers/translators.js b/src/js/controllers/translators.js index c763d7079..000688a6a 100644 --- a/src/js/controllers/translators.js +++ b/src/js/controllers/translators.js @@ -1,8 +1,14 @@ 'use strict'; angular.module('copayApp.controllers').controller('translatorsController', - function($scope, externalLinkService) { - $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + function($scope, externalLinkService, gettextCatalog) { + $scope.openExternalLink = function() { + var url = 'https://crowdin.com/project/copay'; + var optIn = true; + var title = gettextCatalog.getString('Open Translation Community'); + var message = gettextCatalog.getString('You can make contributions by signing up on our Crowdin community translation website. We’re looking forward to hearing from you!'); + var okText = gettextCatalog.getString('Open Crowdin'); + var cancelText = gettextCatalog.getString('Go Back'); externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/tx-details.js b/src/js/controllers/tx-details.js index 101df8222..f3ba54f00 100644 --- a/src/js/controllers/tx-details.js +++ b/src/js/controllers/tx-details.js @@ -121,12 +121,11 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.viewOnBlockchain = function() { var btx = $scope.btx; var url = 'https://' + ($scope.getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid; - var title = 'View Transaction on Insight'; - var message = 'Would you like to view this transaction on the Insight blockchain explorer?'; - $scope.openExternalLink(url, true, title, message, 'Open Insight', 'Go back'); - }; - - $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + var optIn = true; + var title = gettextCatalog.getString('View Transaction on Insight'); + var message = gettextCatalog.getString('Would you like to view this transaction on the Insight blockchain explorer?'); + var okText = gettextCatalog.getString('Open Insight'); + var cancelText = gettextCatalog.getString('Go Back'); externalLinkService.open(url, optIn, title, message, okText, cancelText); }; diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index d7d90ea83..0638a818c 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window) { +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -322,7 +322,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); $scope.$on("$ionicView.beforeLeave", function(event, data) { - if($window.StatusBar) { + if ($window.StatusBar) { $window.StatusBar.backgroundColorByHexString('#1e3186'); } }); @@ -336,13 +336,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun function setAndroidStatusBarColor() { var SUBTRACT_AMOUNT = 15; - if(!$scope.isAndroid) { + if (!$scope.isAndroid) { return; } var rgb = hexToRgb($scope.wallet.color); var keys = Object.keys(rgb); keys.forEach(function(k) { - if(rgb[k] - SUBTRACT_AMOUNT < 0) { + if (rgb[k] - SUBTRACT_AMOUNT < 0) { rgb[k] = 0; } else { rgb[k] -= SUBTRACT_AMOUNT; diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index a9818d9df..b47dd7857 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -21,14 +21,10 @@ angular.module('copayApp.services').service('externalLinkService', function(plat _restoreHandleOpenURL(old); } else { 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'); - _restoreHandleOpenURL(old); - }; + var openBrowser = function(res) { + if (res) window.open(url, '_system'); + _restoreHandleOpenURL(old); + }; popupService.showConfirm(title, message, okText, cancelText, openBrowser); } else { window.open(url, '_system'); diff --git a/www/views/modals/terms.html b/www/views/modals/terms.html index f823870b0..e1b216308 100644 --- a/www/views/modals/terms.html +++ b/www/views/modals/terms.html @@ -12,7 +12,7 @@
- Official English Disclaimer + Official English Disclaimer
diff --git a/www/views/preferencesAbout.html b/www/views/preferencesAbout.html index 8d30b1864..42c47284c 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 737091fa0..0605e17be 100644 --- a/www/views/preferencesLanguage.html +++ b/www/views/preferencesLanguage.html @@ -23,7 +23,7 @@
- Contribute Translations + Contribute Translations
diff --git a/www/views/tab-home.html b/www/views/tab-home.html index c91668670..5941b4eed 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -10,7 +10,7 @@ spinner="ios-small" on-refresh="onRefresh()"> -
+
An update to this app is available
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index ab01bf9b7..3c3e9db98 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 9421f7fda..ee09018f5 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 2fca98b14..5a732584c 100644 --- a/www/views/translators.html +++ b/www/views/translators.html @@ -30,7 +30,7 @@
- Contribute Translations + Contribute Translations