aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/components
diff options
context:
space:
mode:
authorBrandon Millman <brandon@0xproject.com>2018-06-21 06:25:51 +0800
committerGitHub <noreply@github.com>2018-06-21 06:25:51 +0800
commit4d36f38f96d65976a0fbaa73709836cc3bb57cc0 (patch)
tree30468e7bf33998de3285335d606da907630f56b3 /packages/website/ts/components
parentd31ca444e1d52ab20bcdb12ded6191fc082c29ef (diff)
parent549c6afa0af15cb19249ce8cdbad92b09ae231f6 (diff)
downloaddexon-sol-tools-4d36f38f96d65976a0fbaa73709836cc3bb57cc0.tar
dexon-sol-tools-4d36f38f96d65976a0fbaa73709836cc3bb57cc0.tar.gz
dexon-sol-tools-4d36f38f96d65976a0fbaa73709836cc3bb57cc0.tar.bz2
dexon-sol-tools-4d36f38f96d65976a0fbaa73709836cc3bb57cc0.tar.lz
dexon-sol-tools-4d36f38f96d65976a0fbaa73709836cc3bb57cc0.tar.xz
dexon-sol-tools-4d36f38f96d65976a0fbaa73709836cc3bb57cc0.tar.zst
dexon-sol-tools-4d36f38f96d65976a0fbaa73709836cc3bb57cc0.zip
Merge pull request #733 from 0xProject/bug/website/identicon-layout
Move some layout logic out of the Identicon component
Diffstat (limited to 'packages/website/ts/components')
-rw-r--r--packages/website/ts/components/generate_order/asset_picker.tsx4
-rw-r--r--packages/website/ts/components/ui/identicon.tsx2
-rw-r--r--packages/website/ts/components/wallet/wallet.tsx3
3 files changed, 6 insertions, 3 deletions
diff --git a/packages/website/ts/components/generate_order/asset_picker.tsx b/packages/website/ts/components/generate_order/asset_picker.tsx
index d7cc554c4..b43ac1f2e 100644
--- a/packages/website/ts/components/generate_order/asset_picker.tsx
+++ b/packages/website/ts/components/generate_order/asset_picker.tsx
@@ -151,12 +151,12 @@ export class AssetPicker extends React.Component<AssetPickerProps, AssetPickerSt
height: TILE_DIMENSION,
...tileStyles,
}}
- className="p2 mx-auto"
+ className="p2 flex flex-column items-center"
onClick={this._onChooseToken.bind(this, address)}
onMouseEnter={this._onToggleHover.bind(this, address, true)}
onMouseLeave={this._onToggleHover.bind(this, address, false)}
>
- <div className="p1 center">
+ <div className="p1">
<TokenIcon token={token} diameter={TOKEN_ICON_DIMENSION} />
</div>
<div className="center">{token.name}</div>
diff --git a/packages/website/ts/components/ui/identicon.tsx b/packages/website/ts/components/ui/identicon.tsx
index 30df995c8..cc1655962 100644
--- a/packages/website/ts/components/ui/identicon.tsx
+++ b/packages/website/ts/components/ui/identicon.tsx
@@ -23,7 +23,7 @@ export class Identicon extends React.Component<IdenticonProps, IdenticonState> {
const radius = diameter / 2;
return (
<div
- className="circle mx-auto relative transitionFix"
+ className="circle relative transitionFix"
style={{
width: diameter,
height: diameter,
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index ac2fe0d31..82fec4e48 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -323,6 +323,9 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
}
private _renderTokenRow(token: Token, _index: number): React.ReactNode {
const tokenState = this.props.trackedTokenStateByAddress[token.address];
+ if (_.isUndefined(tokenState)) {
+ return null;
+ }
const tokenLink = sharedUtils.getEtherScanLinkIfExists(
token.address,
this.props.networkId,