mirror of https://github.com/BTCPrivate/copay.git
Do not show backupFlag if email not confirmed
This commit is contained in:
parent
ee89917bcb
commit
1542e0986b
|
@ -73,7 +73,6 @@ angular.module('copayApp.controllers').controller('ImportController',
|
|||
$scope.importOpts.skipFields = skipFields;
|
||||
|
||||
|
||||
<< << << < HEAD
|
||||
if (backupFile) {
|
||||
reader.readAsBinaryString(backupFile);
|
||||
} else {
|
||||
|
@ -87,12 +86,4 @@ angular.module('copayApp.controllers').controller('ImportController',
|
|||
});
|
||||
}
|
||||
};
|
||||
}); === === =
|
||||
if (backupFile) {
|
||||
reader.readAsBinaryString(backupFile);
|
||||
} else {
|
||||
$scope._doImport(backupText, $scope.password);
|
||||
copay.Compatibility.deleteOldWallet(backupOldWallet);
|
||||
}
|
||||
};
|
||||
}); >>> >>> > Added needBackup flag when importing a wallet
|
||||
});
|
||||
|
|
|
@ -576,9 +576,9 @@ Identity.prototype.createWallet = function(opts, cb) {
|
|||
self.bindWallet(w);
|
||||
self.updateFocusedTimestamp(w.getId());
|
||||
self.storeWallet(w, function(err) {
|
||||
if (err) return cb(err); << << << < HEAD === === =
|
||||
if (err) return cb(err);
|
||||
|
||||
self.backupNeeded = true; >>> >>> > Added the flag backupNeeded
|
||||
self.backupNeeded = true;
|
||||
self.store({
|
||||
noWallets: true,
|
||||
}, function(err) {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<div class="photo-container">
|
||||
<img gravatar-src="'{{username}}'" gravatar-size="35">
|
||||
</div>
|
||||
<span class="need-backup" ng-if="$root.iden.backupNeeded">
|
||||
<span class="need-backup" ng-if="!$root.needsEmailConfirmation && $root.iden.backupNeeded">
|
||||
<i class="fi-alert vm"></i>
|
||||
</span>
|
||||
<span class="m15t">{{username}} </span>
|
||||
|
@ -36,8 +36,8 @@
|
|||
<i class="icon-download size-18 m10r"></i> {{'Import wallet'|translate}}</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#!/profile" title="Profile">
|
||||
<i class="icon-person size-18 m10r"></i> {{'Profile'|translate}}</a></li>
|
||||
<span class="size-10 text-warning" ng-if="$root.iden.backupNeeded"> [ Needs Backup ]</span>
|
||||
<i class="icon-person size-18 m10r"></i> {{'Profile'|translate}}<span class="size-10 text-warning" ng-if="!$root.needsEmailConfirmation && $root.iden.backupNeeded"> [ Needs Backup ]</span></a>
|
||||
</li>
|
||||
<li><a href="#!/" title="Close" ng-click="signout()">
|
||||
<i class="icon-power size-18 m10r"></i> {{'Close'|translate}}</a></li>
|
||||
</ul>
|
||||
|
|
Loading…
Reference in New Issue