Merge branch 'master' into fix-wallet-modals

src/actions/LocalStorageActions.js

@@ -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;

src/views/Wallet/views/Account/Receive/index.js

@@ -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>
     );
 };