Skip to content

Commit

Permalink
fix(brokerage): fix leftover issues from merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
blockdylanb authored and milan-bc committed Jun 2, 2021
1 parent 27b8186 commit 524d2f6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 39 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { PureComponent } from 'react'
import { FormattedHTMLMessage, FormattedMessage } from 'react-intl'
import { FormattedMessage } from 'react-intl'
import { connect, ConnectedProps } from 'react-redux'
import { bindActionCreators, compose, Dispatch } from 'redux'
import { Form, InjectedFormProps, reduxForm } from 'redux-form'
Expand Down Expand Up @@ -336,10 +336,7 @@ class PreviewSell extends PureComponent<
rel='noopener noreferrer'
target='_blank'
>
<FormattedMessage
id='modals.simplebuy.summary.learn_more'
defaultMessage='Learn more'
/>
<FormattedMessage defaultMessage='Learn more' id='copy.learn_more' />
</Link>
</TextGroup>
</Text>
Expand Down Expand Up @@ -510,7 +507,7 @@ class PreviewSell extends PureComponent<
<Border />
<FlyoutWrapper>
<DisclaimerText>
<FormattedHTMLMessage
<FormattedMessage
id='modals.simplebuy.confirm.sell_description'
defaultMessage="Final amount may change due to market activity.<br /> By approving this Sell you agree to Blockchain.com’s <br /><a href='https://www.blockchain.com/legal/terms' rel='noopener noreferrer' target='_blank'>Refund Policy.</a>"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class PreviewSwap extends PureComponent<InjectedFormProps<{}, Props> & Props, St
<Icon
name='question-in-circle-filled'
size='16px'
color={true ? 'blue600' : 'grey300'}
color='blue600'
onClick={() =>
this.setState((prevState) => ({
isActiveExchangeToolTip: !prevState.isActiveExchangeToolTip
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React, { useState } from 'react'
import styled from 'styled-components'
import { FormattedMessage } from 'react-intl'
import { connect, ConnectedProps } from 'react-redux'

import { Row, Title, Value } from 'components/Flyout'
import styled from 'styled-components'

import { Icon, Link, SkeletonRectangle, Text, TextGroup } from 'blockchain-info-components'
import { SwapAccountType } from 'data/types'
import { selectors } from 'data'
import { convertCoinToFiat, UnitType } from 'blockchain-wallet-v4/src/exchange'
import { coinToString } from 'blockchain-wallet-v4/src/exchange/currency'
import FiatDisplay from 'components/Display/FiatDisplay'
import { Row, Title, Value } from 'components/Flyout'
import {
FiatType,
PaymentValue,
Expand All @@ -15,13 +16,10 @@ import {
SupportedWalletCurrenciesType,
SwapQuoteType
} from 'core/types'
import { coinToString } from 'blockchain-wallet-v4/src/exchange/currency'
import FiatDisplay from 'components/Display/FiatDisplay'
import { selectors } from 'data'
import { convertBaseToStandard } from 'data/components/exchange/services'
import { FormattedMessage } from 'react-intl'
import { RootState } from 'data/rootReducer'

import { convertCoinToFiat, UnitType } from 'blockchain-wallet-v4/src/exchange'
import { SwapAccountType } from 'data/types'

const Container = styled.div`
background-color: ${(p) => p.theme.grey000};
Expand Down
22 changes: 0 additions & 22 deletions typings/react-intl.d.ts

This file was deleted.

0 comments on commit 524d2f6

Please sign in to comment.