| {{it.date | date: 'short'}} |
{{it.label}} |
- +{{(it.total/100000000).toFixed(2)}} |
- {{(it.total/100000000).toFixed(2)}} |
+ +{{it.humanTotal}} |
+ {{it.humanTotal}} |
{{it.vendorField}} |
{{it.senderId | accountlabel}} |
{{it.recipientId | accountlabel}} |
@@ -738,20 +738,49 @@ {{ul.selected.delegate.username}}
$qProvider.errorOnUnhandledRejections(false);
}]);
- const {remote} = require('electron');
- const {Menu, MenuItem} = remote;
-
- const menu = new Menu();
- menu.append(new MenuItem({label: 'Select All', accelerator: "CmdOrCtrl+A", selector: 'selectAll:' }));
- menu.append(new MenuItem({label: 'Copy', accelerator: "CmdOrCtrl+C", selector: "copy:" }));
- menu.append(new MenuItem({label: 'Paste', accelerator: "CmdOrCtrl+V", selector: "paste:"}));
-
-
-
- window.addEventListener('contextmenu', (e) => {
- e.preventDefault();
- menu.popup(remote.getCurrentWindow());
- }, false);
+ const electron = require('electron');
+ const remote = electron.remote;
+ const Menu = remote.Menu;
+
+ const InputMenu = Menu.buildFromTemplate([{
+ label: 'Undo',
+ role: 'undo',
+ }, {
+ label: 'Redo',
+ role: 'redo',
+ }, {
+ type: 'separator',
+ }, {
+ label: 'Cut',
+ role: 'cut',
+ }, {
+ label: 'Copy',
+ role: 'copy',
+ }, {
+ label: 'Paste',
+ role: 'paste',
+ }, {
+ type: 'separator',
+ }, {
+ label: 'Select all',
+ role: 'selectall',
+ },
+ ]);
+
+ document.body.addEventListener('contextmenu', (e) => {
+ e.preventDefault();
+ e.stopPropagation();
+
+ let node = e.target;
+
+ while (node) {
+ if (node.nodeName.match(/^(input|textarea)$/i) || node.isContentEditable) {
+ InputMenu.popup(remote.getCurrentWindow());
+ break;
+ }
+ node = node.parentNode;
+ }
+ });
diff --git a/client/app/src/accounts/AccountController.js b/client/app/src/accounts/AccountController.js
index 49bf83ad1b..f018f3c262 100644
--- a/client/app/src/accounts/AccountController.js
+++ b/client/app/src/accounts/AccountController.js
@@ -794,7 +794,7 @@
$mdDialog.show({
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/addDelegate.html',
- clickOutsideToClose: true,
+ clickOutsideToClose: false,
preserveScope: true,
scope: $scope
});
@@ -849,7 +849,7 @@
$mdDialog.show({
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/vote.html',
- clickOutsideToClose: true,
+ clickOutsideToClose: false,
preserveScope: true,
scope: $scope
});
@@ -949,7 +949,7 @@
$mdDialog.show({
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/manageNetwork.html',
- clickOutsideToClose: true,
+ clickOutsideToClose: false,
preserveScope: true,
scope: $scope,
fullscreen: true
@@ -989,7 +989,7 @@
$mdDialog.show({
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/savePassphrases.html',
- clickOutsideToClose: true,
+ clickOutsideToClose: false,
preserveScope: true,
scope: $scope
});
@@ -1002,10 +1002,18 @@
function next() {
$mdDialog.hide();
+
+ var delegateName;
+ try {
+ delegateName = accountService.sanitizeDelegateName($scope.createDelegate.data.username)
+ } catch (error) {
+ return formatAndToastError(error)
+ }
+
accountService.createTransaction(2,
{
fromAddress: $scope.createDelegate.data.fromAddress,
- username: $scope.createDelegate.data.username,
+ username: delegateName,
masterpassphrase: $scope.createDelegate.data.passphrase,
secondpassphrase: $scope.createDelegate.data.secondpassphrase
}
@@ -1030,7 +1038,7 @@
$mdDialog.show({
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/createDelegate.html',
- clickOutsideToClose: true,
+ clickOutsideToClose: false,
preserveScope: true,
scope: $scope
});
@@ -1087,7 +1095,7 @@
$mdDialog.show({
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/createAccount.html',
- clickOutsideToClose: true,
+ clickOutsideToClose: false,
preserveScope: true,
scope: $scope
});
@@ -1104,10 +1112,22 @@
accountService.createAccount($scope.send.data.passphrase)
.then(
function(account){
+ // Check for already imported account
+ for (var i = 0; i < self.accounts.length; i++) {
+ if (self.accounts[i].publicKey === account.publicKey) {
+ $mdToast.show(
+ $mdToast.simple()
+ .textContent(gettextCatalog.getString('Account was already imported: ') + account.address)
+ .hideDelay(5000)
+ );
+ return selectAccount(account);
+ }
+ }
+
self.accounts.push(account);
$mdToast.show(
$mdToast.simple()
- .textContent(gettextCatalog.getString('Account successfully created: ') + account.address)
+ .textContent(gettextCatalog.getString('Account successfully imported: ') + account.address)
.hideDelay(5000)
);
selectAccount(account);
@@ -1131,7 +1151,7 @@
$mdDialog.show({
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/importAccount.html',
- clickOutsideToClose: true,
+ clickOutsideToClose: false,
preserveScope: true,
scope: $scope
});
@@ -1212,7 +1232,7 @@
$mdBottomSheet.show({
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/contactSheet.html',
- clickOutsideToClose: true,
+ clickOutsideToClose: false,
preserveScope: true,
scope: $scope
});
@@ -1243,7 +1263,9 @@
$scope.validate={
send:send,
cancel:cancel,
- transaction:transaction
+ transaction:transaction,
+ // to avoid small transaction to be displayed as 1e-8
+ humanAmount: accountService.numberToFixed(transaction.amount / 100000000) + '',
};
$mdDialog.show({
@@ -1251,7 +1273,7 @@
preserveScope : true,
parent : angular.element(document.getElementById('app')),
templateUrl : './src/accounts/view/showTransaction.html',
- clickOutsideToClose: true
+ clickOutsideToClose: false
});
};
diff --git a/client/app/src/accounts/AccountService.js b/client/app/src/accounts/AccountService.js
index 095d4f81dc..fe22c5b21f 100755
--- a/client/app/src/accounts/AccountService.js
+++ b/client/app/src/accounts/AccountService.js
@@ -238,6 +238,8 @@
if(transaction.senderId==address){
transaction.total=-transaction.amount-transaction.fee;
}
+ // to avoid small transaction to be displayed as 1e-8
+ transaction.humanTotal = numberToFixed(transaction.total / 100000000) + ''
}
storageService.set("transactions-"+address,resp.transactions);
deferred.resolve(resp.transactions);
@@ -559,6 +561,47 @@
return virtual;
}
+ var allowedDelegateNameChars = /^[a-z0-9!@$&_.]+$/g;
+ function sanitizeDelegateName(delegateName){
+ if (!delegateName) {
+ throw new Error('Delegate name is undefined');
+ }
+ if (delegateName !== delegateName.toLowerCase()) {
+ throw new Error('Delegate name must be lowercase');
+ }
+
+ var sanitizedName = String(delegateName).toLowerCase().trim();
+ if (sanitizedName === '') {
+ throw new Error('Empty delegate name');
+ }
+ if (sanitizedName.length > 20) {
+ throw new Error('Delegate name is too long, 20 characters maximum');
+ }
+ if (!allowedDelegateNameChars.test(sanitizedName)) {
+ throw new Error('Delegate name can only contain alphanumeric characters with the exception of !@$&_.');
+ }
+
+ return sanitizedName;
+ }
+
+ function numberToFixed(x) {
+ if (Math.abs(x) < 1.0) {
+ var e = parseInt(x.toString().split('e-')[1]);
+ if (e) {
+ x *= Math.pow(10,e-1);
+ x = '0.' + (new Array(e)).join('0') + x.toString().substring(2);
+ }
+ } else {
+ var e = parseInt(x.toString().split('+')[1]);
+ if (e > 20) {
+ e -= 20;
+ x /= Math.pow(10,e);
+ x += (new Array(e+1)).join('0');
+ }
+ }
+ return x;
+ }
+
return {
loadAllAccounts : function() {
@@ -636,7 +679,11 @@
setToFolder: setToFolder,
- deleteFolder: deleteFolder
+ deleteFolder: deleteFolder,
+
+ sanitizeDelegateName: sanitizeDelegateName,
+
+ numberToFixed: numberToFixed,
}
}
diff --git a/client/app/src/accounts/view/createDelegate.html b/client/app/src/accounts/view/createDelegate.html
index 0cde120e0d..c4dd66a665 100644
--- a/client/app/src/accounts/view/createDelegate.html
+++ b/client/app/src/accounts/view/createDelegate.html
@@ -2,7 +2,7 @@