mirror of https://github.com/BTCPrivate/copay.git
add message after profile creation on the cloud
This commit is contained in:
parent
94d6916a75
commit
e56ace7c2c
|
@ -60,6 +60,15 @@
|
||||||
Please confirm your email address using the confirmation link at the message we sent you
|
Please confirm your email address using the confirmation link at the message we sent you
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
|
<span class="status" ng-if="$root.pleaseConfirmEmail">
|
||||||
|
<i class="fi-alert size-36 left m20r"></i>
|
||||||
|
<span translate>
|
||||||
|
<strong class="size-16">Confirm your email address</strong>.<br>
|
||||||
|
An email was just sent to {{$root.iden.getName()}}. Please click the link on it to confirm you own it. Unconfirmed profiles could be deleted from server.
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<a class="close-notification text-warning" ng-click="$root.pleaseConfirmEmail=null">×</a>
|
||||||
|
</span>
|
||||||
|
|
||||||
<div ng-controller="SidebarController" ng-show="$root.iden && !$root.hideNavigation">
|
<div ng-controller="SidebarController" ng-show="$root.iden && !$root.hideNavigation">
|
||||||
<nav class="tab-bar">
|
<nav class="tab-bar">
|
||||||
|
|
|
@ -94,6 +94,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
|
||||||
}, 1);
|
}, 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* Last step. Will emit after creation so the UX gets updated */
|
||||||
$scope.createDefaultWallet = function() {
|
$scope.createDefaultWallet = function() {
|
||||||
$rootScope.hideNavigation = false;
|
$rootScope.hideNavigation = false;
|
||||||
identityService.createDefaultWallet(function(err) {
|
identityService.createDefaultWallet(function(err) {
|
||||||
|
@ -102,7 +103,12 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
|
||||||
if (err) {
|
if (err) {
|
||||||
var msg = err.toString();
|
var msg = err.toString();
|
||||||
$scope.error = msg;
|
$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.createStep = 'email';
|
||||||
}
|
}
|
||||||
$scope.error = msg;
|
$scope.error = msg;
|
||||||
|
$scope.passwordStrength = null;
|
||||||
} else {
|
} else {
|
||||||
// mobile
|
// mobile
|
||||||
if ($scope.isMobile) {
|
if ($scope.isMobile) {
|
||||||
|
|
|
@ -1442,7 +1442,8 @@ Wallet.prototype.getPendingTxProposalsCount = function() {
|
||||||
_.each(txps, function(inTxp, ntxid) {
|
_.each(txps, function(inTxp, ntxid) {
|
||||||
if (!inTxp.isPending(maxRejectCount))
|
if (!inTxp.isPending(maxRejectCount))
|
||||||
return;
|
return;
|
||||||
|
// TODO: are the uxtos availables?
|
||||||
|
//
|
||||||
pending++;
|
pending++;
|
||||||
|
|
||||||
if (!inTxp.signedBy[myId] && !inTxp.rejectedBy[myId])
|
if (!inTxp.signedBy[myId] && !inTxp.rejectedBy[myId])
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
<div class="text-gray text-center m20b">{{userOrEmail}}</div>
|
<div class="text-gray text-center m20b">{{userOrEmail}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="box-notification" ng-show="error">
|
<div class="box-notification" ng-show="error && !passwordStrength">
|
||||||
<div class="box-icon error">
|
<div class="box-icon error">
|
||||||
<i class="fi-x size-24"></i>
|
<i class="fi-x size-24"></i>
|
||||||
</div>
|
</div>
|
||||||
|
@ -202,7 +202,7 @@
|
||||||
<img src="img/clipo-pin.png" alt="clipo" width="380">
|
<img src="img/clipo-pin.png" alt="clipo" width="380">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="box-notification" ng-show="error">
|
<div class="box-notification" ng-show="error && !passwordStrength">
|
||||||
<div class="box-icon error">
|
<div class="box-icon error">
|
||||||
<i class="fi-x size-24"></i>
|
<i class="fi-x size-24"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue