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;
<< << << < 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
});