Merge pull request #588 from blockchain/feature/lb-bugs

Feature/lb bugs

packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/Confirmations/index.js

@@ -15,6 +15,9 @@ const Wrapper = styled.div`
     flex-direction: row;
   }
 `
+const ConfirmationsText = styled(Text)`
+    * { white-space: nowrap; }
+`
 
 const TransactionTooltip = styled.div`
   position: relative;
@@ -42,17 +45,17 @@ const Confirmations = (props) => {
           <FormattedMessage id='scenes.transactions.content.pages.listitem.confirmation.confirmed' defaultMessage='Transaction Confirmed' />
         </Text>
       ) : (
-        <Text size='12px' weight={300} color='gray-3'>
+        <ConfirmationsText size='12px' weight={300} color='gray-3'>
           <FormattedMessage id='scenes.transactions.content.pages.listitem.confirmation.unconfirmed' defaultMessage='Pending: {count}/{total} Confirmations' values={{ count: toString(props.confirmations), total: props.minConfirmations }} />
-        </Text>
+        </ConfirmationsText>
       )}
       <IconWrapper>
         {
           props.confirmations < props.minConfirmations &&
           <TransactionTooltip>
             <Tooltip colors={'red'}>
               <FormattedMessage id='scenes.transactions.content.list.listitem.transactionunconfirmed' defaultMessage='Your transaction will be complete after it has {minConfirmations} confirmations.' values={{minConfirmations: props.minConfirmations}} />
-              <Link href='https://support.blockchain.com/hc/en-us/articles/217116406-Why-hasn-t-my-transaction-confirmed-yet-' target='_blank' size='10px' weight={300} altFont>Learn more.</Link>
+              <Link href='https://support.blockchain.com/hc/en-us/articles/217116406-Why-hasn-t-my-transaction-confirmed-yet-' target='_blank' size='11px' weight={300} altFont>Learn more.</Link>
             </Tooltip>
           </TransactionTooltip>
         }

packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js

@@ -49,6 +49,7 @@ const DetailsColumn = styled.div`
   white-space: nowrap;
   width: 35%;
 
+
   @media(min-width: 992px) { display: flex; }
 `
 const ConfirmationColumn = styled.div`
@@ -58,7 +59,6 @@ const ConfirmationColumn = styled.div`
   align-items: flex-start;
   width: 20%;
 
-  * { white-space: nowrap; }
   @media(min-width: 1200px) { width: 15%; }
 `
 const AmountColumn = styled.div`

packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/WhatsNew/WhatsNewContent/index.js

@@ -9,19 +9,13 @@ const LearnMore = () => <FormattedMessage id='layouts.wallet.header.whatsnew.wha
 
 const Announcements = [
   {
-    title: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.title12' defaultMessage='Import Funds from MyEtherWallet' />,
-    desc: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.desc12' defaultMessage='You can now import your ether from your MyEtherWallet backup directly into your Blockchain wallet.' />,
-    date: 'February 10, 2018',
-    link: <LinkContainer to='/settings/info'><Link size='13px' weight={300}><LearnMore /></Link></LinkContainer>
-
-  }, {
     title: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.title11' defaultMessage='New Bitcoin Cash Address Format' />,
     desc: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.desc11' defaultMessage='Bitcoin Cash addresses now follow the CashAddr format.' />,
     date: 'January 18, 2018',
     link: <FaqLink />
   }, {
     title: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.title10' defaultMessage='Bitcoin Cash' />,
-    desc: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.desc10' defaultMessage='If you had bitcoin in your wallet before August 1, 2017, you can now access Bitcoin Cash via Settings > General.' />,
+    desc: <FormattedMessage id='layouts.wallet.header.whatsnew.whatsnew.desc10' defaultMessage='If you had bitcoin in your wallet before August 1, 2017, you can now access Bitcoin Cash in your Blockchain wallet.' />,
     date: 'October 3, 2017',
     link: <LinkContainer to='/bch/transactions'><Link size='13px' weight={300}><LearnMore /></Link></LinkContainer>
   }, {

packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/WhatsNew/__snapshots__/index.spec.js.snap

@@ -5,54 +5,6 @@ exports[`Whats New renders correctly 1`] = `
   <WhatsNew__Container>
     <WhatsNew__Item
       key="0"
-    >
-      <WhatsNew__RowTitle>
-        <text
-          size="14px"
-          weight={600}
-        >
-          <FormattedMessage
-            defaultMessage="Import Funds from MyEtherWallet"
-            id="layouts.wallet.header.whatsnew.whatsnew.title12"
-            values={Object {}}
-          />
-        </text>
-      </WhatsNew__RowTitle>
-      <WhatsNew__RowDate>
-        <text
-          color="gray-3"
-          size="12px"
-          weight={400}
-        >
-          February 10, 2018
-        </text>
-      </WhatsNew__RowDate>
-      <WhatsNew__RowContent>
-        <text-group
-          inline={true}
-        >
-          <text
-            size="12px"
-            weight={300}
-          >
-            <FormattedMessage
-              defaultMessage="You can now import your ether from your MyEtherWallet backup directly into your Blockchain wallet."
-              id="layouts.wallet.header.whatsnew.whatsnew.desc12"
-              values={Object {}}
-            />
-          </text>
-          <LinkContainer
-            activeClassName="active"
-            exact={false}
-            replace={false}
-            strict={false}
-            to="/settings/info"
-          />
-        </text-group>
-      </WhatsNew__RowContent>
-    </WhatsNew__Item>
-    <WhatsNew__Item
-      key="1"
     >
       <WhatsNew__RowTitle>
         <text
@@ -94,7 +46,7 @@ exports[`Whats New renders correctly 1`] = `
       </WhatsNew__RowContent>
     </WhatsNew__Item>
     <WhatsNew__Item
-      key="2"
+      key="1"
     >
       <WhatsNew__RowTitle>
         <text
@@ -126,7 +78,7 @@ exports[`Whats New renders correctly 1`] = `
             weight={300}
           >
             <FormattedMessage
-              defaultMessage="If you had bitcoin in your wallet before August 1, 2017, you can now access Bitcoin Cash via Settings > General."
+              defaultMessage="If you had bitcoin in your wallet before August 1, 2017, you can now access Bitcoin Cash in your Blockchain wallet."
               id="layouts.wallet.header.whatsnew.whatsnew.desc10"
               values={Object {}}
             />
@@ -142,7 +94,7 @@ exports[`Whats New renders correctly 1`] = `
       </WhatsNew__RowContent>
     </WhatsNew__Item>
     <WhatsNew__Item
-      key="3"
+      key="2"
     >
       <WhatsNew__RowTitle>
         <text
@@ -190,7 +142,7 @@ exports[`Whats New renders correctly 1`] = `
       </WhatsNew__RowContent>
     </WhatsNew__Item>
     <WhatsNew__Item
-      key="4"
+      key="3"
     >
       <WhatsNew__RowTitle>
         <text
@@ -238,7 +190,7 @@ exports[`Whats New renders correctly 1`] = `
       </WhatsNew__RowContent>
     </WhatsNew__Item>
     <WhatsNew__Item
-      key="5"
+      key="4"
     >
       <WhatsNew__RowTitle>
         <text

packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/index.js

@@ -86,7 +86,7 @@ class TrayRightContainer extends React.PureComponent {
         <Header>
           <Text size='20px' weight={300}>
             {content === 'faq' && <FormattedMessage id='layouts.wallet.trayright.faq' defaultMessage='Frequently Asked Questions' />}
-            {content === 'whatsnew' && <FormattedMessage id='layouts.wallet.trayright.whatsnew' defaultMessage='Whats New' />}
+            {content === 'whatsnew' && <FormattedMessage id='layouts.wallet.trayright.whatsnew' defaultMessage='What’s New' />}
           </Text>
           <Icon size='20px' name='close' cursor onClick={this.handleClose} />
         </Header>

packages/blockchain-wallet-v4-frontend/src/modals/SendBitcoin/FirstStep/template.success.js

@@ -140,6 +140,7 @@ const FirstStep = props => {
           <FeeFormContainer toggled={feePerByteToggled}>
             <FeeFormLabel>
               <FormattedMessage id='modals.sendbtc.firststep.fee' defaultMessage='Transaction fee:' />
+              <span>&nbsp;</span>
               {!feePerByteToggled && <Field name='feePerByte' component={SelectBox} elements={feePerByteElements} />}
               {feePerByteToggled &&
                 <FeeOptionsContainer>

packages/blockchain-wallet-v4-frontend/src/modals/SfoxExchangeData/Upload/template.js

@@ -110,7 +110,7 @@ const Upload = (props) => {
       <ColLeft>
         <ColLeftInner>
           <PartnerHeader style={{ ...flex('row align/center') }}>
-            <FormattedMessage id='sfoxexchangedata.upload.title' defaultMessage='The Hidden Details' />
+            <FormattedMessage id='sfoxexchangedata.upload.title' defaultMessage='Let’s Get to Know You' />
             <LockIcon name='lock-filled' />
           </PartnerHeader>
           <TitleStrings idType={idType} />

packages/blockchain-wallet-v4-frontend/src/modals/SfoxExchangeData/Verify/Address.js

@@ -35,7 +35,7 @@ const Address = (props) => {
       <ColLeft>
         <InputWrapper>
           <PartnerHeader>
-            <FormattedMessage id='sfoxexchangedata.verify.partner.header' defaultMessage="Let's Get to Know You" />
+            <FormattedMessage id='sfoxexchangedata.verify.partner.header1' defaultMessage="Let's Get to Know You" />
           </PartnerHeader>
           <PartnerSubHeader>
             <FormattedMessage id='sfoxexchangedata.verify.partner.subheader' defaultMessage="There's so much we'd love to know about you, but we only need a few things. Fear not, all of your personal information will be sent directly to SFOX, not saved in your Blockchain wallet." />