Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Commit

Permalink
Merge pull request #2187 from EthersocialNetwork/misc-fixes
Browse files Browse the repository at this point in the history
misc fixes
  • Loading branch information
gamalielhere authored Dec 21, 2018
2 parents 75f020c + 21f142f commit 56be995
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/scripts/controllers/bulkGenCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var bulkGenCtrl = function($scope) {
$scope.wallets.push(tWallet);
}
$scope.showWallets = true;
$scope.bJSON = globalFuncs.getBlob("text/json;charset=UTF-8",JSON.stringify($scope.jsonWallets));
$scope.bJSON = globalFuncs.getBlob("application/json;charset=UTF-8",JSON.stringify($scope.jsonWallets));
$scope.bTXT = globalFuncs.getBlob("text/plain;charset=UTF-8",txt);
$scope.bCSV = globalFuncs.getBlob("text/csv;charset=UTF-8",csv);
}
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/viewWalletCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ var viewWalletCtrl = function($scope, walletService) {
$scope.wallet = walletService.wallet;
$scope.wd = true;
$scope.showEnc = walletService.password != '';
if (walletService.wallet.type == "default") $scope.blob = globalFuncs.getBlob("text/json;charset=UTF-8", $scope.wallet.toJSON());
if (walletService.wallet.type == "default") $scope.blob = globalFuncs.getBlob("application/json;charset=UTF-8", $scope.wallet.toJSON());
if (walletService.password != '') {
$scope.blobEnc = globalFuncs.getBlob("text/json;charset=UTF-8", $scope.wallet.toV3(walletService.password, {
$scope.blobEnc = globalFuncs.getBlob("application/json;charset=UTF-8", $scope.wallet.toV3(walletService.password, {
kdf: globalFuncs.kdf,
n: globalFuncs.scrypt.n
}));
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/walletGenCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ var walletGenCtrl = function($scope) {
$scope.isDone = false;
$scope.wallet = Wallet.generate(false);
$scope.showWallet = true;
$scope.blob = globalFuncs.getBlob("text/json;charset=UTF-8", $scope.wallet.toJSON());
$scope.blobEnc = globalFuncs.getBlob("text/json;charset=UTF-8", $scope.wallet.toV3($scope.password, {
$scope.blob = globalFuncs.getBlob("application/json;charset=UTF-8", $scope.wallet.toJSON());
$scope.blobEnc = globalFuncs.getBlob("application/json;charset=UTF-8", $scope.wallet.toV3($scope.password, {
kdf: globalFuncs.kdf,
n: globalFuncs.scrypt.n
}));
Expand Down

0 comments on commit 56be995

Please sign in to comment.