fix(Tx Feed): 0 confirmations not showing

packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json

@@ -142,11 +142,75 @@
   "scenes.transactions.empty.content.body3": "if you need help.",
   "components.exchangetimeline.error.failed": "This trade has failed.",
   "components.exchangetimeline.error.failed2": "Any funds broadcast from your wallet will be returned minus the transaction fee.",
-  "components.exchangetimeline.error.failed3": "Please return to the transaction tab to start a new trade",
+  "components.exchangetimeline.error.failed3": "Please return to the exchange tab to start a new trade",
+  "components.exchangetimeline.sendingfunds": "Sending funds",
   "components.exchangetimeline.funds": "Funds sent",
   "components.exchangetimeline.exchange.inprogress": "Exchange In Progress",
   "components.exchangetimeline.refunded": "Trade refunded",
   "components.exchangetimeline.trade": "Trade complete",
+  "scenes.reset2fa.thirdstep.newCaptcha": "Refresh",
+  "scenes.exchange.secondstep.expiry": "Quote expires in: {timeLeft}",
+  "scenes.exchange.secondstep.expiry.tooltip1": "This rate will expire after {time}.",
+  "scenes.exchange.secondstep.expiry.tooltip2": "If that happens please restart your trade.",
+  "components.selectboxbitcoin.watchonly": "Watch Only",
+  "components.form.tabmenubuysell.buy": "Buy",
+  "components.form.tabmenubuysell.sell": "Sell",
+  "components.form.tabmenubuysell.orderhistory": "Order History",
+  "components.form.tabmenutransactionstatus.all": "All",
+  "components.form.tabmenutransactionstatus.received": "Received",
+  "components.form.tabmenutransactionstatus.sent": "Sent",
+  "components.form.tabmenutransactionstatus.transferred": "Transferred",
+  "components.qrreader.warning": "Your browser does not have webcam support.",
+  "scenes.register.registerform.shapeshift.terms": "terms and conditions",
+  "tos": "Terms of Service",
+  "privacypolicy": "Privacy Policy.",
+  "scenes.register.registerform.blockchain.read": "I have read and agreed to the",
+  "scenes.register.registerform.blockchain.terms": "Terms of Service",
+  "components.transactionlistitem.addresses.to": "To: ",
+  "components.transactionlistitem.addresses.from": "From: ",
+  "scenes.transactions.content.pages.listitem.confirmation.confirmed": "Transaction Confirmed",
+  "scenes.transactions.content.pages.listitem.confirmation.unconfirmed": "Pending: {conf}/{total} Confirmations",
+  "scenes.transactions.content.list.listitem.transactionunconfirmed": "Your transaction will be complete after it has {minConfirmations} confirmations.",
+  "components.editdescription.add": "Add a description",
+  "components.transactionlistitem.fiatattime.valuewhensent": "Value when sent: ",
+  "components.transactionlistitem.fiatattime.valuewhenreceived": "Value when received: ",
+  "components.transactionlistitem.fiatattime.notasked.view": "view",
+  "scenes.transactions.bitcoin.content.list.listitem.status.sent": "Sent",
+  "scenes.transactions.bitcoin.content.list.listitem.status.received": "Received",
+  "scenes.transactions.bitcoin.content.list.listitem.status.transferred": "Transferred",
+  "components.txlistitem.watchonly": "Watch Only",
+  "scenes.transactions.bitcoin.content.pages.listitem.fee.label": "Transaction Fee: ",
+  "scenes.exchange.menutop.exchange": "Exchange",
+  "scenes.exchange.menutop.history": "Order History",
+  "scenes.exchange.menutop.poweredby": "Powered by",
+  "layouts.public.footer.explorer": "Data",
+  "layouts.public.footer.about": "About",
+  "layouts.public.footer.blog": "Blog",
+  "layouts.public.footer.support": "Support",
+  "layouts.wallet.header.logout.signout": "Sign out",
+  "layouts.wallet.menuleft.footer.termsofservice": "ToS",
+  "layouts.wallet.menuleft.footer.privacypolicy": "Privacy Policy",
+  "layouts.wallet.menuleft.footer.about": "About",
+  "layouts.wallet.menuleft.navigation.dashboard": "Dashboard",
+  "layouts.wallet.menuleft.navigation.transactions": "Transactions",
+  "layouts.wallet.menuleft.navigation.transactions.bitcoin": "Bitcoin",
+  "layouts.wallet.menuleft.navigation.transactions.ether": "Ether",
+  "layouts.wallet.menuleft.navigation.transactions.bch": "Bitcoin Cash",
+  "layouts.wallet.menuleft.navigation.buybitcoin": "Buy & sell bitcoin",
+  "layouts.wallet.menuleft.navigation.exchange": "Exchange",
+  "layouts.wallet.menuleft.navigation.securitycenter": "Security center",
+  "layouts.wallet.menuleft.navigation.settings": "Settings",
+  "layouts.wallet.menuleft.navigation.general": "General",
+  "layouts.wallet.menuleft.navigation.preferences": "Preferences",
+  "layouts.wallet.menuleft.navigation.addresses": "Wallets & Addresses",
+  "layouts.wallet.menutop.send": "Send",
+  "layouts.wallet.menutop.request": "Request",
+  "wallet.menutop.balance.refresh": "Refresh {curr} data",
+  "scenes.wallet.menutop.balance.bitcoinbalance": "Bitcoin Balance",
+  "scenes.wallet.menutop.balance.etherbalance": "Ether Balance",
+  "scenes.wallet.menutop.balance.bchbalance": "Bitcoin Cash Balance",
+  "scenes.wallet.menutop.balance.totalbalance": "Total Balance",
+  "layouts.wallet.menutop.bank": "Be your own bank.",
   "scenes.faq.group.walletfunctionality.title": "Wallet Functionality",
   "scenes.faq.group.walletfunctionality.question1": "How do I receive/send funds?",
   "scenes.faq.group.walletfunctionality.answer1.one": "To receive funds, the sender needs your address. Your wallet will automatically generate a new address for each bitcoin or bitcoin cash transaction you make. For all ether transactions, your address will remain the same.",
@@ -257,87 +321,20 @@
   "scenes.faq.group.coinify.question7": "How can I exchange cryptocurrencies within my Blockchain wallet?",
   "scenes.faq.group.coinify.answer7": ".",
   "layouts.wallet.trayright.faq": "Frequently Asked Questions",
-  "scenes.reset2fa.thirdstep.newCaptcha": "Refresh",
-  "scenes.exchange.secondstep.expiry": "Quote expires in: {timeLeft}",
-  "scenes.exchange.secondstep.expiry.tooltip1": "This rate will expire after {time}.",
-  "scenes.exchange.secondstep.expiry.tooltip2": "If that happens please restart your trade.",
-  "components.selectboxbitcoin.watchonly": "Watch Only",
-  "components.form.tabmenubuysell.buy": "Buy",
-  "components.form.tabmenubuysell.sell": "Sell",
-  "components.form.tabmenubuysell.orderhistory": "Order History",
-  "components.form.tabmenutransactionstatus.all": "All",
-  "components.form.tabmenutransactionstatus.received": "Received",
-  "components.form.tabmenutransactionstatus.sent": "Sent",
-  "components.form.tabmenutransactionstatus.transferred": "Transferred",
-  "components.qrreader.warning": "Your browser does not have webcam support.",
-  "scenes.register.registerform.shapeshift.terms": "terms and conditions",
-  "tos": "Terms of Service",
-  "privacypolicy": "Privacy Policy.",
-  "scenes.register.registerform.blockchain.read": "I have read and agreed to the",
-  "scenes.register.registerform.blockchain.terms": "Terms of Service",
-  "components.transactionlistitem.addresses.to": "To: ",
-  "components.transactionlistitem.addresses.from": "From: ",
-  "scenes.transactions.content.pages.listitem.confirmation.confirmed": "Transaction Confirmed",
-  "scenes.transactions.content.pages.listitem.confirmation.unconfirmed": "Pending: {count}/{total} Confirmations",
-  "scenes.transactions.content.list.listitem.transactionunconfirmed": "Your transaction will be complete after it has {minConfirmations} confirmations.",
-  "components.editdescription.add": "Add a description",
-  "components.transactionlistitem.fiatattime.valuewhensent": "Value when sent: ",
-  "components.transactionlistitem.fiatattime.valuewhenreceived": "Value when received: ",
-  "components.transactionlistitem.fiatattime.notasked.view": "view",
-  "scenes.transactions.bitcoin.content.list.listitem.status.sent": "Sent",
-  "scenes.transactions.bitcoin.content.list.listitem.status.received": "Received",
-  "scenes.transactions.bitcoin.content.list.listitem.status.transferred": "Transferred",
-  "components.txlistitem.watchonly": "Watch Only",
-  "scenes.transactions.bitcoin.content.pages.listitem.fee.label": "Transaction Fee: ",
   "layouts.wallet.trayright.whatsnew": "Whats New",
+  "layouts.wallet.header.whatsnew.whatsnew.faqlink.learnmore": "Learn More",
+  "layouts.wallet.header.whatsnew.whatsnew.learnmore": "Learn More",
   "layouts.wallet.header.whatsnew.whatsnew.title12": "Import Funds from MyEtherWallet",
   "layouts.wallet.header.whatsnew.whatsnew.desc12": "You can now import your ether from your MyEtherWallet backup directly into your Blockchain wallet.",
-  "layouts.wallet.header.whatsnew.whatsnew.link.12": "Learn More",
   "layouts.wallet.header.whatsnew.whatsnew.title11": "New Bitcoin Cash Address Format",
   "layouts.wallet.header.whatsnew.whatsnew.desc11": "Bitcoin Cash addresses now follow the CashAddr format.",
-  "layouts.wallet.header.whatsnew.whatsnew.link.11": "Learn More",
   "layouts.wallet.header.whatsnew.whatsnew.title10": "Bitcoin Cash",
-  "layouts.wallet.header.whatsnew.whatsnew.link.10": "Learn More",
   "layouts.wallet.header.whatsnew.whatsnew.title9": "Exchange Assets",
   "layouts.wallet.header.whatsnew.whatsnew.desc9": "You can exchange between bitcoin, ether, and bitcoin cash directly from your Blockchain wallet",
-  "layouts.wallet.header.whatsnew.whatsnew.link.9": "Learn More",
   "layouts.wallet.header.whatsnew.whatsnew.title8": "Send & Receive Ether",
   "layouts.wallet.header.whatsnew.whatsnew.desc8": "You can now send and receive ether from your Blockchain wallet!",
-  "layouts.wallet.header.whatsnew.whatsnew.link.8": "Learn More",
   "layouts.wallet.header.whatsnew.whatsnew.title7": "Sell Bitcoin",
   "layouts.wallet.header.whatsnew.whatsnew.desc7": "You can now sell bitcoin directly from your Blockchain wallet!",
-  "layouts.wallet.header.whatsnew.whatsnew.link.7": "Learn More",
-  "scenes.exchange.menutop.exchange": "Exchange",
-  "scenes.exchange.menutop.history": "Order History",
-  "scenes.exchange.menutop.poweredby": "Powered by",
-  "layouts.public.footer.explorer": "Data",
-  "layouts.public.footer.about": "About",
-  "layouts.public.footer.blog": "Blog",
-  "layouts.public.footer.support": "Support",
-  "layouts.wallet.header.logout.signout": "Sign out",
-  "layouts.wallet.menuleft.footer.termsofservice": "ToS",
-  "layouts.wallet.menuleft.footer.privacypolicy": "Privacy Policy",
-  "layouts.wallet.menuleft.footer.about": "About",
-  "layouts.wallet.menuleft.navigation.dashboard": "Dashboard",
-  "layouts.wallet.menuleft.navigation.transactions": "Transactions",
-  "layouts.wallet.menuleft.navigation.transactions.bitcoin": "Bitcoin",
-  "layouts.wallet.menuleft.navigation.transactions.ether": "Ether",
-  "layouts.wallet.menuleft.navigation.transactions.bch": "Bitcoin Cash",
-  "layouts.wallet.menuleft.navigation.buybitcoin": "Buy & sell bitcoin",
-  "layouts.wallet.menuleft.navigation.exchange": "Exchange",
-  "layouts.wallet.menuleft.navigation.securitycenter": "Security center",
-  "layouts.wallet.menuleft.navigation.settings": "Settings",
-  "layouts.wallet.menuleft.navigation.general": "General",
-  "layouts.wallet.menuleft.navigation.preferences": "Preferences",
-  "layouts.wallet.menuleft.navigation.addresses": "Wallets & Addresses",
-  "layouts.wallet.menutop.send": "Send",
-  "layouts.wallet.menutop.request": "Request",
-  "wallet.menutop.balance.refresh": "Refresh {curr} data",
-  "scenes.wallet.menutop.balance.bitcoinbalance": "Bitcoin Balance",
-  "scenes.wallet.menutop.balance.etherbalance": "Ether Balance",
-  "scenes.wallet.menutop.balance.bchbalance": "Bitcoin Cash Balance",
-  "scenes.wallet.menutop.balance.totalbalance": "Total Balance",
-  "layouts.wallet.menutop.bank": "Be your own bank.",
   "modals.addbitcoinwallet.title": "Add New Bitcoin Wallet",
   "modals.addbitcoinwallet.wallet": "Wallet Name",
   "modals.addbitcoinwallet.button": "Create New Bitcoin Wallet",
@@ -901,7 +898,7 @@
   "modals.exchange.shapeshift.exchangerate": "Exchange rate",
   "modals.exchange.shapeshift.exchangetooltip": "This rate may change depending on the market price at the time of your transaction.",
   "modals.exchange.shapeshift.fee": "Transaction fee",
-  "modals.exchange.shapeshift.feetooltip": "This fee is used to send the outgoing exchange funds to ShapeShift.",
+  "modals.exchange.shapeshift.feetooltip": "This fee is used to send the incoming exchange funds from ShapeShift.",
   "modals.exchange.shapeshift.orderid": "Order ID",
   "modals.exchange.shapeshift.close": "Close",
   "scenes.exchangehistory.empty.history": "Your order history",

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

@@ -42,7 +42,7 @@ const Confirmations = (props) => {
         </Text>
       ) : (
         <Text size='12px' weight={300} color='gray-3'>
-          <FormattedMessage id='scenes.transactions.content.pages.listitem.confirmation.unconfirmed' defaultMessage='Pending: {count}/{total} Confirmations' values={{ count: props.confirmations, total: props.minConfirmations }} />
+          <FormattedMessage id='scenes.transactions.content.pages.listitem.confirmation.unconfirmed' defaultMessage='Pending: {count, number}/{total} Confirmations' values={{ count: props.confirmations, total: props.minConfirmations }} />
         </Text>
       )}
       <IconWrapper>

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

@@ -142,6 +142,7 @@ TransactionListItem.propTypes = {
   transaction: PropTypes.shape({
     type: PropTypes.string.isRequired,
     amount: PropTypes.number.isRequired,
+    confirmations: PropTypes.number,
     time: PropTypes.number.isRequired,
     to: PropTypes.string.isRequired,
     from: PropTypes.string.isRequired,