diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 998160d29..8fb038e78 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -22,10 +22,10 @@
- - Payment Proposals + + {{'Payment Proposals'|translate}} - {{txpsN}} + {{txpsN}} diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 48daafb38..e4b157408 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -60,6 +60,8 @@ angular.module('copayApp.controllers').controller('amountController', function($ satToBtc = 1 / 100000000; unitDecimals = config.unitDecimals; + $scope.resetAmount(); + // in SAT ALWAYS if ($stateParams.toAmount) { $scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals); diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index ab5440289..0b6654842 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, gettext, txFormatService, ongoingProcess, $ionicModal, popupService) { +angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService) { var cachedTxp = {}; var isChromeApp = platformInfo.isChromeApp; diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js index 1ff5e6271..abf63c661 100644 --- a/src/js/controllers/onboarding/backupRequest.js +++ b/src/js/controllers/onboarding/backupRequest.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, $ionicPopup, popupService, gettextCatalog) { +angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, popupService, gettextCatalog) { $scope.walletId = $stateParams.walletId; diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js index 260c5eebd..795ce1d33 100644 --- a/src/js/controllers/onboarding/backupWarning.js +++ b/src/js/controllers/onboarding/backupWarning.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicPopup, profileService, $ionicModal) { +angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, profileService, $ionicModal) { $scope.walletId = $stateParams.walletId; $scope.openPopup = function() { diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js index bb74b9206..aca36409b 100644 --- a/src/js/controllers/onboarding/welcomeController.js +++ b/src/js/controllers/onboarding/welcomeController.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) { +angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, profileService) { $scope.goImport = function(code) { $state.go('onboarding.import', { diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 45c56dd9b..c3583249a 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData) { +angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService) { var originalList; var CONTACTS_SHOW_LIMIT = 10; @@ -99,9 +99,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( $scope.onQrCodeScanned = function(data) { if (!incomingData.redir(data)) { - $ionicPopup.alert({ - title: 'Invalid data', - }); + popupService.showAlert(null, gettextCatalog.getString('Invalid data')); } }; diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js index 434a1e80c..bfb12da45 100644 --- a/src/js/controllers/tabsController.js +++ b/src/js/controllers/tabsController.js @@ -1,12 +1,10 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash) { +angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, incomingData, lodash, popupService) { $scope.onScan = function(data) { if (!incomingData.redir(data)) { - $ionicPopup.alert({ - title: 'Invalid data', - }); + popupService.showAlert(null, gettextCatalog.getString('Invalid data')); } } diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index c51a99f37..dbb357ca4 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, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, $ionicPopup, txpModalService, externalLinkService) { +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, profileService, lodash, configService, gettextCatalog, platformInfo, walletService, txpModalService, externalLinkService, popupService) { var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; var isAndroid = platformInfo.isAndroid; @@ -219,9 +219,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun if (tx) { $scope.openTxModal(tx); } else { - $ionicPopup.alert({ - title: gettext('TX not available'), - }); + popupService.showAlert(null, gettextCatalog.getString('TX not available')); } } else if ($stateParams.txpId) { var txp = lodash.find($scope.txps, { @@ -230,9 +228,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun if (txp) { $scope.openTxpModal(txp); } else { - $ionicPopup.alert({ - title: gettext('Proposal not longer available'), - }); + popupService.showAlert(null, gettextCatalog.getString('Proposal not longer available')); } } }); diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index c9680a5cb..a34b210d3 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -820,32 +820,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim // An alert dialog var askPassword = function(name, title, cb) { - var scope = $rootScope.$new(true); - scope.data = []; - var pass = $ionicPopup.show({ - template: '', - title: title, - subTitle: name, - scope: scope, - buttons: [{ - text: 'Cancel' - }, { - text: 'OK', - type: 'button-positive', - onTap: function(e) { - if (!scope.data.pass) { - //don't allow the user to close unless he enters wifi password - e.preventDefault(); - return; - - } - - return scope.data.pass; - } - }] - }); - pass.then(function(res) { - return cb(res); + var opts = { + inputType: 'password' + }; + popupService.showPrompt(title, name, opts, function(res) { + if (!res) return cb(); + if (res) return cb(res) }); };