fix(Translations): remove non-buysell/sfox/coinify dynamic translations

blockchain · May 23, 2018 · 7416f92 · 7416f92
1 parent fafd686
commit 7416f92
Show file tree

Hide file tree

Showing 9 changed files with 369 additions and 258 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
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ShowBtcPrivateKey/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/ShowBtcPrivateKey/template.js
@@ -12,6 +12,11 @@ const DetailTable = styled.div`
   > div { word-break: break-word; }
   > div:not(:first-child) { margin-top: 10px; }
 `
+const DetailRow = styled.div`
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+`
 const DetailRowText = styled(Text)`
   white-space: nowrap;
 `
@@ -27,37 +32,43 @@ const FirstStep = () => (
   </div>
 )
 
-const DetailRow = ({ id, defaultMessage, children }) => (
-  <div style={flex('row')}>
-    <DetailRowText size='14px' weight={400}>
-      <FormattedMessage id={id} defaultMessage={defaultMessage} />
-    </DetailRowText>
-    {':'}&nbsp;
-    {children}
-  </div>
-)
-
 const SecondStep = ({ addr, balance, priv, format, formats, onChangeFormat }) => (
   <div style={flex('row')}>
     <div style={spacing('mr-25')}>
       <QRCodeReact value={priv} size={120} />
     </div>
     <DetailTable>
-      <DetailRow id='modals.showbtcpriv.balance' defaultMessage='Balance'>
+      <DetailRow>
+        <DetailRowText size='14px' weight={400}>
+          <FormattedMessage id='modals.showbtcpriv.balance' defaultMessage='Balance' />
+        </DetailRowText>
+        {':'}&nbsp;
         <CoinDisplay coin='BTC' size='14px'>
           {balance}
         </CoinDisplay>
       </DetailRow>
-      <DetailRow id='modals.showbtcpriv.address' defaultMessage='Address'>
+      <DetailRow>
+        <DetailRowText size='14px' weight={400}>
+          <FormattedMessage id='modals.showbtcpriv.address' defaultMessage='Address' />
+        </DetailRowText>
+        {':'}&nbsp;
         <Text size='14px' weight={300}>{addr}</Text>
       </DetailRow>
-      <DetailRow id='modals.showbtcpriv.privatekey' defaultMessage='Private Key'>
+      <DetailRow>
+        <DetailRowText size='14px' weight={400}>
+          <FormattedMessage id='modals.showbtcpriv.priv_key' defaultMessage='Private Key' />
+        </DetailRowText>
+        {':'}&nbsp;
         {utils.bitcoin.formatPrivateKeyString(priv, format).fold(
           error => (<Text size='14px' weight={300} color='error'>{error.message}</Text>),
           keyString => (<Text size='14px' weight={300}>{keyString}</Text>)
         )}
       </DetailRow>
-      <DetailRow id='modals.showbtcpriv.privatekeyformat' defaultMessage='Private Key Format'>
+      <DetailRow>
+        <DetailRowText size='14px' weight={400}>
+          <FormattedMessage id='modals.showbtcpriv.priv_key_format' defaultMessage='Private Key Format' />
+        </DetailRowText>
+        {':'}&nbsp;
         <SelectInput
           label='Export Format'
           value={format}

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/ShowEthPrivateKey/template.js b/packages/blockchain-wallet-v4-frontend/src/modals/ShowEthPrivateKey/template.js
@@ -11,6 +11,11 @@ const DetailTable = styled.div`
   > div { word-break: break-word; }
   > div:not(:first-child) { margin-top: 10px; }
 `
+const DetailRow = styled.div`
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+`
 const DetailRowText = styled(Text)`
   white-space: nowrap;
 `
@@ -26,31 +31,33 @@ const FirstStep = () => (
   </div>
 )
 
-const DetailRow = ({ id, defaultMessage, children }) => (
-  <div style={flex('row')}>
-    <DetailRowText size='14px' weight={400}>
-      <FormattedMessage id={id} defaultMessage={defaultMessage} />
-    </DetailRowText>
-    {':'}&nbsp;
-    {children}
-  </div>
-)
-
 const SecondStep = ({ addr, balance, priv }) => (
   <div style={flex('row')}>
     <div style={spacing('mr-25')}>
       <QRCodeReact value={priv} size={120} />
     </div>
     <DetailTable>
-      <DetailRow id='modals.showethpriv.balance' defaultMessage='Balance'>
+      <DetailRow>
+        <DetailRowText size='14px' weight={400}>
+          <FormattedMessage id='modals.showethpriv.balance' defaultMessage='Balance' />
+        </DetailRowText>
+        {':'}&nbsp;
         <CoinDisplay coin='ETH' size='14px'>
           {balance}
         </CoinDisplay>
       </DetailRow>
-      <DetailRow id='modals.showethpriv.address' defaultMessage='Address'>
+      <DetailRow>
+        <DetailRowText size='14px' weight={400}>
+          <FormattedMessage id='modals.showethpriv.address' defaultMessage='Address' />
+        </DetailRowText>
+        {':'}&nbsp;
         <Text size='14px' weight={300}>{addr}</Text>
       </DetailRow>
-      <DetailRow id='modals.showethpriv.privatekey' defaultMessage='Private Key'>
+      <DetailRow>
+        <DetailRowText size='14px' weight={400}>
+          <FormattedMessage id='modals.showethpriv.priv_key' defaultMessage='Private Key' />
+        </DetailRowText>
+        {':'}&nbsp;
         <Text size='14px' weight={300}>{priv}</Text>
       </DetailRow>
     </DetailTable>

diff --git a/...ockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bch/Wallets/template.success.js b/...ockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Bch/Wallets/template.success.js
@@ -29,12 +29,6 @@ const Manage = () => (
   </Link>
 )
 
-const OptionItem = ({ id, text, onClick }) => (
-  <ClickableText size='small' onClick={onClick}>
-    <FormattedMessage id={id} defaultMessage={text} />
-  </ClickableText>
-)
-
 const Success = (props) => {
   const { bchAccounts, wallets, defaultId } = props.data
   const { onEditBchAccountLabel, onMakeDefault, onSetArchived, onShowXPub, search } = props
@@ -62,13 +56,23 @@ const Success = (props) => {
             color={'gray-5'}
             selectedComponent={<Manage />}
             components={[
-              <OptionItem id='scenes.settings.addresses.bch.edit_name' text='Edit Wallet Name' onClick={() => onEditBchAccountLabel(wallet.value)} />,
-              (!isDefault && !isArchived && <OptionItem id='scenes.settings.addresses.bch.make_default' text='Make Default' onClick={() => onMakeDefault(wallet.value)} />),
+              <ClickableText size='small' onClick={() => onEditBchAccountLabel(wallet.value)}>
+                <FormattedMessage id='scenes.settings.addresses.bch.edit_name' defaultMessage='Edit Wallet Name' />
+              </ClickableText>,
+              (!isDefault && !isArchived && <ClickableText size='small' onClick={() => onMakeDefault(wallet.value)}>
+                <FormattedMessage id='scenes.settings.addresses.bch.make_default' defaultMessage='Make Default' />
+              </ClickableText>),
               (!isDefault &&
                 (isArchived
-                  ? <OptionItem id='scenes.settings.addresses.bch.unarchive' text='Unarchive' onClick={() => onSetArchived(wallet.value, false)} />
-                  : <OptionItem id='scenes.settings.addresses.bch.archive' text='Archive' onClick={() => onSetArchived(wallet.value, true)} />)),
-              (!isArchived && <OptionItem id='scenes.settings.addresses.bch.show_xpub' text='Show xPub' onClick={() => onShowXPub(wallet.value)} />)
+                  ? <ClickableText size='small' onClick={() => onSetArchived(wallet.value, false)}>
+                    <FormattedMessage id='scenes.settings.addresses.bch.unarchive' defaultMessage='Unarchive' />
+                  </ClickableText>
+                  : <ClickableText size='small' onClick={() => onSetArchived(wallet.value, true)}>
+                    <FormattedMessage id='scenes.settings.addresses.bch.archive' defaultMessage='Archive' />
+                  </ClickableText>)),
+              (!isArchived && <ClickableText size='small' onClick={() => onShowXPub(wallet.value)}>
+                <FormattedMessage id='scenes.settings.addresses.bch.show_xpub' defaultMessage='Show xPub' />
+              </ClickableText>)
             ].filter(x => x)} />
         </TableCell>
       </TableRow>

diff --git a/...allet-v4-frontend/src/scenes/Settings/Addresses/Btc/ArchivedAddresses/template.success.js b/...allet-v4-frontend/src/scenes/Settings/Addresses/Btc/ArchivedAddresses/template.success.js
@@ -4,7 +4,6 @@ import { FormattedMessage } from 'react-intl'
 import { SettingDescription, SettingHeader } from 'components/Setting'
 import { Table, TableHeader, TableCell, Text } from 'blockchain-info-components'
 import { spacing } from 'services/StyleService'
-import OptionItem from '../OptionItem'
 import AddressRow from '../AddressRow'
 import { filter } from 'ramda'
 
@@ -15,13 +14,20 @@ const ArchivedAddressesContainer = SettingHeader.extend`
   justify-content: flex-start;
   margin-top: 30px;
 `
+const ClickableText = styled(Text)`
+  cursor: pointer;
+`
 
 const Success = ({ archivedAddresses, onToggleArchived, onDelete, search }) => {
   const isMatch = (address) => !search || address.addr.toLowerCase().indexOf(search) > -1
   const archivedAddressesTableRows = filter(isMatch, archivedAddresses).map((address) => (
     <AddressRow key={address.addr} archived address={address} renderOptions={() => [
-      <OptionItem id='scenes.settings.addresses.unarchive' defaultMessage='Unarchive' onClick={() => onToggleArchived(address)} />,
-      <OptionItem id='scenes.settings.addresses.delete_address' defaultMessage='Delete' onClick={() => onDelete(address)} />
+      <ClickableText size='small' onClick={() => onToggleArchived(address)}>
+        <FormattedMessage id='scenes.settings.addresses.unarchive' defaultMessage='Unarchive' />
+      </ClickableText>,
+      <ClickableText size='small' onClick={() => onDelete(address)}>
+        <FormattedMessage id='scenes.settings.addresses.delete_address' defaultMessage='Delete' />
+      </ClickableText>
     ]} />
   ))
 

diff --git a/...allet-v4-frontend/src/scenes/Settings/Addresses/Btc/ImportedAddresses/template.success.js b/...allet-v4-frontend/src/scenes/Settings/Addresses/Btc/ImportedAddresses/template.success.js
@@ -4,7 +4,6 @@ import { FormattedMessage } from 'react-intl'
 import { SettingDescription, SettingHeader } from 'components/Setting'
 import { Icon, IconButton, Table, TableHeader, TableCell, Text } from 'blockchain-info-components'
 import { spacing } from 'services/StyleService'
-import OptionItem from '../OptionItem'
 import AddressRow from '../AddressRow'
 import { filter } from 'ramda'
 
@@ -23,16 +22,25 @@ const WarningWrapper = styled.div`
     margin-right: 4px;
   }
 `
+const ClickableText = styled(Text)`
+  cursor: pointer;
+`
 
 const Success = ({ importedAddresses, onClickImport, onToggleArchived, onShowPriv, onShowSignMessage, search }) => {
   const isMatch = (address) => !search || address.addr.toLowerCase().indexOf(search) > -1
   const importedAddressesTableRows = filter(isMatch, importedAddresses).map((address) => (
     <AddressRow key={address.addr} address={address} renderOptions={() => [
-      <OptionItem id='scens.settings.addresses.archive' defaultMessage='Archive' onClick={() => onToggleArchived(address)} />
+      <ClickableText size='small' onClick={() => onToggleArchived(address)}>
+        <FormattedMessage id='scenes.settings.addresses.archive' defaultMessage='Archive' />
+      </ClickableText>
     ].concat(
       !address.priv ? [] : [
-        <OptionItem id='scens.settings.addresses.show_priv' defaultMessage='Private Key' onClick={() => onShowPriv(address)} />,
-        <OptionItem id='scens.settings.addresses.sign_message' defaultMessage='Sign Message' onClick={() => onShowSignMessage(address)} />
+        <ClickableText size='small' onClick={() => onShowPriv(address)}>
+          <FormattedMessage id='scenes.settings.addresses.show_priv' defaultMessage='Private Key' />
+        </ClickableText>,
+        <ClickableText size='small' onClick={() => onShowSignMessage(address)}>
+          <FormattedMessage id='scenes.settings.addresses.sign_message' defaultMessage='Sign Message' />
+        </ClickableText>
       ]
     )} />
   ))

diff --git a/...v4-frontend/src/scenes/Settings/Addresses/Btc/ManageAddresses/UnusedAddresses/template.js b/...v4-frontend/src/scenes/Settings/Addresses/Btc/ManageAddresses/UnusedAddresses/template.js
@@ -4,13 +4,15 @@ import { FormattedMessage } from 'react-intl'
 import { filter } from 'ramda'
 
 import { Banner, Text, Table, TableHeader, TableRow, TableCell, Icon, IconButton, Link, ComponentDropdown } from 'blockchain-info-components'
-import OptionItem from '../../OptionItem'
 
 const Fragment = React.Fragment
 const WalletLabelCell = styled.div`
   display: flex;
   align-items: center;
 `
+const ClickableText = styled(Text)`
+  cursor: pointer;
+`
 
 const MoreOptions = () => (
   <Link weight={200} size='small'>
@@ -59,10 +61,18 @@ const UnusedAddressesTemplate = ({ account, labels, receiveIndex, isDefault, der
           color={'gray-5'}
           selectedComponent={<MoreOptions />}
           components={[
-            <OptionItem id='scenes.settings.manage_addresses.edit_name' defaultMessage='Edit Name' onClick={onEditBtcAccountLabel} />,
-            (!isDefault && <OptionItem id='scenes.settings.manage_addresses.make_default' defaultMessage='Make Default' onClick={onMakeDefault} />),
-            (!isDefault && <OptionItem id='scenes.settings.manage_addresses.archive' defaultMessage='Archive' onClick={onSetArchived} />),
-            <OptionItem id='scenes.settings.manage_addresses.show_xpub' defaultMessage='Show xPub' onClick={onShowXPub} />
+            <ClickableText size='small' onClick={onEditBtcAccountLabel}>
+              <FormattedMessage id='scenes.settings.manage_addresses.edit_name' defaultMessage='Edit Name' />
+            </ClickableText>,
+            (!isDefault && <ClickableText size='small' onClick={onMakeDefault}>
+              <FormattedMessage id='scenes.settings.manage_addresses.make_default' defaultMessage='Make Default' />
+            </ClickableText>),
+            (!isDefault && <ClickableText size='small' onClick={onSetArchived}>
+              <FormattedMessage id='scenes.settings.manage_addresses.archive' defaultMessage='Archive' />
+            </ClickableText>),
+            <ClickableText size='small' onClick={onShowXPub}>
+              <FormattedMessage id='scenes.settings.manage_addresses.show_xpub' defaultMessage='Show xPub' />
+            </ClickableText>
           ].filter(x => x)} />
       </div>
       <Text weight={400} size='14px' style={{ marginTop: 25 }}>

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Btc/OptionItem.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Settings/Addresses/Btc/OptionItem.js
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Menu/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/Ether/Menu/template.js
@@ -57,12 +57,6 @@ const ClickableText = styled(Text)`
   cursor: pointer;
 `
 
-const OptionItem = ({ id, defaultMessage, onClick }) => (
-  <ClickableText size='small' onClick={onClick}>
-    <FormattedMessage id={id} defaultMessage={defaultMessage} />
-  </ClickableText>
-)
-
 const PrivateKeys = () => (
   <Link weight={300} size='12px'>
     <FormattedMessage id='scenes.transactions.ether.privatekeys' defaultMessage='Private Keys' />
@@ -86,8 +80,12 @@ const Menu = (props) => {
                 color={'gray-5'}
                 selectedComponent={<PrivateKeys />}
                 components={[
-                  <OptionItem id='scenes.transactions.ether.export.privatekey' defaultMessage='Export Private Key' onClick={() => onShowPrivateKey(false)} />,
-                  <OptionItem id='scenes.transactions.ether.export.archived' defaultMessage='Export Archived Private Key' onClick={() => onShowPrivateKey(true)} />
+                  <ClickableText size='small' onClick={() => onShowPrivateKey(false)}>
+                    <FormattedMessage id='scenes.transactions.ether.export.privatekey' defaultMessage='Export Private Key' />
+                  </ClickableText>,
+                  <ClickableText size='small' onClick={() => onShowPrivateKey(true)}>
+                    <FormattedMessage id='scenes.transactions.ether.export.archived' defaultMessage='Export Archived Private Key' />
+                  </ClickableText>
                 ].filter(x => x)} /> : <Link size={'12px'} weight={300} onClick={() => onShowPrivateKey(false)}><FormattedMessage id='scenes.transactions.ether.export.privatekey' defaultMessage='Export Private Key' /></Link>
             }
           </PrivateKeysWrapper>