Skip to content

DEXW-2169: fix #1688

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.

Sign up for GitHub

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

Merged
jahsus-waves merged 1 commit into from
Oct 3, 2019
Merged

DEXW-2169: fix #1688

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 20 additions & 10 deletions src/modules/migrate/controllers/MigrateCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,36 @@
user.getFilteredUserList(),
user.getMultiAccountUsers()
]).then(([userList, multiAccountUsers]) => {
const { id } = $state.params;
this.activeStep = userList && userList.length ? 0 : 1;
this.userListLocked = userList;
this.userListUnlocked = multiAccountUsers;

this.migrateUsersWithoutPassword(userList.filter(lockedUser => (
const migrateWithoutPass = userList.filter(lockedUser => (
lockedUser.userType !== 'seed' &&
lockedUser.userType !== 'privateKey'
)));
));

const { id } = $state.params;
this.migrateUsersWithoutPassword(migrateWithoutPass).then(() => {
if (id) {

if (id) {
const lockedUserByHash = this.userListLocked.find(lockedUser => (
multiAccount.hash(lockedUser.address) === id
));
const autoMigrate = migrateWithoutPass.length &&
migrateWithoutPass.some(user => multiAccount.hash(user.address) === id);
Copy link
Contributor

@finico finico Oct 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shadowed user


if (autoMigrate) {
this.prevStep();
Copy link
Contributor

@finico finico Oct 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's already on the first step, doesn't it?

return null;
}

if (lockedUserByHash) {
this.startMigrate(lockedUserByHash);
const lockedUserByHash = this.userListLocked.find(lockedUser => (
Copy link
Contributor

@finico finico Oct 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

second O(n) - why?

multiAccount.hash(lockedUser.address) === id
));

if (lockedUserByHash) {
this.startMigrate(lockedUserByHash);
}
}
}
});
});
}

Expand Down