arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-12-25 16:38:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #209 from trezor/fix/topnavigation-indicator

Browse Source 
fix for indicator first render
This commit is contained in:
Vladimir Volek 2018-10-22 15:24:07 +02:00 committed by GitHub
commit 5792a1c03d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/Wallet/components/TopNavigationAccount/components/Indicator/index.js
View File

@ -6,7 +6,7 @@ import React, { PureComponent } from 'react';
type Props = { type Props = {
pathname: string; pathname: string;
wrapper: ?HTMLElement; wrapper: () => ?HTMLElement;
} }
type State = { type State = {
@ -71,8 +71,8 @@ class Indicator extends PureComponent<Props, State> {
handleResize: () => void; handleResize: () => void;
reposition(resetAnimation: boolean = true) { reposition(resetAnimation: boolean = true) {
if (!this.props.wrapper) return; const wrapper = this.props.wrapper();
const { wrapper } = this.props; if (!wrapper) return;
const active = wrapper.querySelector('.active'); const active = wrapper.querySelector('.active');
if (!active) return; if (!active) return;
const bounds = active.getBoundingClientRect(); const bounds = active.getBoundingClientRect();

2
src/views/Wallet/components/TopNavigationAccount/index.js
View File

@ -65,7 +65,7 @@ class TopNavigationAccount extends React.PureComponent<Props> {
<StyledNavLink to={`${basePath}/receive`}>Receive</StyledNavLink> <StyledNavLink to={`${basePath}/receive`}>Receive</StyledNavLink>
<StyledNavLink to={`${basePath}/send`}>Send</StyledNavLink> <StyledNavLink to={`${basePath}/send`}>Send</StyledNavLink>
{/* <StyledNavLink to={`${basePath}/signverify`}>Sign & Verify</StyledNavLink> */} {/* <StyledNavLink to={`${basePath}/signverify`}>Sign & Verify</StyledNavLink> */}
<Indicator pathname={pathname} wrapper={this.wrapper} /> <Indicator pathname={pathname} wrapper={() => this.wrapper} />
</Wrapper> </Wrapper>
); );
} }