- Contacts & Wallets
+ Contacts & Wallets
No Wallet - Contact
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index f15710618..285771d19 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -1,7 +1,7 @@
'use strict';
-angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService) {
-
+angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicHistory, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService) {
+ $ionicNavBarDelegate.title(gettextCatalog.getString('Enter Amount'));
var unitToSatoshi;
var satToUnit;
@@ -63,7 +63,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
// in SAT ALWAYS
if ($stateParams.toAmount) {
- $scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals) ;
+ $scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals);
}
@@ -188,13 +188,9 @@ angular.module('copayApp.controllers').controller('amountController', function($
var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals);
$state.transitionTo('send.confirm', {
- toAmount:amount * unitToSatoshi,
+ toAmount: amount * unitToSatoshi,
toAddress: $scope.toAddress,
toName: $scope.toName,
});
};
-
- $scope.cancel = function() {
- $state.transitionTo('tabs.send');
- };
});
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index e9af90994..2390ea639 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -1,7 +1,7 @@
'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, txStatus, gettext, txFormatService, ongoingProcess, $ionicModal) {
-
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, $ionicPopup, txStatus, gettext, txFormatService, ongoingProcess, $ionicModal) {
+ $ionicNavBarDelegate.title(gettextCatalog.getString('Confirm'));
var cachedTxp = {};
var isChromeApp = platformInfo.isChromeApp;
@@ -198,7 +198,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.$apply();
};
- var createTx = function(wallet, cb) {
+ var createTx = function(wallet, cb) {
var config = configService.getSync().wallet;
var currentSpendUnconfirmed = config.spendUnconfirmed;
var outputs = [];
diff --git a/src/js/routes.js b/src/js/routes.js
index 44c63ff8e..36d1f9edc 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -357,12 +357,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*/
.state('send', {
- url: '/send',
- abstract: true,
- template: '
'
- })
-
- .state('send.amount', {
+ url: '/send',
+ abstract: true,
+ template: '
'
+ })
+ .state('send.amount', {
url: '/amount/:toAddress/:toName',
views: {
'send': {