aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-07-02 05:44:14 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-07-02 05:51:02 +0800
commit2dea179333dd14ad74aea65bb6558aac3bb716f4 (patch)
tree13951b4f82ea15cf25e52f46b0290b0b53dca90a
parent5a7908984e118f2babf7c0680bf17afa148f5122 (diff)
downloaddexon-0x-contracts-2dea179333dd14ad74aea65bb6558aac3bb716f4.tar.gz
dexon-0x-contracts-2dea179333dd14ad74aea65bb6558aac3bb716f4.tar.zst
dexon-0x-contracts-2dea179333dd14ad74aea65bb6558aac3bb716f4.zip
More cleanup
-rw-r--r--packages/website/ts/components/ui/drop_down.tsx1
-rw-r--r--packages/website/ts/components/wallet/wallet.tsx61
2 files changed, 31 insertions, 31 deletions
diff --git a/packages/website/ts/components/ui/drop_down.tsx b/packages/website/ts/components/ui/drop_down.tsx
index 3f1fec3f4..947e51be0 100644
--- a/packages/website/ts/components/ui/drop_down.tsx
+++ b/packages/website/ts/components/ui/drop_down.tsx
@@ -83,7 +83,6 @@ export class DropDown extends React.Component<DropDownProps, DropDownState> {
);
}
private _onActiveNodeClick(event: React.FormEvent<HTMLInputElement>): void {
- event.stopPropagation();
if (this.props.shouldWaitForClickToActivate) {
this.setState({
isDropDownOpen: true,
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index b6ae79b74..56776d255 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -21,6 +21,7 @@ import {
DifferentWalletSimpleMenuItem,
GoToAccountManagementSimpleMenuItem,
SimpleMenu,
+ SimpleMenuItem,
} from 'ts/components/ui/simple_menu';
import { Text } from 'ts/components/ui/text';
import { TokenIcon } from 'ts/components/ui/token_icon';
@@ -207,36 +208,36 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
);
const onClick = _.noop;
const accessory = (
- <Container marginRight="15px">
- <DropDown
- activeNode={
- // this container gives the menu button more of a hover target for the drop down
- // it prevents accidentally closing the menu by moving off of the button
- <Container paddingLeft="100px">
- <Text
- className="zmdi zmdi-more-horiz"
- Tag="i"
- fontSize="32px"
- fontFamily="Material-Design-Iconic-Font"
- fontColor={colors.darkGrey}
- onClick={onClick}
- hoverColor={colors.mediumBlue}
- />
- </Container>
- }
- popoverContent={
- <SimpleMenu minWidth="150px">
- <CopyAddressSimpleMenuItem userAddress={this.props.userAddress} />
- <DifferentWalletSimpleMenuItem onClick={this.props.onToggleLedgerDialog} />
- <GoToAccountManagementSimpleMenuItem />
- </SimpleMenu>
- }
- anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
- targetOrigin={{ horizontal: 'right', vertical: 'top' }}
- zDepth={1}
- shouldWaitForClickToActivate={true}
- />
- </Container>
+ <DropDown
+ activeNode={
+ // this container gives the menu button more of a hover target for the drop down
+ // it prevents accidentally closing the menu by moving off of the button
+ <Container paddingLeft="100px" paddingRight="15px">
+ <Text
+ className="zmdi zmdi-more-horiz"
+ Tag="i"
+ fontSize="32px"
+ fontFamily="Material-Design-Iconic-Font"
+ fontColor={colors.darkGrey}
+ onClick={onClick}
+ hoverColor={colors.mediumBlue}
+ />
+ </Container>
+ }
+ popoverContent={
+ <SimpleMenu minWidth="150px">
+ <CopyAddressSimpleMenuItem userAddress={this.props.userAddress} />
+ <DifferentWalletSimpleMenuItem onClick={this.props.onToggleLedgerDialog} />
+ <SimpleMenuItem displayText="Add Tokens..." onClick={this.props.onAddToken} />
+ <SimpleMenuItem displayText="Remove Tokens..." onClick={this.props.onRemoveToken} />
+ <GoToAccountManagementSimpleMenuItem />
+ </SimpleMenu>
+ }
+ anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
+ targetOrigin={{ horizontal: 'right', vertical: 'top' }}
+ zDepth={1}
+ shouldWaitForClickToActivate={true}
+ />
);
return (
<StandardIconRow