diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-06-20 04:29:54 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-06-20 04:29:54 +0800 |
commit | a75d6531f207aac8aeefa94bb44fa96a5b295998 (patch) | |
tree | fc1c581f4c35e188b0a16461936b8d0e3323bfe6 /packages/website/ts/containers | |
parent | bdd299dd9ee4699ccf5a4ab648e721e03ab2a139 (diff) | |
parent | da69ddc19b29cfca05d28084b196324e121987ea (diff) | |
download | dexon-sol-tools-a75d6531f207aac8aeefa94bb44fa96a5b295998.tar dexon-sol-tools-a75d6531f207aac8aeefa94bb44fa96a5b295998.tar.gz dexon-sol-tools-a75d6531f207aac8aeefa94bb44fa96a5b295998.tar.bz2 dexon-sol-tools-a75d6531f207aac8aeefa94bb44fa96a5b295998.tar.lz dexon-sol-tools-a75d6531f207aac8aeefa94bb44fa96a5b295998.tar.xz dexon-sol-tools-a75d6531f207aac8aeefa94bb44fa96a5b295998.tar.zst dexon-sol-tools-a75d6531f207aac8aeefa94bb44fa96a5b295998.zip |
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into bug/website/onboarding-improvements
Diffstat (limited to 'packages/website/ts/containers')
-rw-r--r-- | packages/website/ts/containers/portal.ts | 2 | ||||
-rw-r--r-- | packages/website/ts/containers/portal_onboarding_flow.ts | 2 | ||||
-rw-r--r-- | packages/website/ts/containers/zero_ex_js_documentation.ts | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/packages/website/ts/containers/portal.ts b/packages/website/ts/containers/portal.ts index cac2477c6..6747cdf4e 100644 --- a/packages/website/ts/containers/portal.ts +++ b/packages/website/ts/containers/portal.ts @@ -29,6 +29,7 @@ interface ConnectedState { flashMessage?: string | React.ReactNode; translate: Translate; isPortalOnboardingShowing: boolean; + portalOnboardingStep: number; } interface ConnectedDispatch { @@ -78,6 +79,7 @@ const mapStateToProps = (state: State, _ownProps: PortalComponentProps): Connect flashMessage: state.flashMessage, translate: state.translate, isPortalOnboardingShowing: state.isPortalOnboardingShowing, + portalOnboardingStep: state.portalOnboardingStep, }; }; diff --git a/packages/website/ts/containers/portal_onboarding_flow.ts b/packages/website/ts/containers/portal_onboarding_flow.ts index 746adf0ba..ba2b8f512 100644 --- a/packages/website/ts/containers/portal_onboarding_flow.ts +++ b/packages/website/ts/containers/portal_onboarding_flow.ts @@ -15,6 +15,7 @@ interface PortalOnboardingFlowProps { } interface ConnectedState { + networkId: number; stepIndex: number; isRunning: boolean; userAddress: string; @@ -32,6 +33,7 @@ interface ConnectedDispatch { } const mapStateToProps = (state: State, _ownProps: PortalOnboardingFlowProps): ConnectedState => ({ + networkId: state.networkId, stepIndex: state.portalOnboardingStep, isRunning: state.isPortalOnboardingShowing, userAddress: state.userAddress, diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts index a8890a07a..bd0d1732a 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.ts +++ b/packages/website/ts/containers/zero_ex_js_documentation.ts @@ -173,6 +173,7 @@ const docsInfoConfig: DocsInfoConfig = { 'OrderStateInvalid', 'OrderState', 'OrderStateWatcherConfig', + 'OrderWatcherConfig', 'FilterObject', 'OrderRelevantState', 'JSONRPCRequestPayload', |