arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-02-15 17:42:03 +00:00
Code Issues Releases Wiki Activity

refactored getSelectedAccount, createAccount

Browse Source
This commit is contained in:
slowbackspace 2019-04-09 23:36:32 +02:00
parent 715da870a7
commit 27f35b097d
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/reducers/AccountsReducer.js
View File

@ -75,8 +75,11 @@ const createAccount = (state: State, account: Account): State => {
} }
const newState: State = [...state]; const newState: State = [...state];
newState.push(account); newState.push(account);
// sort the accounts array so the imported accounts always come before discovered accounts // sort the accounts array so the imported accounts always come before discovered accounts
newState.sort((a, b) => b.imported - a.imported || a.index - b.index); if (account.imported) {
newState.sort((a, b) => b.imported - a.imported || a.index - b.index);
}
return newState; return newState;
}; };

11
src/reducers/utils/index.js
View File

@ -89,18 +89,9 @@ export const getSelectedAccount = (state: State): ?Account => {
? parseInt(locationState.account.substr(1), 10) ? parseInt(locationState.account.substr(1), 10)
: parseInt(locationState.account, 10); : parseInt(locationState.account, 10);
if (isImported) {
return state.accounts.find(
a =>
a.imported === true &&
a.deviceState === device.state &&
a.index === index &&
a.network === locationState.network
);
}
return state.accounts.find( return state.accounts.find(
a => a =>
a.imported === false && a.imported === isImported &&
a.deviceState === device.state && a.deviceState === device.state &&
a.index === index && a.index === index &&
a.network === locationState.network a.network === locationState.network