diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-25 17:49:14 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-06-25 17:49:14 +0800 |
commit | 9b196ba68c9f958cd82ef99ae87fdd87c70441a9 (patch) | |
tree | 26f265a0293703627fffd1993336a57ee694d670 /packages/website/ts/containers/portal_onboarding_flow.ts | |
parent | 5bfdffda1155e306b17eee0a4e60320c3433d5c4 (diff) | |
parent | f8bde5ab9b8e5d4ec8b9532dfbf18d1202dbfb29 (diff) | |
download | dexon-0x-contracts-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar dexon-0x-contracts-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.gz dexon-0x-contracts-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.bz2 dexon-0x-contracts-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.lz dexon-0x-contracts-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.xz dexon-0x-contracts-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.zst dexon-0x-contracts-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.zip |
Merge branch 'v2-prototype' into feature/combinatorial-testing
* v2-prototype: (97 commits)
Fix typos in comments
Add modifier and tests for removeAuthorizedAddressAtIndex
Update and add tests
Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex
Move isFunctionRemoveAuthorizedAddress to test
Fix usage of `popLastByte`
Fix LibBytes is a library
Remove `areBytesEqual`
Fix usage of `contentAddress()`
Clean low bits in bytes4
Clean high bits in address
Refactor LibBytes.readBytes4 for consistency
Fix LibBytes.equals
Add trailing garbage testcase for LibBytes.equals
Rename bytes.equals
Add slice and sliceDestructive
Rename bytes.rawAddress and add bytes.contentAddress
Rename read/writeBytesWithLength
Using LibBytes for bytes
Make LibBytes a library
...
# Conflicts:
# packages/contracts/src/utils/constants.ts
# packages/contracts/test/exchange/core.ts
Diffstat (limited to 'packages/website/ts/containers/portal_onboarding_flow.ts')
-rw-r--r-- | packages/website/ts/containers/portal_onboarding_flow.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/website/ts/containers/portal_onboarding_flow.ts b/packages/website/ts/containers/portal_onboarding_flow.ts index ba2b8f512..12daad021 100644 --- a/packages/website/ts/containers/portal_onboarding_flow.ts +++ b/packages/website/ts/containers/portal_onboarding_flow.ts @@ -3,7 +3,7 @@ import * as React from 'react'; import { connect } from 'react-redux'; import { Dispatch } from 'redux'; import { Blockchain } from 'ts/blockchain'; -import { ActionTypes, ProviderType, TokenByAddress, TokenStateByAddress } from 'ts/types'; +import { ActionTypes, ProviderType, ScreenWidths, TokenByAddress, TokenStateByAddress } from 'ts/types'; import { PortalOnboardingFlow as PortalOnboardingFlowComponent } from 'ts/components/onboarding/portal_onboarding_flow'; import { State } from 'ts/redux/reducer'; @@ -25,6 +25,7 @@ interface ConnectedState { blockchainIsLoaded: boolean; userEtherBalanceInWei?: BigNumber; tokenByAddress: TokenByAddress; + screenWidth: ScreenWidths; } interface ConnectedDispatch { @@ -43,6 +44,7 @@ const mapStateToProps = (state: State, _ownProps: PortalOnboardingFlowProps): Co userEtherBalanceInWei: state.userEtherBalanceInWei, tokenByAddress: state.tokenByAddress, hasBeenSeen: state.hasPortalOnboardingBeenSeen, + screenWidth: state.screenWidth, }); const mapDispatchToProps = (dispatch: Dispatch<State>): ConnectedDispatch => ({ |