Merge branch 'master' of https://github.com/OdyseeTeam/odysee-frontend

static/app-strings.json

@@ -1022,7 +1022,6 @@
   "Confirm Transaction": "Confirm Transaction",
   "Once the transaction is sent, it cannot be reversed.": "Once the transaction is sent, it cannot be reversed.",
   "Sending": "Sending",
-  "From": "From",
   "Only creators that verify cash accounts can receive tips": "Only creators that verify cash accounts can receive tips",
   "Send a tip directly from your attached card": "Send a tip directly from your attached card",
   "Amount must be at least one dollar": "Amount must be at least one dollar",
@@ -1736,7 +1735,6 @@
   "Enter desired %lbc%": "Enter desired %lbc%",
   "Estimated BTC price": "Estimated BTC price",
   "Start Swap": "Start Swap",
-  "To": "To",
   "Receiving": "Receiving",
   "Send crypto to the address provided and you will be sent an equivalent amount of Credits. You can pay with BCH, LTC, ETH, USDC or DAI after starting the swap.": "Send crypto to the address provided and you will be sent an equivalent amount of Credits. You can pay with BCH, LTC, ETH, USDC or DAI after starting the swap.",
   "Swap Crypto for %lbc%": "Swap Crypto for %lbc%",
@@ -1943,6 +1941,7 @@
   "List is Empty": "List is Empty",
   "Confirm List Unpublish": "Confirm List Unpublish",
   "This will permanently delete the list.": "This will permanently delete the list.",
+  "Type \"%list_name%\" to confirm.": "Type \"%list_name%\" to confirm.",
   "Chat": "Chat",
   "Tipped": "Tipped",
   "Fromage": "Fromage",
@@ -2037,6 +2036,7 @@
   "Outgoing": "Outgoing",
   "Credits --[transactions tab]--": "Credits",
   "USD --[transactions tab]--": "USD",
+  "Currency --[transactions tab]--": "Currency",
   "Receiving Channel Name": "Receiving Channel Name",
   "Tip Location": "Tip Location",
   "Amount (USD)": "Amount (USD)",

ui/component/walletSwap/view.jsx

@@ -572,7 +572,7 @@ function WalletSwap(props: Props) {
           />
           <div className="help">{__('Use the copy button to ensure the EXACT amount is sent!')}</div>
           {getGap()}
-          <div className="confirm__label">{__('To')}</div>
+          <div className="confirm__label">{__('To --[the tip recipient]--')}</div>
           <CopyableText primaryButton copyable={getCoinAddress(coin)} snackMessage={__('Address copied.')} />
           <div className="confirm__value--subitem">
             <Button

ui/modal/modalConfirmTransaction/view.jsx

@@ -51,21 +51,35 @@ class ModalConfirmTransaction extends React.PureComponent<Props> {
                   <div className="confirm__label">{__('Sending')}</div>
                   <div className="confirm__value">{<LbcSymbol postfix={amount} size={22} />}</div>
 
-                  {!isAddress && <div className="confirm__label">{__('From')}</div>}
+                  {!isAddress && <div className="confirm__label">{__('From --[the tip sender]--')}</div>}
                   {!isAddress && (
                     <div className="confirm__value">
                       {incognito ? (
                         'Anonymous'
                       ) : (
-                        <ClaimPreview key={activeChannelUrl} uri={activeChannelUrl} actions={''} type={'small'} hideMenu hideRepostLabel />
+                        <ClaimPreview
+                          key={activeChannelUrl}
+                          uri={activeChannelUrl}
+                          actions={''}
+                          type={'small'}
+                          hideMenu
+                          hideRepostLabel
+                        />
                       )}
                     </div>
                   )}
 
-                  <div className="confirm__label">{__('To')}</div>
+                  <div className="confirm__label">{__('To --[the tip recipient]--')}</div>
                   <div className="confirm__value">
                     {!isAddress ? (
-                      <ClaimPreview key={destination} uri={destination} actions={''} type={'small'} hideMenu hideRepostLabel />
+                      <ClaimPreview
+                        key={destination}
+                        uri={destination}
+                        actions={''}
+                        type={'small'}
+                        hideMenu
+                        hideRepostLabel
+                      />
                     ) : (
                       destination
                     )}

ui/modal/modalRemoveCollection/view.jsx

@@ -31,7 +31,7 @@ function ModalRemoveCollection(props: Props) {
           uri ? (
             <React.Fragment>
               <p>{__('This will permanently delete the list.')}</p>
-              <p>{__('Type "%name%" to confirm.', { name: collectionName })}</p>
+              <p>{__('Type "%list_name%" to confirm.', { list_name: collectionName })}</p>
               <FormField value={confirmName} type={'text'} onChange={(e) => setConfirmName(e.target.value)} />
             </React.Fragment>
           ) : (