Backporting to beta (#3525)
* v1.4.4 * Fixing tests, fixing refreshing precompiled (#3483) * Fixing tests, fixing refreshing precompiled * Commit only js and Cargo.lock * Moving commands to the right place * Adding js content as well * Wallet names shouldn't include address. (Actually wallet files shouldn't contain it either, but we'll leave that for a later PR). * sudo -c Is not supported on Mac * Add trace_{call, rawTransaction, replayTransaction} * Remove dangling only * check for sanity * Better Erros Snackbar in UI #3473 * Sync bandwidth optimization * Updated sync algo desription * Check transaction signature when adding to the queue * Limit sync reorg to 20 blocks (#3519) * Limit sync reorg * Fixed tests * updated the european warp bootnode addresses (#3528) * Fix dapp account selection (#3399) * Fix GHH accounts (filter non accounts) * SignatureReg handle undefined ABI names gracefully * SignatureReg fix accounts (filter non accounts) * TokenReg fix accounts (filter non accounts) * Registry fix accounts (filter non accounts) * Remove addresses, display non-refundable warning (#3403) * Use Contract owner for unregistering Token #3440 * Make tokenreg dapp fast again (#3474) * Using proper TokenReg Instance in TokenReg dApp #3371 * remove unnecessary logs in tokereg dapp * Improved Redux managment in TokeReg dApp #3371 * Fixfing linting Former-commit-id: 3e0d033eaf789cfdf517f4a97effc500f1f9263b
This commit is contained in:
@@ -35,22 +35,17 @@ export const setSelectedAccount = (address) => ({
|
||||
});
|
||||
|
||||
export const loadAccounts = () => (dispatch) => {
|
||||
Promise
|
||||
.all([
|
||||
api.eth.accounts(),
|
||||
api.parity.accounts()
|
||||
])
|
||||
.then(([ accounts, accountsInfo ]) => {
|
||||
accountsInfo = accountsInfo || {};
|
||||
|
||||
const accountsList = accounts
|
||||
.map(address => ({
|
||||
api.parity
|
||||
.accounts()
|
||||
.then((accountsInfo) => {
|
||||
const accountsList = Object
|
||||
.keys(accountsInfo)
|
||||
.filter((address) => accountsInfo[address].uuid)
|
||||
.map((address) => ({
|
||||
...accountsInfo[address],
|
||||
address
|
||||
}));
|
||||
|
||||
console.log('accounts', accountsList);
|
||||
|
||||
dispatch(setAccounts(accountsList));
|
||||
dispatch(setAccountsInfo(accountsInfo));
|
||||
dispatch(setSelectedAccount(accountsList[0].address));
|
||||
|
||||
Reference in New Issue
Block a user