From 3f65288dca6963d7a2d53c194a756e2c5d5a349c Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Thu, 20 Nov 2014 18:13:11 -0300 Subject: [PATCH 1/7] Added the flag backupNeeded --- js/models/Identity.js | 25 +++++++++++++-------- test/Identity.js | 47 ++++++++++++++++++++++++++++++++++++++-- views/includes/head.html | 3 +++ 3 files changed, 64 insertions(+), 11 deletions(-) diff --git a/js/models/Identity.js b/js/models/Identity.js index 8062b3ba9..bb8a4113a 100644 --- a/js/models/Identity.js +++ b/js/models/Identity.js @@ -62,6 +62,8 @@ function Identity(opts) { this.walletIds = opts.walletIds || {}; this.wallets = opts.wallets || {}; this.focusedTimestamps = opts.focusedTimestamps || {}; + this.backupNeeded = opts.backupNeeded || false; + }; @@ -91,7 +93,9 @@ Identity.prototype.getName = function() { * @return {undefined} */ Identity.create = function(opts, cb) { - opts = _.extend({}, opts); + opts = _.extend({ + backupNeeded: true + }, opts); var iden = new Identity(opts); iden.store(_.extend(opts, { @@ -265,11 +269,12 @@ Identity.prototype.toObj = function() { return _.extend({ walletIds: _.isEmpty(this.wallets) ? this.walletsIds : _.keys(this.wallets), }, - _.pick(this, 'version', 'fullName', 'password', 'email', 'focusedTimestamps')); + _.pick(this, 'version', 'fullName', 'password', 'email', 'backupNeeded', 'focusedTimestamps')); }; Identity.prototype.exportEncryptedWithWalletInfo = function(opts) { var crypto = opts.cryptoUtil || cryptoUtil; + this.backupNeeded = false; return crypto.encrypt(this.password, this.exportWithWalletInfo(opts)); }; @@ -279,7 +284,7 @@ Identity.prototype.exportWithWalletInfo = function(opts) { return wallet.toObj(); }) }, - _.pick(this, 'version', 'fullName', 'password', 'email') + _.pick(this, 'version', 'fullName', 'password', 'email', 'backupNeeded') ); }; @@ -288,10 +293,9 @@ Identity.prototype.exportWithWalletInfo = function(opts) { * @param {Function} cb */ Identity.prototype.store = function(opts, cb) { - log.debug('Storing profile'); - var self = this; opts = opts || {}; + opts.backupNeeded = false; var storeFunction = opts.failIfExists ? self.storage.createItem : self.storage.setItem; @@ -323,9 +327,9 @@ Identity.prototype.remove = function(opts, cb) { if (err) return cb(err); cb(); }); - }, function (err) { + }, function(err) { if (err) return cb(err); - + self.storage.removeItem(self.getId(), function(err) { if (err) return cb(err); self.emitAndKeepAlive('closed'); @@ -552,13 +556,16 @@ Identity.prototype.createWallet = function(opts, cb) { var self = this; + var w = new walletClass(opts); self.bindWallet(w); self.updateFocusedTimestamp(w.getId()); self.storeWallet(w, function(err) { - if (err) return cb(err); + if (err) return cb(err); << << << < HEAD === === = + + self.backupNeeded = true; >>> >>> > Added the flag backupNeeded self.store({ - noWallets: true + noWallets: true, }, function(err) { return cb(err, w); }); diff --git a/test/Identity.js b/test/Identity.js index f46c72f0e..bf1da2b1f 100644 --- a/test/Identity.js +++ b/test/Identity.js @@ -111,7 +111,14 @@ describe('Identity model', function() { params: params }; }; - + var orig; + beforeEach(function() { + orig = Identity.prototype.store; + sinon.stub(Identity.prototype, 'store').yields(null); + }); + afterEach(function() { + Identity.prototype.store = orig; + }); describe('new Identity()', function() { it('returns an identity', function() { var iden = new Identity(getDefaultParams()); @@ -124,7 +131,6 @@ describe('Identity model', function() { it('should create and store identity', function() { var args = createIdentity(); args.blockchain.on = sinon.stub(); - sinon.stub(Identity.prototype, 'store').yields(null); Identity.create(args.params, function(err, iden) { should.not.exist(err); should.exist(iden); @@ -492,4 +498,41 @@ describe('Identity model', function() { }); }); }); + + describe('Identity backupNeeded', function() { + + it('should create Profile with backupNeeded set to true', function(done) { + var args = createIdentity(); + Identity.create(args.params, function(err, iden) { + should.not.exist(err); + iden.backupNeeded.should.be.true; + done(); + }); + }); + + it('making a backup should set backupNeeded set to false', function(done) { + var args = createIdentity(); + Identity.create(args.params, function(err, iden) { + should.not.exist(err); + iden.exportEncryptedWithWalletInfo(iden.password) + iden.backupNeeded.should.be.false; + done(); + }); + }); + + it('adding a wallet should set backupNeeded to true', function(done) { + var args = createIdentity(); + Identity.create(args.params, function(err, iden) { + should.not.exist(err); + iden.exportEncryptedWithWalletInfo(iden.password); + iden.createWallet({ + walletClass: walletClass, + }, function(err, w2) { + iden.backupNeeded.should.be.true; + done(); + }); + }); + }); + + }); }); diff --git a/views/includes/head.html b/views/includes/head.html index 87bf9307f..5a2197576 100644 --- a/views/includes/head.html +++ b/views/includes/head.html @@ -5,6 +5,9 @@ + + BACKUP! + From d0c5e168650a4d281bb5c50e87b8c4a569779c1d Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Tue, 25 Nov 2014 11:59:05 -0300 Subject: [PATCH 2/7] Added Tes --- test/Identity.js | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/test/Identity.js b/test/Identity.js index bf1da2b1f..46653b258 100644 --- a/test/Identity.js +++ b/test/Identity.js @@ -499,7 +499,7 @@ describe('Identity model', function() { }); }); - describe('Identity backupNeeded', function() { + describe.only('Identity backupNeeded', function() { it('should create Profile with backupNeeded set to true', function(done) { var args = createIdentity(); @@ -534,5 +534,43 @@ describe('Identity model', function() { }); }); + it('joining a wallet should set backupNeeded to true', function(done) { + var args = createIdentity(); + var net = null; + var opts = { + secret: '8WtTuiFTkhP5ao7AF2QErSwV39Cbur6pdMebKzQXFqL59RscXM', + nickname: 'test', + password: 'pass' + }; + args.params.Async = net = sinon.stub(); + net = sinon.stub(); + net.on = sinon.stub(); + net.start = sinon.stub(); + net.start.onFirstCall().callsArg(1); + net.greet = sinon.stub(); + + Identity.create(args.params, function(err, iden) { + iden.createWallet = sinon.stub(); + should.not.exist(err); + iden.exportEncryptedWithWalletInfo(iden.password); + + var fakeWallet = { + sendWalletReady: _.noop + }; + iden.createWallet.onFirstCall().yields(null, fakeWallet); + opts.privHex = 'tprv8ZgxMBicQKsPf7MCvCjnhnr4uiR2Z2gyNC27vgd9KUu98F9mM1tbaRrWMyddVju36GxLbeyntuSadBAttriwGGMWUkRgVmUUCg5nFioGZsd'; + opts.Async = net; + iden.joinWallet(opts, function(err, w) { + console.log('err', err); + console.log('w', w); + + console.log('join Wallet'); + iden.backupNeeded.should.be.true; + done(); + }); + + }); + }); + }); }); From 52fb68065874425d7182ae13d1197a47e5f0eb6e Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Wed, 26 Nov 2014 12:08:26 -0300 Subject: [PATCH 3/7] Storing the backup flag --- js/controllers/profile.js | 20 ++++---- js/models/Identity.js | 14 ++++-- js/services/backupService.js | 1 + js/services/identityService.js | 19 ++++---- test/Identity.js | 75 ------------------------------ test/unit/services/servicesSpec.js | 3 +- 6 files changed, 34 insertions(+), 98 deletions(-) diff --git a/js/controllers/profile.js b/js/controllers/profile.js index 95c7003fb..b13a2565d 100644 --- a/js/controllers/profile.js +++ b/js/controllers/profile.js @@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('ProfileController', function( $scope.backupProfilePlainText = backupService.profileEncrypted($rootScope.iden); $scope.hideViewProfileBackup = true; }; - + $scope.deleteWallet = function(w) { if (!w) return; identityService.deleteWallet(w, function(err) { @@ -28,8 +28,8 @@ angular.module('copayApp.controllers').controller('ProfileController', function( $scope.init = function() { if ($rootScope.quotaPerItem) { - $scope.perItem = $filter('noFractionNumber')($rootScope.quotaPerItem/1000,1); - $scope.nrWallets =parseInt($rootScope.quotaItems) - 1; + $scope.perItem = $filter('noFractionNumber')($rootScope.quotaPerItem / 1000, 1); + $scope.nrWallets = parseInt($rootScope.quotaItems) - 1; } }; @@ -37,13 +37,13 @@ angular.module('copayApp.controllers').controller('ProfileController', function( if (!$rootScope.iden) return; var wallets = $rootScope.iden.listWallets(); - var max =$rootScope.quotaPerItem; + var max = $rootScope.quotaPerItem; _.each(wallets, function(w) { var bits = w.sizes().total; - w.kb = $filter('noFractionNumber')(bits/1000, 1); + w.kb = $filter('noFractionNumber')(bits / 1000, 1); if (max) { - w.usage = $filter('noFractionNumber')(bits/max * 100, 0); + w.usage = $filter('noFractionNumber')(bits / max * 100, 0); } }); @@ -73,15 +73,15 @@ angular.module('copayApp.controllers').controller('ProfileController', function( }); }; - $scope.deleteProfile = function () { - identityService.deleteProfile(function (err, res) { + $scope.deleteProfile = function() { + identityService.deleteProfile(function(err, res) { if (err) { log.warn(err); notification.error('Error', 'Could not delete profile'); return; } - $location.path('/'); - setTimeout(function () { + $location.path('/'); + setTimeout(function() { notification.error('Success', 'Profile successfully deleted'); }, 1); }); diff --git a/js/models/Identity.js b/js/models/Identity.js index bb8a4113a..8258d5d86 100644 --- a/js/models/Identity.js +++ b/js/models/Identity.js @@ -274,10 +274,17 @@ Identity.prototype.toObj = function() { Identity.prototype.exportEncryptedWithWalletInfo = function(opts) { var crypto = opts.cryptoUtil || cryptoUtil; - this.backupNeeded = false; + return crypto.encrypt(this.password, this.exportWithWalletInfo(opts)); }; +Identity.prototype.setBackupDone = function() { + this.backupNeeded = false; + this.store({ + noWallets: true + }, function() {}); +} + Identity.prototype.exportWithWalletInfo = function(opts) { return _.extend({ wallets: _.map(this.wallets, function(wallet) { @@ -295,12 +302,13 @@ Identity.prototype.exportWithWalletInfo = function(opts) { Identity.prototype.store = function(opts, cb) { var self = this; opts = opts || {}; - opts.backupNeeded = false; var storeFunction = opts.failIfExists ? self.storage.createItem : self.storage.setItem; storeFunction.call(self.storage, this.getId(), this.toObj(), function(err) { - if (err) return cb(err); + if (err) { + return cb(err); + } if (opts.noWallets) return cb(); diff --git a/js/services/backupService.js b/js/services/backupService.js index 775b25be3..1fb190371 100644 --- a/js/services/backupService.js +++ b/js/services/backupService.js @@ -38,6 +38,7 @@ BackupService.prototype.profileEncrypted = function(iden) { BackupService.prototype.profileDownload = function(iden) { var ew = this.profileEncrypted(iden); + iden.setBackupDone(); var name = iden.fullName; var filename = name + '-profile.json'; this._download(ew, name, filename) diff --git a/js/services/identityService.js b/js/services/identityService.js index 8a97fd046..53cf4331f 100644 --- a/js/services/identityService.js +++ b/js/services/identityService.js @@ -48,6 +48,7 @@ angular.module('copayApp.services') passphraseConfig: config.passphraseConfig, failIfExists: true, }, function(err, iden) { + if (err) return cb(err); preconditions.checkState(iden); root.bind(iden); @@ -68,19 +69,19 @@ angular.module('copayApp.services') }; root.setServerStatus = function(headers) { - if (!headers) + if (!headers) return; - if (headers['X-Email-Needs-Validation']) - $rootScope.needsEmailConfirmation = true; + if (headers['X-Email-Needs-Validation']) + $rootScope.needsEmailConfirmation = true; else - $rootScope.needsEmailConfirmation = null; + $rootScope.needsEmailConfirmation = null; - if (headers['X-Quota-Per-Item']) - $rootScope.quotaPerItem = parseInt(headers['X-Quota-Per-Item']); + if (headers['X-Quota-Per-Item']) + $rootScope.quotaPerItem = parseInt(headers['X-Quota-Per-Item']); - if (headers['X-Quota-Items-Limit']) - $rootScope.quotaItems = parseInt(headers['X-Quota-Items-Limit']); + if (headers['X-Quota-Items-Limit']) + $rootScope.quotaItems = parseInt(headers['X-Quota-Items-Limit']); }; root.open = function(email, password, cb) { @@ -102,7 +103,7 @@ angular.module('copayApp.services') }); }; - root.deleteProfile = function (cb) { + root.deleteProfile = function(cb) { $rootScope.iden.remove(null, cb); }; diff --git a/test/Identity.js b/test/Identity.js index 46653b258..a22b08df7 100644 --- a/test/Identity.js +++ b/test/Identity.js @@ -498,79 +498,4 @@ describe('Identity model', function() { }); }); }); - - describe.only('Identity backupNeeded', function() { - - it('should create Profile with backupNeeded set to true', function(done) { - var args = createIdentity(); - Identity.create(args.params, function(err, iden) { - should.not.exist(err); - iden.backupNeeded.should.be.true; - done(); - }); - }); - - it('making a backup should set backupNeeded set to false', function(done) { - var args = createIdentity(); - Identity.create(args.params, function(err, iden) { - should.not.exist(err); - iden.exportEncryptedWithWalletInfo(iden.password) - iden.backupNeeded.should.be.false; - done(); - }); - }); - - it('adding a wallet should set backupNeeded to true', function(done) { - var args = createIdentity(); - Identity.create(args.params, function(err, iden) { - should.not.exist(err); - iden.exportEncryptedWithWalletInfo(iden.password); - iden.createWallet({ - walletClass: walletClass, - }, function(err, w2) { - iden.backupNeeded.should.be.true; - done(); - }); - }); - }); - - it('joining a wallet should set backupNeeded to true', function(done) { - var args = createIdentity(); - var net = null; - var opts = { - secret: '8WtTuiFTkhP5ao7AF2QErSwV39Cbur6pdMebKzQXFqL59RscXM', - nickname: 'test', - password: 'pass' - }; - args.params.Async = net = sinon.stub(); - net = sinon.stub(); - net.on = sinon.stub(); - net.start = sinon.stub(); - net.start.onFirstCall().callsArg(1); - net.greet = sinon.stub(); - - Identity.create(args.params, function(err, iden) { - iden.createWallet = sinon.stub(); - should.not.exist(err); - iden.exportEncryptedWithWalletInfo(iden.password); - - var fakeWallet = { - sendWalletReady: _.noop - }; - iden.createWallet.onFirstCall().yields(null, fakeWallet); - opts.privHex = 'tprv8ZgxMBicQKsPf7MCvCjnhnr4uiR2Z2gyNC27vgd9KUu98F9mM1tbaRrWMyddVju36GxLbeyntuSadBAttriwGGMWUkRgVmUUCg5nFioGZsd'; - opts.Async = net; - iden.joinWallet(opts, function(err, w) { - console.log('err', err); - console.log('w', w); - - console.log('join Wallet'); - iden.backupNeeded.should.be.true; - done(); - }); - - }); - }); - - }); }); diff --git a/test/unit/services/servicesSpec.js b/test/unit/services/servicesSpec.js index 3abe1efaf..f468f5917 100644 --- a/test/unit/services/servicesSpec.js +++ b/test/unit/services/servicesSpec.js @@ -76,6 +76,7 @@ describe("Angular services", function() { a[Waddr] = 200; w.getBalance = sinon.stub().yields(null, 100000001, a, 90000002, 5); + //retuns values in DEFAULT UNIT(bits) balanceService.update(w, function() { var b = w.balanceInfo; @@ -90,7 +91,7 @@ describe("Angular services", function() { expect(b.balanceByAddr[Waddr]).to.equal(2); expect(b.safeUnspentCount).to.equal(5); expect(b.topAmount).to.equal(899800.02); - },false); + }, false); })); }); From 36822dce49611f9fc85d5c8c4138928613851e7d Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Wed, 26 Nov 2014 17:16:46 -0300 Subject: [PATCH 4/7] Added needBackup flag when importing a wallet --- js/controllers/import.js | 130 +++++++++++++++++++++------------------ js/models/Identity.js | 7 +++ 2 files changed, 77 insertions(+), 60 deletions(-) diff --git a/js/controllers/import.js b/js/controllers/import.js index 895bc5790..19ed84abf 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -18,71 +18,81 @@ angular.module('copayApp.controllers').controller('ImportController', $scope.$digest(); } - $scope.getFile = function() { - // If we use onloadend, we need to check the readyState. - reader.onloadend = function(evt) { - if (evt.target.readyState == FileReader.DONE) { // DONE == 2 - var encryptedObj = evt.target.result; + + $scope.getFile = function() { + // If we use onloadend, we need to check the readyState. + reader.onloadend = function(evt) { + if (evt.target.readyState == FileReader.DONE) { // DONE == 2 + var encryptedObj = evt.target.result; + updateStatus('Importing wallet - Procesing backup...'); + identityService.importWallet(encryptedObj, $scope.password, {}, function(err) { + if (err) { + $scope.loading = false; + $scope.error = 'Could not read wallet. Please check your password'; + } + }); + } + } + }; + + $scope.import = function(form) { + $scope.loading = true; + + if (form.$invalid) { + $scope.loading = false; + $scope.error = 'There is an error in the form'; + return; + } + + var backupFile = $scope.file; + var backupText = form.backupText.$modelValue; + var backupOldWallet = form.backupOldWallet.$modelValue; + var password = form.password.$modelValue; + + if (backupOldWallet) { + backupText = backupOldWallet.value; + } + + if (!backupFile && !backupText) { + $scope.loading = false; + $scope.error = 'Please, select your backup file'; + return; + } + + $scope.importOpts = {}; + + var skipFields = []; + + if ($scope.skipPublicKeyRing) + skipFields.push('publicKeyRing'); + + if ($scope.skipTxProposals) + skipFields.push('txProposals'); + + if (skipFields) + $scope.importOpts.skipFields = skipFields; + + + << << << < HEAD + if (backupFile) { + reader.readAsBinaryString(backupFile); + } else { updateStatus('Importing wallet - Procesing backup...'); - identityService.importWallet(encryptedObj, $scope.password, {}, function(err){ + identityService.importWallet(encryptedObj, $scope.password, $scope.importOpts, function(err) { if (err) { $scope.loading = false; $scope.error = 'Could not read wallet. Please check your password'; } + copay.Compatibility.deleteOldWallet(backupOldWallet); }); } }; - }; - - $scope.import = function(form) { - $scope.loading = true; - - if (form.$invalid) { - $scope.loading = false; - $scope.error = 'There is an error in the form'; - return; - } - - var backupFile = $scope.file; - var backupText = form.backupText.$modelValue; - var backupOldWallet = form.backupOldWallet.$modelValue; - var password = form.password.$modelValue; - - if (backupOldWallet) { - backupText = backupOldWallet.value; - } - - if (!backupFile && !backupText) { - $scope.loading = false; - $scope.error = 'Please, select your backup file'; - return; - } - - $scope.importOpts = {}; - - var skipFields = []; - - if ($scope.skipPublicKeyRing) - skipFields.push('publicKeyRing'); - - if ($scope.skipTxProposals) - skipFields.push('txProposals'); - - if (skipFields) - $scope.importOpts.skipFields = skipFields; - - - if (backupFile) { - reader.readAsBinaryString(backupFile); - } else { - updateStatus('Importing wallet - Procesing backup...'); - identityService.importWallet(encryptedObj, $scope.password, $scope.importOpts, function(err){ - if (err) { - $scope.loading = false; - $scope.error = 'Could not read wallet. Please check your password'; - } - copay.Compatibility.deleteOldWallet(backupOldWallet); - }); - } - }; -}); + }); === === = +if (backupFile) { + reader.readAsBinaryString(backupFile); +} else { + $scope._doImport(backupText, $scope.password); + copay.Compatibility.deleteOldWallet(backupOldWallet); +} +}; +}); >>> >>> > Added needBackup flag when importing a wallet diff --git a/js/models/Identity.js b/js/models/Identity.js index 8258d5d86..1f3c28fba 100644 --- a/js/models/Identity.js +++ b/js/models/Identity.js @@ -278,6 +278,13 @@ Identity.prototype.exportEncryptedWithWalletInfo = function(opts) { return crypto.encrypt(this.password, this.exportWithWalletInfo(opts)); }; +Identity.prototype.setBackupNeeded = function() { + this.backupNeeded = true; + this.store({ + noWallets: true + }, function() {}); +} + Identity.prototype.setBackupDone = function() { this.backupNeeded = false; this.store({ From 198a39beffc2046fcab779457e81508f443fcef4 Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Thu, 27 Nov 2014 18:33:06 -0300 Subject: [PATCH 5/7] Test fixed --- test/Identity.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/Identity.js b/test/Identity.js index a22b08df7..f39d3db42 100644 --- a/test/Identity.js +++ b/test/Identity.js @@ -246,7 +246,6 @@ describe('Identity model', function() { args = createIdentity(); args.params.noWallets = true; var old = Identity.prototype.createWallet; - sinon.stub(Identity.prototype, 'store').yields(null); Identity.create(args.params, function(err, res) { iden = res; }); @@ -303,7 +302,6 @@ describe('Identity model', function() { args.storage.getItem.onFirstCall().callsArgWith(1, null, '{"wallet": "fakeData"}'); var backup = Wallet.fromUntrustedObj; args.params.noWallets = true; - sinon.stub(Identity.prototype, 'store').yields(null); sinon.stub().returns(args.wallet); var opts = { @@ -396,8 +394,6 @@ describe('Identity model', function() { beforeEach(function() { args = createIdentity(); args.params.Async = net = sinon.stub(); - - sinon.stub(Identity.prototype, 'store').yields(null); net.cleanUp = sinon.spy(); net.on = sinon.stub(); net.start = sinon.spy(); From ee89917bcbb255e4ed1225580ecc87afb5527dac Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 21 Nov 2014 12:00:24 -0300 Subject: [PATCH 6/7] add style on flag --- css/src/main.css | 15 +++++++++++++++ views/includes/head.html | 9 +++++---- views/profile.html | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 71ccd1ed8..bddec8dd0 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -1244,6 +1244,21 @@ label.postfix, span.postfix { height: 80px; } +.need-backup { + background: #C0392A; + -moz-box-shadow: 1px 1px 0px 0px #A02F23; + box-shadow: 1px 1px 0px 0px #A02F23; + position: absolute; + top: 22px; + left: 0px; + width: 14px; + height: 14px; + border-radius: 100%; + font-size: 9px; + padding-top: 2px; + color: #fff; +} + a:hover .photo-container { background: #34495E; color: #fff; diff --git a/views/includes/head.html b/views/includes/head.html index 5a2197576..fe74d52c1 100644 --- a/views/includes/head.html +++ b/views/includes/head.html @@ -5,9 +5,6 @@ - - BACKUP! - @@ -19,10 +16,13 @@
- +
+ + + {{username}} @@ -37,6 +37,7 @@
  • {{'Profile'|translate}}
    • + [ Needs Backup ]
  • {{'Close'|translate}}
    • diff --git a/views/profile.html b/views/profile.html index 998f7ff74..5309927df 100644 --- a/views/profile.html +++ b/views/profile.html @@ -15,7 +15,7 @@
    -

    Backup Profile

    +

    Profile [ Needs Backup ]

    It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets

    From 1542e0986b22a1ecd50f4ac370e9b6314122cf72 Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Tue, 2 Dec 2014 11:23:49 -0300 Subject: [PATCH 7/7] Do not show backupFlag if email not confirmed --- js/controllers/import.js | 11 +---------- js/models/Identity.js | 4 ++-- views/includes/head.html | 6 +++--- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/js/controllers/import.js b/js/controllers/import.js index 19ed84abf..6ee3bf798 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -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 + }); diff --git a/js/models/Identity.js b/js/models/Identity.js index 1f3c28fba..53984fbdf 100644 --- a/js/models/Identity.js +++ b/js/models/Identity.js @@ -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) { diff --git a/views/includes/head.html b/views/includes/head.html index fe74d52c1..68736f757 100644 --- a/views/includes/head.html +++ b/views/includes/head.html @@ -20,7 +20,7 @@
    - + {{username}} @@ -36,8 +36,8 @@ {{'Import wallet'|translate}}
  • - {{'Profile'|translate}}
    • - [ Needs Backup ] + {{'Profile'|translate}} [ Needs Backup ] +
  • {{'Close'|translate}}