diff --git a/css/src/main.css b/css/src/main.css
index 0916027c2..7099a97cb 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -396,7 +396,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
-.box-notification a.close-notification {
+a.close-notification {
position: absolute;
top: 8px;
right: 10px;
diff --git a/index.html b/index.html
index d496904d6..ae445c855 100644
--- a/index.html
+++ b/index.html
@@ -48,11 +48,9 @@
-
-
- Network Error . Attempting to reconnect..
-
-
+
+
+ ×
Resend
@@ -60,6 +58,19 @@
Please confirm your email address using the confirmation link at the message we sent you
+
+ ×
+
+
+ Confirm your email address .
+ An email was sent to {{$root.iden.getName()}}. Please follow the link on it to confirm it. Unconfirmed profiles could be deleted from server.
+
+
+
+
+
+ Network Error . Attempting to reconnect..
+
diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js
index b3e76404a..3c5614c71 100644
--- a/js/controllers/createProfile.js
+++ b/js/controllers/createProfile.js
@@ -94,6 +94,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
}, 1);
};
+ /* Last step. Will emit after creation so the UX gets updated */
$scope.createDefaultWallet = function() {
$rootScope.hideNavigation = false;
identityService.createDefaultWallet(function(err) {
@@ -102,7 +103,12 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
if (err) {
var msg = err.toString();
$scope.error = msg;
+ } else {
+ if (!$scope.useLocalstorage) {
+ $rootScope.pleaseConfirmEmail = true;
+ }
}
+
});
};
@@ -127,6 +133,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
$scope.createStep = 'email';
}
$scope.error = msg;
+ $scope.passwordStrength = null;
} else {
// mobile
if ($scope.isMobile) {
diff --git a/js/models/Wallet.js b/js/models/Wallet.js
index c18d44f72..933e13e5e 100644
--- a/js/models/Wallet.js
+++ b/js/models/Wallet.js
@@ -1442,7 +1442,8 @@ Wallet.prototype.getPendingTxProposalsCount = function() {
_.each(txps, function(inTxp, ntxid) {
if (!inTxp.isPending(maxRejectCount))
return;
-
+// TODO: are the uxtos availables?
+ //
pending++;
if (!inTxp.signedBy[myId] && !inTxp.rejectedBy[myId])
diff --git a/views/createProfile.html b/views/createProfile.html
index fc6d43d6c..b1aa53e65 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -34,7 +34,7 @@
{{userOrEmail}}
-
+
@@ -202,7 +202,7 @@
-