aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-06-29 08:34:29 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-06-29 08:34:29 +0800
commit467e9abf5fcda8be231e36f985964bf6d42b383e (patch)
treef8c3b1c322a4516a80a61170b0f21300612f5df9
parent512980d9bd33290582411baf381f95ee2ff3c22d (diff)
downloaddexon-sol-tools-467e9abf5fcda8be231e36f985964bf6d42b383e.tar
dexon-sol-tools-467e9abf5fcda8be231e36f985964bf6d42b383e.tar.gz
dexon-sol-tools-467e9abf5fcda8be231e36f985964bf6d42b383e.tar.bz2
dexon-sol-tools-467e9abf5fcda8be231e36f985964bf6d42b383e.tar.lz
dexon-sol-tools-467e9abf5fcda8be231e36f985964bf6d42b383e.tar.xz
dexon-sol-tools-467e9abf5fcda8be231e36f985964bf6d42b383e.tar.zst
dexon-sol-tools-467e9abf5fcda8be231e36f985964bf6d42b383e.zip
Show eth balance in add eth balance onboarding step
-rw-r--r--packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx17
-rw-r--r--packages/website/ts/components/onboarding/onboarding_card.tsx2
-rw-r--r--packages/website/ts/components/onboarding/portal_onboarding_flow.tsx8
3 files changed, 16 insertions, 11 deletions
diff --git a/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx b/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
index 62d44885c..7250ef971 100644
--- a/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
+++ b/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
@@ -1,15 +1,26 @@
+import { BigNumber } from '@0xproject/utils';
import * as React from 'react';
import { Container } from 'ts/components/ui/container';
import { Text } from 'ts/components/ui/text';
+import { constants } from 'ts/utils/constants';
+import { utils } from 'ts/utils/utils';
export interface AddEthOnboardingStepProps {
- hasEth: boolean;
+ userEthBalanceInWei: BigNumber;
}
export const AddEthOnboardingStep: React.StatelessComponent<AddEthOnboardingStepProps> = props =>
- props.hasEth ? (
+ props.userEthBalanceInWei.gt(0) ? (
<div className="flex items-center flex-column">
- <Text> Great! Looks like you already have ETH in your wallet.</Text>
+ <Text>
+ Great! Looks like you already have{' '}
+ {utils.getFormattedAmount(
+ props.userEthBalanceInWei,
+ constants.DECIMAL_PLACES_ETH,
+ constants.ETHER_SYMBOL,
+ )}{' '}
+ in your wallet.
+ </Text>
<Container marginTop="15px" marginBottom="15px">
<img src="/images/ether_alt.svg" height="50px" width="50px" />
</Container>
diff --git a/packages/website/ts/components/onboarding/onboarding_card.tsx b/packages/website/ts/components/onboarding/onboarding_card.tsx
index 2d49a1d20..48e8ab022 100644
--- a/packages/website/ts/components/onboarding/onboarding_card.tsx
+++ b/packages/website/ts/components/onboarding/onboarding_card.tsx
@@ -1,12 +1,12 @@
import { colors } from '@0xproject/react-shared';
import * as React from 'react';
+import * as _ from 'lodash';
import { Button } from 'ts/components/ui/button';
import { Container } from 'ts/components/ui/container';
import { IconButton } from 'ts/components/ui/icon_button';
import { Island } from 'ts/components/ui/island';
import { Text, Title } from 'ts/components/ui/text';
-import * as _ from 'lodash';
export type ContinueButtonDisplay = 'enabled' | 'disabled';
diff --git a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
index d2beeadfa..0eb7cd8af 100644
--- a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
@@ -97,13 +97,7 @@ class PlainPortalOnboardingFlow extends React.Component<PortalOnboardingFlowProp
target: '.wallet',
title: 'Step 1: Add ETH',
content: (
- <AddEthOnboardingStep
- hasEth={
- !_.isUndefined(this.props.userEtherBalanceInWei)
- ? this.props.userEtherBalanceInWei.gt(0)
- : false
- }
- />
+ <AddEthOnboardingStep userEthBalanceInWei={this.props.userEtherBalanceInWei || new BigNumber(0)} />
),
placement: 'right',
continueButtonDisplay: this._userHasVisibleEth() ? 'enabled' : 'disabled',