arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-24 09:18:09 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-wallet-modals

Browse Source
This commit is contained in:
Vladimir Volek 2018-10-09 13:57:06 +02:00
commit 5524080c30
2 changed files with 76 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/actions/LocalStorageActions.js
View File

@ -88,6 +88,8 @@ export function update(event: StorageEvent): AsyncAction {
};
}
const VERSION: string = '1';
export function loadTokensFromJSON(): AsyncAction {
return async (dispatch: Dispatch): Promise<void> => {
if (typeof window.localStorage === 'undefined') return;
@ -100,6 +102,13 @@ export function loadTokensFromJSON(): AsyncAction {
dispatch(update(event));
});
// validate version
const version: ?string = get('version');
if (version !== VERSION) {
window.localStorage.clear();
dispatch(save('version', VERSION));
}
// load tokens
const tokens = await config.coins.reduce(async (promise: Promise<TokensCollection>, coin: Coin): Promise<TokensCollection> => {
const collection: TokensCollection = await promise;

2
src/views/Wallet/views/Account/Receive/index.js
View File

@ -159,6 +159,7 @@ const AccountReceive = (props: Props) => {
return (
<Content>
<React.Fragment>
<H2>Receive Ethereum or tokens</H2>
<AddressWrapper
isShowingQrCode={addressVerified || addressUnverified}
@ -226,6 +227,7 @@ const AccountReceive = (props: Props) => {
</ShowAddressButton>
)}
</AddressWrapper>
</React.Fragment>
</Content>
);
};