diff --git a/package.json b/package.json index 1688c0f027..22b65510a0 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "d3": "4.12.0", "ethereumjs-ledger": "2.1.4", "ethereumjs-tx": "1.3.3", + "ethereumjs-util": "^5.2.0", "express": "4.16.2", "helmet": "3.9.0", "highcharts": "6.0.3", diff --git a/src/modules/auth/actions/update-is-logged-and-load-account-data.js b/src/modules/auth/actions/update-is-logged-and-load-account-data.js index 2daea27320..937d34b71e 100644 --- a/src/modules/auth/actions/update-is-logged-and-load-account-data.js +++ b/src/modules/auth/actions/update-is-logged-and-load-account-data.js @@ -1,3 +1,4 @@ +import { toChecksumAddress } from 'ethereumjs-util' import { augur } from 'services/augurjs' import { loadAccountData } from 'modules/auth/actions/load-account-data' import { updateIsLogged } from 'modules/auth/actions/update-is-logged' @@ -6,9 +7,10 @@ import { clearLoginAccount } from 'modules/auth/actions/update-login-account' export const updateIsLoggedAndLoadAccountData = (unlockedAddress, accountType) => (dispatch) => { augur.rpc.clear() // clear ethrpc transaction history, registered callbacks, and notifications dispatch(clearLoginAccount()) // clear the loginAccount data in local state + const address = toChecksumAddress(unlockedAddress) const loginAccount = { - address: unlockedAddress, - meta: { accountType, address: unlockedAddress, signer: null }, + address, + meta: { accountType, address, signer: null }, } dispatch(updateIsLogged(true)) dispatch(loadAccountData(loginAccount)) diff --git a/test/auth/actions/update-is-logged-and-load-account-data.js b/test/auth/actions/update-is-logged-and-load-account-data.js index 4fbddf8ba4..f33000e401 100644 --- a/test/auth/actions/update-is-logged-and-load-account-data.js +++ b/test/auth/actions/update-is-logged-and-load-account-data.js @@ -32,7 +32,7 @@ describe(`modules/auth/actions/update-is-logged-and-load-account-data.js`, () => { type: 'AUGURJS_RPC_CLEAR' }, { type: 'CLEAR_LOGIN_ACCOUNT' }, { type: 'UPDATE_IS_LOGGED', data: { isLogged: true } }, - { type: 'LOAD_ACCOUNT_DATA', account: { address: '0xb0b', meta: { accountType: 'unlockedEthereumNode', address: '0xb0b', signer: null } } }, + { type: 'LOAD_ACCOUNT_DATA', account: { address: '0xB0B', meta: { accountType: 'unlockedEthereumNode', address: '0xB0B', signer: null } } }, ]), }) test({ @@ -45,7 +45,7 @@ describe(`modules/auth/actions/update-is-logged-and-load-account-data.js`, () => { type: 'AUGURJS_RPC_CLEAR' }, { type: 'CLEAR_LOGIN_ACCOUNT' }, { type: 'UPDATE_IS_LOGGED', data: { isLogged: true } }, - { type: 'LOAD_ACCOUNT_DATA', account: { address: '0xb0b', meta: { accountType: 'metaMask', address: '0xb0b', signer: null } } }, + { type: 'LOAD_ACCOUNT_DATA', account: { address: '0xB0B', meta: { accountType: 'metaMask', address: '0xB0B', signer: null } } }, ]), }) })