Auction Open On
-{{objENS.allowedTime.toLocaleString()}}
+{{objENS.allowedTime.toString()}}
Auction Opens In
{{objENS.timeRemaining}}
Auction Closes On
-{{objENS.registrationDate.toLocaleString()}}
+{{objENS.registrationDate.toString()}}
{{objENS.timeRemaining}}
" + resp.data + "
" + bExStr + "
" + emailLink + "
"; $scope.notifier.success($scope.sendTxStatus); diff --git a/app/scripts/controllers/sendTxCtrl.js b/app/scripts/controllers/sendTxCtrl.js index df89594529..302dfbef3b 100644 --- a/app/scripts/controllers/sendTxCtrl.js +++ b/app/scripts/controllers/sendTxCtrl.js @@ -172,8 +172,8 @@ var sendTxCtrl = function($scope, $sce, walletService) { $scope.tx.donate = true; } $scope.generateTx = function() { - //if (!$scope.Validator.isValidAddress($scope.tx.to)) { - if (!ethFuncs.validateEtherAddress($scope.tx.to)) { + if (!$scope.Validator.isValidAddress($scope.tx.to)) { + //if (!ethFuncs.validateEtherAddress($scope.tx.to)) { $scope.notifier.danger(globalFuncs.errorMsgs[5]); return; } diff --git a/app/scripts/directives/addressFieldDrtv.js b/app/scripts/directives/addressFieldDrtv.js index 2984564c50..fa58009e0d 100644 --- a/app/scripts/directives/addressFieldDrtv.js +++ b/app/scripts/directives/addressFieldDrtv.js @@ -30,44 +30,38 @@ var addressFieldDrtv = function($compile) { \n \↳ {{addressDrtv.derivedAddress}}
\n \ -*/ diff --git a/app/scripts/validator.js b/app/scripts/validator.js index 6801ac1fea..8aee9d9f01 100644 --- a/app/scripts/validator.js +++ b/app/scripts/validator.js @@ -1,11 +1,13 @@ 'use strict'; var validator = function() {} + validator.isValidAddress = function(address) { if (address && address == "0x0000000000000000000000000000000000000000") return false; if (address) return ethFuncs.validateEtherAddress(address); return false; } + validator.isValidENSorEtherAddress = function(address) { return (validator.isValidAddress(address) || validator.isValidENSAddress(address)); } diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html index bcc2277e51..d2daaf0a12 100644 --- a/chrome-extension/cx-wallet.html +++ b/chrome-extension/cx-wallet.html @@ -43,7 +43,7 @@
+-
More Information
@@ -2088,11 +2087,12 @@
+
Due to an overwhelming number of support requests regarding the ENS, we will NOT providing support to those who are attempting to start a name business (aka "domain squatting") via our free, open source service. If you are bidding on hundreds of names, brand names, or the entire human-readable dictionary, do not expect a response. If you are a typical user who wants few cool names, you're safe.
- @@ -2113,11 +2113,11 @@
-
+
Auction Open On
- {{objENS.allowedTime.toLocaleString()}}
+ {{objENS.allowedTime.toString()}}
-
+
Auction Opens In
{{objENS.timeRemaining}}
@@ -2142,12 +2142,12 @@
Reveal Bids On
- {{getRevealTime().toLocaleString()}}
+ {{getRevealTime().toString()}}
{{objENS.timeRemainingReveal}}
Auction Closes On
- {{objENS.registrationDate.toLocaleString()}}
+ {{objENS.registrationDate.toString()}}
{{objENS.timeRemaining}}
@@ -2164,7 +2164,7 @@ It's time to reveal the bids for {{objENS.name}}.eth.
Auction Closes On
- {{objENS.registrationDate.toLocaleString()}}
+ {{objENS.registrationDate.toString()}}
{{objENS.timeRemaining}}
@@ -2338,10 +2338,10 @@ If you haven't done so already, please screenshot & save
From Account {{wallet.getAddressString()}}
Auction Open On
-{{objENS.allowedTime.toLocaleString()}}
+{{objENS.allowedTime.toString()}}
Auction Opens In
{{objENS.timeRemaining}}
Reveal Bids On
- {{getRevealTime().toLocaleString()}}
+ {{getRevealTime().toString()}}
{{objENS.timeRemainingReveal}}
Auction Closes On
- {{objENS.registrationDate.toLocaleString()}}
+ {{objENS.registrationDate.toString()}}
{{objENS.timeRemaining}}
@@ -2164,7 +2164,7 @@ It's time to reveal the bids for {{objENS.name}}.eth.
Auction Closes On
- {{objENS.registrationDate.toLocaleString()}}
+ {{objENS.registrationDate.toString()}}
{{objENS.timeRemaining}}
@@ -2338,10 +2338,10 @@ If you haven't done so already, please screenshot & save
From Account {{wallet.getAddressString()}}
Reveal Bids On
-{{getRevealTime().toLocaleString()}}
+{{getRevealTime().toString()}}
{{objENS.timeRemainingReveal}}
Auction Closes On
-{{objENS.registrationDate.toLocaleString()}}
+{{objENS.registrationDate.toString()}}
{{objENS.timeRemaining}}
Auction Closes On
-{{objENS.registrationDate.toLocaleString()}}
+{{objENS.registrationDate.toString()}}
{{objENS.timeRemaining}}