feat(Watch Only): watch only -> non-spendable

blockchain · May 31, 2018 · e2086dc · e2086dc
1 parent 65e72a9
commit e2086dc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/packages/blockchain-info-components/src/Banners/Banner.js b/packages/blockchain-info-components/src/Banners/Banner.js
@@ -24,6 +24,7 @@ const Container = styled.div`
 const BannerContent = styled(Text)`
   display: flex;
   flex-direction: row;
+  white-space: nowrap;
   & a:last-of-type { margin-left: 5px; }
 `
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json
@@ -110,7 +110,7 @@
   "scenes.exchange.secondstep.expiry": "Quote expires in: {timeLeft}",
   "scenes.exchange.secondstep.expiry_tooltip": "This rate will expire after 10 minutes.",
   "scenes.exchange.secondstep.expiry_tooltip2": "If that happens please restart your trade.",
-  "components.selectboxbitcoin.watchonly": "Watch Only",
+  "components.selectboxbitcoin.watchonly": "Non-Spendable",
   "components.form.tabmenubuysell.buy": "Buy",
   "components.form.tabmenubuysell.sell": "Sell",
   "components.form.tabmenubuysell.order_history": "Order History",
@@ -130,7 +130,7 @@
   "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.watch_only": "Watch Only",
+  "components.txlistitem.watch_only": "Non-Spendable",
   "scenes.transactions.bitcoin.content.pages.listitem.fee.label": "Transaction Fee: ",
   "layouts.wallet.trayright.whatsnew": "Whats New",
   "scenes.settings.addresses.menutop.btc": "Bitcoin",
@@ -927,7 +927,7 @@
   "scenes.settings.addresses.bch.wallet_balance": "Balance",
   "scenes.settings.imported_addresses.bch.wallet_actions": "Actions",
   "scenes.settings.manage_addresses.more_options": "More Options",
-  "scenes.settings.manage_addresses.watch_only": "Watch Only",
+  "scenes.settings.manage_addresses.watch_only": "Non-Spendable",
   "scenes.settings.addresses.archived_addrs": "Archived Bitcoin Addresses",
   "scenes.settings.addresses.archived_addrs_desc": "Archived addresses are addresses you may not need anymore that are hidden from the main view but still a part of your wallet. You can unarchive them any time.",
   "scenes.settings.archived_addrs.address": "Address",

diff --git a/...s/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxBitcoinAddresses/template.js b/...s/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxBitcoinAddresses/template.js
@@ -49,7 +49,7 @@ const renderItem = item => {
       }
       {path(['value', 'watchOnly'], item) &&
         <Banner type='informational' inline>
-          <FormattedMessage id='components.selectboxbitcoin.watchonly' defaultMessage='Watch Only' />
+          <FormattedMessage id='components.selectboxbitcoin.watchonly' defaultMessage='Non-Spendable' />
         </Banner>}
     </ItemWrapper>
   )

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js
@@ -102,7 +102,7 @@ const TransactionListItem = (props) => {
           { (transaction.fromWatchOnly || transaction.toWatchOnly) && (
             <BannerWrapper>
               <Banner type='informational'>
-                <FormattedMessage id='components.txlistitem.watch_only' defaultMessage='Watch Only' />
+                <FormattedMessage id='components.txlistitem.watch_only' defaultMessage='Non-Spendable' />
               </Banner>
             </BannerWrapper>
           )}

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Btc/AddressRow.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Btc/AddressRow.js
@@ -24,7 +24,7 @@ const AddressRow = ({ address, archived, coin, renderOptions }) => {
       <AddressTableCell width='50%' style={{ display: 'flex' }}>
         <AddressCell size='13px'>{address.addr}</AddressCell>
         {address.priv == null && (
-          <Banner label type='informational'><FormattedMessage id='scenes.settings.manage_addresses.watch_only' defaultMessage='Watch Only' /></Banner>
+          <Banner label type='informational'><FormattedMessage id='scenes.settings.manage_addresses.watch_only' defaultMessage='Non-Spendable' /></Banner>
         )}
       </AddressTableCell>
       <TableCell width='30%'>