anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Do not show backupFlag if email not confirmed

Browse source
This commit is contained in:
Matias Pando 2014-12-02 11:23:49 -03:00
commit 1542e0986b
3 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/controllers/import.js
View file

@ -73,7 +73,6 @@ angular.module('copayApp.controllers').controller('ImportController',
$scope.importOpts.skipFields = skipFields; $scope.importOpts.skipFields = skipFields;
<< << << < HEAD
if (backupFile) { if (backupFile) {
reader.readAsBinaryString(backupFile); reader.readAsBinaryString(backupFile);
} else { } 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

4
js/models/Identity.js
View file

@ -576,9 +576,9 @@ Identity.prototype.createWallet = function(opts, cb) {
self.bindWallet(w); self.bindWallet(w);
self.updateFocusedTimestamp(w.getId()); self.updateFocusedTimestamp(w.getId());
self.storeWallet(w, function(err) { 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({ self.store({
noWallets: true, noWallets: true,
}, function(err) { }, function(err) {

6
views/includes/head.html
View file

@ -20,7 +20,7 @@
<div class="photo-container"> <div class="photo-container">
<img gravatar-src="'{{username}}'" gravatar-size="35"> <img gravatar-src="'{{username}}'" gravatar-size="35">
</div> </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> <i class="fi-alert vm"></i>
</span> </span>
<span class="m15t">{{username}} </span> <span class="m15t">{{username}} </span>
@ -36,8 +36,8 @@
<i class="icon-download size-18 m10r"></i> {{'Import wallet'|translate}}</a></li> <i class="icon-download size-18 m10r"></i> {{'Import wallet'|translate}}</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a href="#!/profile" title="Profile"> <li><a href="#!/profile" title="Profile">
<i class="icon-person size-18 m10r"></i> {{'Profile'|translate}}</a></li> <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>
<span class="size-10 text-warning" ng-if="$root.iden.backupNeeded"> [ Needs Backup ]</span> </li>
<li><a href="#!/" title="Close" ng-click="signout()"> <li><a href="#!/" title="Close" ng-click="signout()">
<i class="icon-power size-18 m10r"></i> {{'Close'|translate}}</a></li> <i class="icon-power size-18 m10r"></i> {{'Close'|translate}}</a></li>
</ul> </ul>