From cdcf624e9e6fe671611b239f903c2f2cb3097e7c Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 20 Jul 2018 08:52:14 -0700 Subject: Have basic lock and check working in walelt --- .../ts/containers/inputs/allowance_state_toggle.ts | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/website/ts/containers/inputs/allowance_state_toggle.ts (limited to 'packages/website/ts/containers/inputs/allowance_state_toggle.ts') diff --git a/packages/website/ts/containers/inputs/allowance_state_toggle.ts b/packages/website/ts/containers/inputs/allowance_state_toggle.ts new file mode 100644 index 000000000..6e2698b0b --- /dev/null +++ b/packages/website/ts/containers/inputs/allowance_state_toggle.ts @@ -0,0 +1,26 @@ +import * as React from 'react'; +import { connect } from 'react-redux'; +import { Dispatch } from 'redux'; +import { Blockchain } from 'ts/blockchain'; +import { State } from 'ts/redux/reducer'; +import { BalanceErrs, Token, TokenState } from 'ts/types'; + +import { AllowanceStateToggle as AllowanceStateToggleComponent } from 'ts/components/inputs/allowance_state_toggle'; +import { Dispatcher } from 'ts/redux/dispatcher'; + +interface AllowanceStateToggleProps {} + +interface ConnectedState {} + +interface ConnectedDispatch { + dispatcher: Dispatcher; +} + +const mapStateToProps = (state: State, _ownProps: AllowanceStateToggleProps): ConnectedState => ({}); + +// const mapDispatchTopProps = (dispatch: Dispatch): ConnectedDispatch => ({}); + +export const AllowanceStateToggle: React.ComponentClass = connect( + mapStateToProps, + // mapDispatchTopProps, +)(AllowanceStateToggleComponent); -- cgit v1.2.3 From b28cc6d7d300d209bee0091369a8e221eaeb4e64 Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 20 Jul 2018 10:14:17 -0700 Subject: Show token name dynamically in tooltip --- packages/website/ts/containers/inputs/allowance_state_toggle.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages/website/ts/containers/inputs/allowance_state_toggle.ts') diff --git a/packages/website/ts/containers/inputs/allowance_state_toggle.ts b/packages/website/ts/containers/inputs/allowance_state_toggle.ts index 6e2698b0b..cdda5ecf0 100644 --- a/packages/website/ts/containers/inputs/allowance_state_toggle.ts +++ b/packages/website/ts/containers/inputs/allowance_state_toggle.ts @@ -8,7 +8,10 @@ import { BalanceErrs, Token, TokenState } from 'ts/types'; import { AllowanceStateToggle as AllowanceStateToggleComponent } from 'ts/components/inputs/allowance_state_toggle'; import { Dispatcher } from 'ts/redux/dispatcher'; -interface AllowanceStateToggleProps {} +interface AllowanceStateToggleProps { + token: Token; + tokenState: TokenState; +} interface ConnectedState {} -- cgit v1.2.3 From 0f8e6b395eb2260bbb03da9de35505a7a91c5c7b Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 20 Jul 2018 10:44:59 -0700 Subject: WIP for allowance toggle redesign working --- .../ts/containers/inputs/allowance_state_toggle.ts | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'packages/website/ts/containers/inputs/allowance_state_toggle.ts') diff --git a/packages/website/ts/containers/inputs/allowance_state_toggle.ts b/packages/website/ts/containers/inputs/allowance_state_toggle.ts index cdda5ecf0..d6ff11f84 100644 --- a/packages/website/ts/containers/inputs/allowance_state_toggle.ts +++ b/packages/website/ts/containers/inputs/allowance_state_toggle.ts @@ -9,21 +9,33 @@ import { AllowanceStateToggle as AllowanceStateToggleComponent } from 'ts/compon import { Dispatcher } from 'ts/redux/dispatcher'; interface AllowanceStateToggleProps { + blockchain: Blockchain; + onErrorOccurred?: (errType: BalanceErrs) => void; token: Token; tokenState: TokenState; + isDisabled?: boolean; + refetchTokenStateAsync: () => Promise; } -interface ConnectedState {} +interface ConnectedState { + networkId: number; + userAddress: string; +} interface ConnectedDispatch { dispatcher: Dispatcher; } -const mapStateToProps = (state: State, _ownProps: AllowanceStateToggleProps): ConnectedState => ({}); +const mapStateToProps = (state: State, _ownProps: AllowanceStateToggleProps): ConnectedState => ({ + networkId: state.networkId, + userAddress: state.userAddress, +}); -// const mapDispatchTopProps = (dispatch: Dispatch): ConnectedDispatch => ({}); +const mapDispatchTopProps = (dispatch: Dispatch): ConnectedDispatch => ({ + dispatcher: new Dispatcher(dispatch), +}); export const AllowanceStateToggle: React.ComponentClass = connect( mapStateToProps, - // mapDispatchTopProps, + mapDispatchTopProps, )(AllowanceStateToggleComponent); -- cgit v1.2.3 From b9f5c9383067874d2bb87dcc68808d4563f45363 Mon Sep 17 00:00:00 2001 From: fragosti Date: Tue, 24 Jul 2018 14:19:19 -0700 Subject: Fix wrap button alignment issue --- packages/website/ts/containers/inputs/allowance_state_toggle.ts | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/website/ts/containers/inputs/allowance_state_toggle.ts') diff --git a/packages/website/ts/containers/inputs/allowance_state_toggle.ts b/packages/website/ts/containers/inputs/allowance_state_toggle.ts index d6ff11f84..2a099b557 100644 --- a/packages/website/ts/containers/inputs/allowance_state_toggle.ts +++ b/packages/website/ts/containers/inputs/allowance_state_toggle.ts @@ -13,7 +13,6 @@ interface AllowanceStateToggleProps { onErrorOccurred?: (errType: BalanceErrs) => void; token: Token; tokenState: TokenState; - isDisabled?: boolean; refetchTokenStateAsync: () => Promise; } -- cgit v1.2.3 From 5b6cf447e5793a775d8d590647c85971a6746909 Mon Sep 17 00:00:00 2001 From: fragosti Date: Tue, 24 Jul 2018 15:09:47 -0700 Subject: Make tooltip appear to the left of the toggle when onboarding in progress --- packages/website/ts/containers/inputs/allowance_state_toggle.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/website/ts/containers/inputs/allowance_state_toggle.ts') diff --git a/packages/website/ts/containers/inputs/allowance_state_toggle.ts b/packages/website/ts/containers/inputs/allowance_state_toggle.ts index 2a099b557..70712685e 100644 --- a/packages/website/ts/containers/inputs/allowance_state_toggle.ts +++ b/packages/website/ts/containers/inputs/allowance_state_toggle.ts @@ -2,6 +2,7 @@ import * as React from 'react'; import { connect } from 'react-redux'; import { Dispatch } from 'redux'; import { Blockchain } from 'ts/blockchain'; +import { PointerDirection } from 'ts/components/ui/pointer'; import { State } from 'ts/redux/reducer'; import { BalanceErrs, Token, TokenState } from 'ts/types'; @@ -14,6 +15,7 @@ interface AllowanceStateToggleProps { token: Token; tokenState: TokenState; refetchTokenStateAsync: () => Promise; + tooltipDirection?: PointerDirection; } interface ConnectedState { -- cgit v1.2.3