fix(FormattedHTML): start rming fhtmlmessages

blockchain · May 23, 2018 · 413e7ff · 413e7ff
1 parent e54a2f8
commit 413e7ff
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 10 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json
@@ -1386,4 +1386,4 @@
   "scenes.services.sfoxservice.buysellorderhistory.list.orderstatusbody.sell.rejected": "Your sell trade has been rejected. Please contact support.",
   "scenes.services.sfoxservice.buysellorderhistory.list.orderstatusbody.sell.failed": "Your sell trade failed. Please contact support.",
   "scenes.buysellorderhistory.list.orderstatusbody.unknown": "There are issues with this trade. Please contact support."
-}
+}
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/EmptyTx/index.js b/packages/blockchain-wallet-v4-frontend/src/components/EmptyTx/index.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import styled from 'styled-components'
-import { FormattedMessage, FormattedHTMLMessage } from 'react-intl'
+import { FormattedMessage } from 'react-intl'
 import { Image, Link, Text, TextGroup } from 'blockchain-info-components'
 
 const Wrapper = styled.div`
@@ -33,7 +33,7 @@ class EmptyTxContainer extends React.PureComponent {
           </Header>
           <TextGroup inline>
             <Text size='18px' weight={300}>
-              <FormattedHTMLMessage id='scenes.transactions.empty.content.body' defaultMessage='Please try filtering by a different criteria or ' />
+              <FormattedMessage id='scenes.transactions.empty.content.body' defaultMessage='Please try filtering by a different criteria or ' />
             </Text>
             <Link size='18px' href='https://support.blockchain.com/' target='_blank' referrer='noreferrer'>
               <FormattedMessage id='scenes.transactions.empty.content.body2' defaultMessage='reach out to us ' />

diff --git a/...ockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Create/AcceptTerms/template.js b/...ockchain-wallet-v4-frontend/src/modals/CoinifyExchangeData/Create/AcceptTerms/template.js
@@ -1,11 +1,11 @@
 import React from 'react'
-import { FormattedMessage, FormattedHTMLMessage } from 'react-intl'
+import { FormattedMessage } from 'react-intl'
 import styled from 'styled-components'
 import { Field, reduxForm } from 'redux-form'
 
 import Helper from 'components/BuySell/FAQ'
 import { CheckBox } from 'components/Form'
-import { Button, HeartbeatLoader, Text } from 'blockchain-info-components'
+import { Button, HeartbeatLoader, Link, Text, TextGroup } from 'blockchain-info-components'
 import { Form, ColLeft, ColRight, InputWrapper, PartnerHeader, PartnerSubHeader, ButtonWrapper, ErrorWrapper, ColRightInner } from 'components/BuySell/Signup'
 
 const AcceptTermsContainer = styled.div`
@@ -16,6 +16,7 @@ const AcceptTermsContainer = styled.div`
   a {
     color: ${props => props.theme['brand-secondary']}
   }
+  * { cursor: pointer; }
 `
 
 const AcceptTerms = (props) => {
@@ -40,11 +41,30 @@ const AcceptTerms = (props) => {
             <FormattedMessage id='coinifyexchangedata.create.verifyemail.partner.header.createyouraccount' defaultMessage='Create Your Account' />
           </PartnerHeader>
           <PartnerSubHeader>
-            <FormattedHTMLMessage id='coinifyexchangedata.create.accept.partner.header.enter_email_code' defaultMessage='We teamed up with Coinify’s exchange platform to offer buy and sell to our customers in Europe. We just sent a verification code to your {email} email address.' values={{ email: email }} />
+            <FormattedMessage id='coinifyexchangedata.create.accept.partner.header.enter_email_code' defaultMessage='We teamed up with Coinify’s exchange platform to offer buy and sell to our customers in Europe. We just sent a verification code to your {email} email address.' values={{ email: email }} />
           </PartnerSubHeader>
           <AcceptTermsContainer>
             <Field name='terms' validate={[checkboxShouldBeChecked]} component={CheckBox}>
-              <FormattedHTMLMessage id='coinifyexchangedata.create.accept.terms' defaultMessage="I accept Blockchain's <a>Terms of Service</a>, Coinify's <a>Terms of Service</a> & <a>Privary Policy</a>." />
+              <TextGroup inline>
+                <Text size='12px' weight={300}>
+                  <FormattedMessage id='coinifyexchangedata.create.accept.terms1' defaultMessage="I accept Blockchain's " />
+                </Text>
+                <Link href='https://www.blockchain.com/terms/index.html' target='_blank' referrer='noreferrer' size='12px' weight={300}>
+                  <FormattedMessage id='coinifyexchangedata.create.accept.terms2' defaultMessage='Terms of Service ' />
+                </Link>
+                <Text size='12px' weight={300}>
+                  Coinify's
+                </Text>
+                <Link href='https://coinify.com/legal/' target='_blank' referrer='noreferrer' size='12px' weight={300}>
+                  <FormattedMessage id='coinifyexchangedata.create.accept.terms3' defaultMessage='Terms of Service' />
+                </Link>
+                <Text size='12px' weight={300}>
+                  <FormattedMessage id='coinifyexchangedata.create.accept.terms4' defaultMessage=' &' />
+                </Text>
+                <Link href='https://coinify.com/legal/' target='_blank' referrer='noreferrer' size='12px' weight={300}>
+                  <FormattedMessage id='coinifyexchangedata.create.accept.terms5' defaultMessage='Privacy Policy.' />
+                </Link>
+              </TextGroup>
             </Field>
           </AcceptTermsContainer>
         </InputWrapper>
@@ -62,9 +82,17 @@ const AcceptTerms = (props) => {
           </ButtonWrapper>
           <ErrorWrapper>
             {
-              signupError && <Text size='12px' color='error' weight={300} onClick={() => updateUI({ create: 'change_email' })}>
-                <FormattedHTMLMessage id='coinifyexchangedata.create.accept.error' defaultMessage='Unfortunately this email is being used for another account. <a>Click here</a> to change it.' />
-              </Text>
+              signupError && <TextGroup inline>
+                <Text size='12px' color='error' weight={300}>
+                  <FormattedMessage id='coinifyexchangedata.create.accept.error1' defaultMessage='Unfortunately this email is being used for another account. ' />
+                </Text>
+                <Text size='12px' color='brand-secondary' cursor='pointer' weight={300} onClick={() => updateUI({ create: 'change_email' })}>
+                  <FormattedMessage id='coinifyexchangedata.create.accept.error2' defaultMessage='Click here ' />
+                </Text>
+                <Text size='12px' color='error' weight={300}>
+                  <FormattedMessage id='coinifyexchangedata.create.accept.error3' defaultMessage='to change it.' />
+                </Text>
+              </TextGroup>
             }
           </ErrorWrapper>
           {faqHelper()}