Merge branch 'development' into feature/website/crypto-compare-prices
* development: Fix react type versions to avoid minor version bumps with breaking changes Update Web3 Provider Engine to 14.0.4 Remove auto-assignment of everyone to PR's Check for Yarn instead of npm Add hack comment about the use of sudo Fix lazy load component name Rename Portal and PortalMenu components to LegacyPortal and LegacyPortalMenu Remove unnecessary additional params Remove outside declaration Capitalize yarn Use path for platform independence Consolidate github personal access token env to one place: constants.ts Use methods moved to utils since now shared by multiple scripts Add comment Improve comments Add checks for the required local setup before running the publish script Add descriptions for all commands in monorepo-scripts Add removeGitTags script that can be run after a failed Lerna publish
This commit is contained in:
@@ -14,7 +14,7 @@ import { WrappedEthSectionNoticeDialog } from 'ts/components/dialogs/wrapped_eth
|
||||
import { EthWrappers } from 'ts/components/eth_wrappers';
|
||||
import { FillOrder } from 'ts/components/fill_order';
|
||||
import { Footer } from 'ts/components/footer';
|
||||
import { PortalMenu } from 'ts/components/portal_menu';
|
||||
import { LegacyPortalMenu } from 'ts/components/legacy_portal/legacy_portal_menu';
|
||||
import { RelayerIndex } from 'ts/components/relayer_index/relayer_index';
|
||||
import { TokenBalances } from 'ts/components/token_balances';
|
||||
import { TopBar } from 'ts/components/top_bar/top_bar';
|
||||
@@ -43,9 +43,7 @@ import { utils } from 'ts/utils/utils';
|
||||
|
||||
const THROTTLE_TIMEOUT = 100;
|
||||
|
||||
export interface PortalPassedProps {}
|
||||
|
||||
export interface PortalAllProps {
|
||||
export interface LegacyPortalProps {
|
||||
blockchainErr: BlockchainErrs;
|
||||
blockchainIsLoaded: boolean;
|
||||
dispatcher: Dispatcher;
|
||||
@@ -67,7 +65,7 @@ export interface PortalAllProps {
|
||||
translate: Translate;
|
||||
}
|
||||
|
||||
interface PortalAllState {
|
||||
interface LegacyPortalState {
|
||||
prevNetworkId: number;
|
||||
prevNodeVersion: string;
|
||||
prevUserAddress: string;
|
||||
@@ -77,7 +75,7 @@ interface PortalAllState {
|
||||
isLedgerDialogOpen: boolean;
|
||||
}
|
||||
|
||||
export class Portal extends React.Component<PortalAllProps, PortalAllState> {
|
||||
export class LegacyPortal extends React.Component<LegacyPortalProps, LegacyPortalState> {
|
||||
private _blockchain: Blockchain;
|
||||
private _sharedOrderIfExists: Order;
|
||||
private _throttledScreenWidthUpdate: () => void;
|
||||
@@ -86,13 +84,13 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
|
||||
const hasAlreadyDismissedWethNotice = !_.isUndefined(didDismissWethNotice) && !_.isEmpty(didDismissWethNotice);
|
||||
return hasAlreadyDismissedWethNotice;
|
||||
}
|
||||
constructor(props: PortalAllProps) {
|
||||
constructor(props: LegacyPortalProps) {
|
||||
super(props);
|
||||
this._sharedOrderIfExists = this._getSharedOrderIfExists();
|
||||
this._throttledScreenWidthUpdate = _.throttle(this._updateScreenWidth.bind(this), THROTTLE_TIMEOUT);
|
||||
|
||||
const isViewingBalances = _.includes(props.location.pathname, `${WebsitePaths.Portal}/balances`);
|
||||
const hasAlreadyDismissedWethNotice = Portal.hasAlreadyDismissedWethNotice();
|
||||
const hasAlreadyDismissedWethNotice = LegacyPortal.hasAlreadyDismissedWethNotice();
|
||||
|
||||
const didAcceptPortalDisclaimer = localStorage.getItemIfExists(constants.LOCAL_STORAGE_KEY_ACCEPT_DISCLAIMER);
|
||||
const hasAcceptedDisclaimer =
|
||||
@@ -123,7 +121,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
|
||||
// become disconnected from their backing Ethereum node, changes user accounts, etc...)
|
||||
this.props.dispatcher.resetState();
|
||||
}
|
||||
public componentWillReceiveProps(nextProps: PortalAllProps) {
|
||||
public componentWillReceiveProps(nextProps: LegacyPortalProps) {
|
||||
if (nextProps.networkId !== this.state.prevNetworkId) {
|
||||
// tslint:disable-next-line:no-floating-promises
|
||||
this._blockchain.networkIdUpdatedFireAndForgetAsync(nextProps.networkId);
|
||||
@@ -145,7 +143,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
|
||||
}
|
||||
if (nextProps.location.pathname !== this.state.prevPathname) {
|
||||
const isViewingBalances = _.includes(nextProps.location.pathname, `${WebsitePaths.Portal}/balances`);
|
||||
const hasAlreadyDismissedWethNotice = Portal.hasAlreadyDismissedWethNotice();
|
||||
const hasAlreadyDismissedWethNotice = LegacyPortal.hasAlreadyDismissedWethNotice();
|
||||
this.setState({
|
||||
prevPathname: nextProps.location.pathname,
|
||||
isWethNoticeDialogOpen: !hasAlreadyDismissedWethNotice && isViewingBalances,
|
||||
@@ -200,7 +198,7 @@ export class Portal extends React.Component<PortalAllProps, PortalAllState> {
|
||||
) : (
|
||||
<div className="mx-auto flex">
|
||||
<div className="col col-2 pr2 pt1 sm-hide xs-hide" style={portalMenuContainerStyle}>
|
||||
<PortalMenu menuItemStyle={{ color: colors.white }} />
|
||||
<LegacyPortalMenu menuItemStyle={{ color: colors.white }} />
|
||||
</div>
|
||||
<div className="col col-12 lg-col-10 md-col-10 sm-col sm-col-12">
|
||||
<div className="py2" style={{ backgroundColor: colors.grey50 }}>
|
||||
@@ -4,15 +4,15 @@ import { MenuItem } from 'ts/components/ui/menu_item';
|
||||
import { Environments, WebsitePaths } from 'ts/types';
|
||||
import { configs } from 'ts/utils/configs';
|
||||
|
||||
export interface PortalMenuProps {
|
||||
export interface LegacyPortalMenuProps {
|
||||
menuItemStyle: React.CSSProperties;
|
||||
onClick?: () => void;
|
||||
}
|
||||
|
||||
interface PortalMenuState {}
|
||||
interface LegacyPortalMenuState {}
|
||||
|
||||
export class PortalMenu extends React.Component<PortalMenuProps, PortalMenuState> {
|
||||
public static defaultProps: Partial<PortalMenuProps> = {
|
||||
export class LegacyPortalMenu extends React.Component<LegacyPortalMenuProps, LegacyPortalMenuState> {
|
||||
public static defaultProps: Partial<LegacyPortalMenuProps> = {
|
||||
onClick: _.noop,
|
||||
};
|
||||
public render() {
|
||||
@@ -8,7 +8,7 @@ import * as React from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import ReactTooltip = require('react-tooltip');
|
||||
import { Blockchain } from 'ts/blockchain';
|
||||
import { PortalMenu } from 'ts/components/portal_menu';
|
||||
import { LegacyPortalMenu } from 'ts/components/legacy_portal/legacy_portal_menu';
|
||||
import { SidebarHeader } from 'ts/components/sidebar_header';
|
||||
import { ProviderDisplay } from 'ts/components/top_bar/provider_display';
|
||||
import { TopBarMenuItem } from 'ts/components/top_bar/top_bar_menu_item';
|
||||
@@ -431,7 +431,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
|
||||
<div className="pl1 py1" style={{ backgroundColor: colors.lightGrey }}>
|
||||
{this.props.translate.get(Key.PortalDApp, Deco.CapWords)}
|
||||
</div>
|
||||
<PortalMenu menuItemStyle={{ color: 'black' }} onClick={this._onMenuButtonClick.bind(this)} />
|
||||
<LegacyPortalMenu menuItemStyle={{ color: 'black' }} onClick={this._onMenuButtonClick.bind(this)} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user