Fix incorrect usages of I18nMessage

ui/component/walletFiatBalance/view.jsx

@@ -5,7 +5,6 @@ import React from 'react';
 import Button from 'component/button';
 import Card from 'component/common/card';
 import Icon from 'component/common/icon';
-import I18nMessage from 'component/i18nMessage';
 import { Lbryio } from 'lbryinc';
 import { getStripeEnvironment } from 'util/stripe';
 let stripeEnvironment = getStripeEnvironment();
@@ -54,18 +53,15 @@ const WalletBalance = () => {
             </>
           }
           subtitle={
-            accountStatusResponse && accountStatusResponse.total_received_unpaid > 0 ? (
+            accountStatusResponse && accountStatusResponse.total_received_unpaid > 0
-              <I18nMessage>
+              ? __('This is your pending balance that will be automatically sent to your bank account.')
-                This is your pending balance that will be automatically sent to your bank account.
+              : __('When you begin to receive tips your balance will be updated here.')
-              </I18nMessage>
-            ) : (
-              <I18nMessage>When you begin to receive tips your balance will be updated here.</I18nMessage>
-            )
           }
           actions={
             <>
               <h2 className="section__title--small">
-                ${(accountStatusResponse && accountStatusResponse.total_received_unpaid / 100) || 0} {__('Total Received Tips')}
+                ${(accountStatusResponse && accountStatusResponse.total_received_unpaid / 100) || 0}{' '}
+                {__('Total Received Tips')}
               </h2>
 
               <h2 className="section__title--small">

ui/component/walletSend/view.jsx

@@ -6,8 +6,6 @@ import { Form, FormField } from 'component/common/form';
 import { Formik } from 'formik';
 import validateSendTx from 'util/form-validation';
 import Card from 'component/common/card';
-import I18nMessage from 'component/i18nMessage';
-import LbcSymbol from 'component/common/lbc-symbol';
 import WalletSpendableBalanceHelp from 'component/walletSpendableBalanceHelp';
 import classnames from 'classnames';
 import ChannelSelector from 'component/channelSelector';
@@ -88,9 +86,7 @@ class WalletSend extends React.PureComponent<Props> {
     return (
       <Card
         title={__('Send Credits')}
-        subtitle={
+        subtitle={__('Send Credits to your friends or favorite creators.')}
-          <I18nMessage tokens={{ lbc: <LbcSymbol /> }}>Send Credits to your friends or favorite creators.</I18nMessage>
-        }
         actions={
           <Formik
             initialValues={{

ui/page/buy/view.jsx

@@ -12,7 +12,6 @@ import { SUPPORTED_MOONPAY_COUNTRIES } from 'constants/moonpay';
 import { useHistory } from 'react-router';
 import Button from 'component/button';
 import Nag from 'component/common/nag';
-import I18nMessage from 'component/i18nMessage';
 import LbcSymbol from 'component/common/lbc-symbol';
 import { SIMPLE_SITE } from 'config';
 // import classnames from 'classnames';
@@ -97,19 +96,7 @@ export default function BuyPage(props: Props) {
 
   const title = __('Buy Credits');
   const subtitle = (
-    <I18nMessage
+    <Button button="link" label={__('Learn more')} href="https://odysee.com/@OdyseeHelp:b/BuyingSellingLBRYCredits:b" />
-      tokens={{
-        learn_more: (
-          <Button
-            button="link"
-            label={__('Learn more')}
-            href="https://odysee.com/@OdyseeHelp:b/BuyingSellingLBRYCredits:b"
-          />
-        ),
-      }}
-    >
-      %learn_more%.
-    </I18nMessage>
   );
 
   if (MOONPAY_DOWN) {

ui/page/top/view.jsx

@@ -7,7 +7,6 @@ import ClaimEffectiveAmount from 'component/claimEffectiveAmount';
 import SearchTopClaim from 'component/searchTopClaim';
 import * as CS from 'constants/claim_search';
 import Button from 'component/button';
-import I18nMessage from 'component/i18nMessage';
 import * as PAGES from 'constants/pages';
 import { SIMPLE_SITE } from 'config';
 
@@ -31,22 +30,8 @@ function TopPage(props: Props) {
         streamType={SIMPLE_SITE ? CS.CONTENT_ALL : undefined}
         meta={
           <div className="search__top-links">
-            <I18nMessage
+            <Button button="secondary" navigate={`/$/${PAGES.REPOST_NEW}?to=${queryName}`} label={__('Repost Here')} />
-              tokens={{
+            <Button button="secondary" onClick={() => beginPublish(queryName)} label={__('Publish Here')} />
-                repost: (
-                  <Button
-                    button="secondary"
-                    navigate={`/$/${PAGES.REPOST_NEW}?to=${queryName}`}
-                    label={__('Repost Here')}
-                  />
-                ),
-                publish: (
-                  <Button button="secondary" onClick={() => beginPublish(queryName)} label={__('Publish Here')} />
-                ),
-              }}
-            >
-              %repost% %publish%
-            </I18nMessage>
           </div>
         }
         includeSupportAction