Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Private key import fix #3519

Merged
merged 1 commit into from
Jun 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/stores/AddressIndex.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import BaseStore from "stores/BaseStore";

let AddressIndexWorker;
if (__ELECTRON__) {
AddressIndexWorker = require("worker-loader?inline=no-fallback!workers/AddressIndexWorker");
AddressIndexWorker = require("worker-loader?inline=no-fallback!workers/AddressIndexWorker")
.default;
}
class AddressIndex extends BaseStore {
constructor() {
Expand Down Expand Up @@ -65,7 +66,8 @@ class AddressIndex extends BaseStore {
this.loadAddyMap()
.then(() => {
if (!__ELECTRON__) {
AddressIndexWorker = require("worker-loader!workers/AddressIndexWorker");
AddressIndexWorker = require("worker-loader!workers/AddressIndexWorker")
.default;
}
let worker = new AddressIndexWorker();
worker.postMessage({
Expand Down
5 changes: 3 additions & 2 deletions app/stores/WalletDb.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ let TRACE = false;

let dictJson, AesWorker;
if (__ELECTRON__) {
AesWorker = require("worker-loader?inline=no-fallback!workers/AesWorker");
AesWorker = require("worker-loader?inline=no-fallback!workers/AesWorker")
.default;
dictJson = require("common/dictionary_en.json");
}

Expand Down Expand Up @@ -642,7 +643,7 @@ class WalletDb extends BaseStore {
private_plainhex_array.push(private_key_obj.private_plainhex);
}
if (!__ELECTRON__) {
AesWorker = require("worker-loader!workers/AesWorker");
AesWorker = require("worker-loader!workers/AesWorker").default;
}
let worker = new AesWorker();
worker.postMessage({
Expand Down