Merge pull request #3619 from swaponline/href-ts

Fix href ts-ignore
swaponline · Nov 20, 2020 · 2eb8507 · 2eb8507
2 parents 98bad44 + 6c31e78
commit 2eb8507
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 52 deletions.
diff --git a/src/front/shared/components/FaqExpandableItem/FaqExpandableItem.tsx b/src/front/shared/components/FaqExpandableItem/FaqExpandableItem.tsx
@@ -6,16 +6,9 @@ import styles from './FaqExpandableItem.scss'
 
 import Href from 'components/Href/Href'
 
-
 const FaqExpandableItem = ({ link, question }) => (
   <div styleName="container">
-    {/*
-    //@ts-ignore */}
-    <Href
-      tab={link}
-      styleName="header"
-      rel="noreferrer noopener"
-    >
+    <Href tab={link} styleName="header" rel="noreferrer noopener">
       {question}
     </Href>
   </div>

diff --git a/src/front/shared/components/Href/Href.tsx b/src/front/shared/components/Href/Href.tsx
@@ -1,17 +1,24 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import { NavLink } from 'react-router-dom'
-
 import cssModules from 'react-css-modules'
+
 import styles from './Href.scss'
 
+interface HrefProps {
+  children: React.ReactNode
+  to?: string
+  redirect?: string
+  tab?: string
+  rel?: string
+  className?: string
+}
 
-const Href = ({ children, to, redirect, tab, rel, className }) => {
+const Href = ({ children, to, redirect, tab, rel, className }: HrefProps) => {
   if (to) {
     return (
-      //@ts-ignore
-      <NavLink styleName="link">{children}</NavLink>
+      <NavLink styleName="link" to={to}>
+        {children}
+      </NavLink>
     )
   }
 
@@ -28,13 +35,4 @@ const Href = ({ children, to, redirect, tab, rel, className }) => {
   )
 }
 
-Href.propTypes = {
-  children: PropTypes.node.isRequired,
-  to: PropTypes.string,
-  redirect: PropTypes.string,
-  tab: PropTypes.string,
-  rel: PropTypes.string,
-  className: PropTypes.string,
-}
-
 export default cssModules(Href, styles)
diff --git a/src/front/shared/components/Href/TransactionLink.tsx b/src/front/shared/components/Href/TransactionLink.tsx
@@ -5,7 +5,6 @@ import Href from './Href'
 import config from 'app-config'
 import { FormattedMessage } from 'react-intl'
 
-
 const setApi = (type, id) => {
   switch (type) {
     case 'BTC':
@@ -19,12 +18,13 @@ const setApi = (type, id) => {
   }
 }
 
-
 const TransactionLink = ({ type, id }) => (
   <div>
     <FormattedMessage id="transactionLink28" defaultMessage="Transaction: " />
     <strong>
-      <Href tab={setApi(type, id)} rel="noopener noreferrer">{id}</Href>
+      <Href tab={setApi(type, id)} rel="noopener noreferrer">
+        {id}
+      </Href>
     </strong>
   </div>
 )

diff --git a/src/front/shared/pages/History/LinkTransaction/LinkTransaction.tsx b/src/front/shared/pages/History/LinkTransaction/LinkTransaction.tsx
@@ -3,15 +3,19 @@ import config from 'app-config'
 
 import Href from 'components/Href/Href'
 
-
 const LinkTransaction = ({ type, children, hash }) => (
   <Fragment>
-    {type.toLowerCase() === 'eth' && <Href tab={`${config.link.etherscan}/tx/${hash}`} >{children}</Href>}
-    {type.toLowerCase() === 'btc' && <Href tab={`${config.link.bitpay}/tx/${hash}`} >{children}</Href>}
+    {type.toLowerCase() === 'eth' && (
+      <Href tab={`${config.link.etherscan}/tx/${hash}`}>{children}</Href>
+    )}
+    {type.toLowerCase() === 'btc' && (
+      <Href tab={`${config.link.bitpay}/tx/${hash}`}>{children}</Href>
+    )}
     {/* type.toLowerCase() === 'usdt' && <Href tab={`${config.link.usdt}/tx/${hash}`} >{children}</Href> */}
-    {Object.keys(config.erc20).includes(type.toLowerCase()) && <Href tab={`${config.link.etherscan}/tx/${hash}`}>{children}</Href>}
+    {Object.keys(config.erc20).includes(type.toLowerCase()) && (
+      <Href tab={`${config.link.etherscan}/tx/${hash}`}>{children}</Href>
+    )}
   </Fragment>
 )
 
-
 export default LinkTransaction
diff --git a/src/front/shared/pages/Swap/Share/Share.tsx b/src/front/shared/pages/Swap/Share/Share.tsx
@@ -7,15 +7,13 @@ import { Button } from 'components/controls'
 import Href from 'components/Href/Href'
 import { FormattedMessage } from 'react-intl'
 
-
-const Share = ({ flow }) => (
+const Share = ({ flow }) =>
   flow.step >= 5 && (
     <Href tab="https://twitter.com/intent/tweet?url=https://swaponline.io/&text=I%20just%20make%20swap%20on%20&hashtags=AtomicSwap,DEX,Bitcoin,SWAP&via=SwapOnlineTeam">
       <Button brand>
         <FormattedMessage id="Share" defaultMessage="Share Twitter" />
       </Button>
     </Href>
   )
-)
 
 export default CSSModules(Share, styles)
diff --git a/src/front/shared/pages/Wallet/components/LinkAccount/index.tsx b/src/front/shared/pages/Wallet/components/LinkAccount/index.tsx
@@ -3,11 +3,14 @@ import config from 'app-config'
 
 import Href from 'components/Href/Href'
 
-
-const erc20LinkAcount = (type, children, address, contractAddress) => Object.keys(config.erc20)
-  .map(key => type.toLowerCase() === key
-    //@ts-ignore
-    && <Href key={key} tab={`${config.link.etherscan}/token/${contractAddress}?a=${address}`} >{children}</Href>
+const erc20LinkAcount = (type, children, address, contractAddress) =>
+  Object.keys(config.erc20).map(
+    (key) =>
+      type.toLowerCase() === key && (
+        <Href key={key} tab={`${config.link.etherscan}/token/${contractAddress}?a=${address}`}>
+          {children}
+        </Href>
+      )
   )
 
 const LinkAccount = ({ type, children, address, contractAddress, onClick }) => (
@@ -16,28 +19,26 @@ const LinkAccount = ({ type, children, address, contractAddress, onClick }) => (
       <a onClick={onClick}>{children}</a>
     ) : (
       <>
-        {type.toLowerCase() === 'eth' &&
-          //@ts-ignore
+        {type.toLowerCase() === 'eth' && (
           <Href tab={`${config.link.etherscan}/address/${address}`}>{children}</Href>
-        }
-        {type.toLowerCase() === 'ghost' &&
-        //@ts-ignore
+        )}
+        {type.toLowerCase() === 'ghost' && (
           <Href tab={`${config.link.ghostscan}/address/${address}`}>{children}</Href>
-        }
-        {type.toLowerCase() === 'next' &&
-          //@ts-ignore
+        )}
+        {type.toLowerCase() === 'next' && (
           <Href tab={`${config.link.nextExplorer}/#/address/${address}`}>{children}</Href>
-        }
-        {(type.toLowerCase() === 'btc' || type.toLowerCase() === 'btc (pin-protected)' || type.toLowerCase() === 'btc (sms-protected)' || type.toLowerCase() === 'btc (multisig)')
-          &&
+        )}
+        {(type.toLowerCase() === 'btc' ||
+          type.toLowerCase() === 'btc (pin-protected)' ||
+          type.toLowerCase() === 'btc (sms-protected)' ||
+          type.toLowerCase() === 'btc (multisig)') && (
           //@ts-ignore
           <Href tab={`${config.link.bitpay}/address/${address}`}>{children}</Href>
-        }
+        )}
         {erc20LinkAcount(type, children, address, contractAddress)}
       </>
     )}
   </>
 )
 
-
 export default LinkAccount