-
+
+
@@ -48,7 +48,7 @@
-
+
-
\ No newline at end of file
+
diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css
index f853b59c8..01a6623d7 100644
--- a/src/css/ionic-migration.css
+++ b/src/css/ionic-migration.css
@@ -21,7 +21,7 @@
}
.button-content {
- margin-bottom: -20px;
+ margin-bottom: -15px;
}
.behind {
@@ -107,6 +107,20 @@
border: 1px solid #E9E9EC;
}
+.button.button-balanced:hover {
+ background-color: #b2b2b2;
+ border: 1px solid #E9E9EC;
+}
+
+.button.button-balanced:active {
+ background-color: #ababab;
+ border: 1px solid #E9E9EC;
+}
+
+.button {
+ text-transform: none;
+}
+
button, .button {
min-width: inherit;
min-height: inherit;
diff --git a/src/js/controllers/send2.js b/src/js/controllers/send2.js
index 34f132584..32bcc26e3 100644
--- a/src/js/controllers/send2.js
+++ b/src/js/controllers/send2.js
@@ -18,13 +18,16 @@ angular.module('copayApp.controllers').controller('send2Controller', function($s
$scope.toggleAlternative = function() {
$scope.showAlternative = !$scope.showAlternative;
+ var amount;
if ($scope.showAlternative) {
$scope.alternativeAmount = $scope.amountResult;
- $scope.alternativeResult = isOperator(lodash.last($scope.amount)) ? evaluate($scope.amount.slice(0, -1)) : evaluate($scope.amount);
+ amount = processFormat($scope.amount);
+ $scope.alternativeResult = isOperator(lodash.last(amount)) ? evaluate(amount.slice(0, -1)) : evaluate(amount);
} else {
$scope.amount = $scope.alternativeResult;
- $scope.amountResult = isOperator(lodash.last($scope.alternativeAmount)) ? evaluate($scope.alternativeAmount.slice(0, -1)) : evaluate($scope.alternativeAmount);
+ amount = processFormat($scope.alternativeAmount);
+ $scope.amountResult = isOperator(lodash.last(amount)) ? evaluate(amount.slice(0, -1)) : evaluate(amount);
}
};
@@ -57,16 +60,16 @@ angular.module('copayApp.controllers').controller('send2Controller', function($s
};
function isOperator(val) {
- var regex = /[\/\-\+\*]/;
+ var regex = /[\/\-\+\x\*]/;
var match = regex.exec(val);
if (match) return true;
return false;
};
$scope.removeDigit = function() {
- var amount = $scope.showAlternative ? $scope.alternativeAmount.toString() : $scope.amount.toString();
+ var amount = $scope.showAlternative ? $scope.alternativeAmount : $scope.amount;
- if (amount && amount.length == 0) {
+ if (amount && amount.toString().length == 0) {
resetAmount();
return;
}
@@ -101,7 +104,8 @@ angular.module('copayApp.controllers').controller('send2Controller', function($s
}
}
- var result = evaluate(val);
+ var formatedValue = processFormat(val);
+ var result = evaluate(formatedValue);
if (lodash.isNumber(result)) {
$scope.amount = $scope.alternativeAmount = val;
@@ -120,6 +124,10 @@ angular.module('copayApp.controllers').controller('send2Controller', function($s
return result;
};
+ function processFormat(val) {
+ return val.toString().replace('x', '*');
+ };
+
$scope.close = function() {
go.walletHome();
};
diff --git a/src/js/routes.js b/src/js/routes.js
index d42a1c60f..c2e97747f 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -347,30 +347,18 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
},
}
})
- .state('send2', {
- url: '/send2',
- templateUrl: 'views/send2.html',
+ .state('preferencesAlias', {
+ url: '/preferencesAlias',
+ templateUrl: 'views/preferencesAlias.html',
walletShouldBeComplete: true,
needProfile: true,
views: {
'main': {
- templateUrl: 'views/send2.html'
+ templateUrl: 'views/preferencesAlias.html'
},
}
})
- // .state('preferencesAlias', {
- // url: '/preferencesAlias',
- // templateUrl: 'views/preferencesAlias.html',
- // walletShouldBeComplete: true,
- // needProfile: true,
- // views: {
- // 'main': {
- // templateUrl: 'views/preferencesAlias.html'
- // },
- //
- // }
- // })
.state('preferencesEmail', {
url: '/preferencesEmail',
templateUrl: 'views/preferencesEmail.html',